Use Odr_oid for OIDs. Require YAZ 3.0.2 or later.

[idzebra-moved-to-github.git] / include / idzebra / recctrl.h

diff --git a/include/idzebra/recctrl.h b/include/idzebra/recctrl.h
index 0ac6639..c7c92cc 100644 (file)
--- a/include/idzebra/recctrl.h
+++ b/include/idzebra/recctrl.h
@@ -1,4 +1,4 @@
-/* $Id: recctrl.h,v 1.30 2007-01-15 20:08:24 adam Exp $
+/* $Id: recctrl.h,v 1.35 2007-05-08 12:50:04 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <sys/types.h>
 #include <yaz/proto.h>
-#include <yaz/oid.h>
 #include <yaz/odr.h>
 #include <idzebra/res.h>
 #include <idzebra/data1.h>
@@ -85,6 +84,13 @@ struct ZebraRecStream {
     void      (*destroy)(struct ZebraRecStream *s);
 };
 
+enum zebra_recctrl_action_t {
+    action_insert = 1,
+    action_replace,
+    action_delete,
+    action_update  /* insert or replace as needed */
+};
+
 /** \brief record extract for indexing */
 struct recExtractCtrl {
     struct ZebraRecStream *stream;
@@ -100,6 +106,7 @@ struct recExtractCtrl {
     void      (*schemaAdd)(struct recExtractCtrl *p, Odr_oid *oid);
     data1_handle dh;
     void      *handle;
+    enum zebra_recctrl_action_t action;
 };
 
 /* Retrieve record control */
@@ -108,7 +115,7 @@ struct recRetrieveCtrl {
     /* Input parameters ... */
     Res       res;                   /* Resource pool                     */
     ODR       odr;                    /* ODR used to create response       */
-    oid_value input_format;           /* Preferred record syntax           */
+    const Odr_oid * input_format;     /* Preferred record syntax OID       */
     Z_RecordComposition *comp;        /* formatting instructions           */
     char      *encoding;              /* preferred character encoding      */
     zint      localno;                /* local id of record                */
@@ -121,11 +128,11 @@ struct recRetrieveCtrl {
     zebra_snippets *doc_snippet;
     
     /* response */
-    oid_value  output_format;
-    void       *rec_buf;
+    const Odr_oid * output_format;    /* output format OID */
+    void *     rec_buf;
     int        rec_len;
     int        diagnostic;
-    char       *addinfo;
+    char *     addinfo;
 };
 
 typedef struct recType *RecType;
@@ -147,6 +154,7 @@ struct recType
 #define RECCTRL_EXTRACT_EOF   1
 #define RECCTRL_EXTRACT_ERROR_GENERIC 2
 #define RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER 3
+#define RECCTRL_EXTRACT_SKIP  4
 
 typedef struct recTypeClass *RecTypeClass;
 typedef struct recTypes *RecTypes;