X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fidzebra%2Frecctrl.h;h=b74e831d4c6d3cf17dd82595c1bd2a487125e634;hb=3731bdaf94aeba2550fc553aebe34831c203dc36;hp=8a147ba108f3e52caacfd581d72674e7fb01e459;hpb=7a23ff31063e70f55eb387477130a358f0992988;p=idzebra-moved-to-github.git

diff --git a/include/idzebra/recctrl.h b/include/idzebra/recctrl.h
index 8a147ba..b74e831 100644
--- a/include/idzebra/recctrl.h
+++ b/include/idzebra/recctrl.h
@@ -1,4 +1,4 @@
-/* $Id: recctrl.h,v 1.31 2007-03-01 10:35:46 adam Exp $
+/* $Id: recctrl.h,v 1.39 2007-11-30 12:19:08 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>
@@ -50,8 +49,8 @@ YAZ_BEGIN_CDECL
 
 /** Indexing token */
 typedef struct {
-    /** index type ('w', 'p', .. */
-    unsigned index_type;
+    /** index type, e.g. "w", "p", .. */
+    const char *index_type;
     /** index name, e.g. "title" */
     const char *index_name;
     /** token char data */
@@ -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;
@@ -94,12 +100,12 @@ struct recExtractCtrl {
     void      (*setStoreData)(struct recExtractCtrl *p, void *buf, size_t size);
     int       first_record;
     int       flagShowRecords;
-    int       seqno[256];
     char      match_criteria[256];
     zint      staticrank;
     void      (*schemaAdd)(struct recExtractCtrl *p, Odr_oid *oid);
     data1_handle dh;
     void      *handle;
+    enum zebra_recctrl_action_t action;
 };
 
 /* Retrieve record control */
@@ -108,7 +114,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                */
@@ -117,15 +123,13 @@ struct recRetrieveCtrl {
     int       recordSize;             /* size of record in bytes */
     char      *fname;                 /* name of file (or NULL if internal) */
     data1_handle dh;
-    zebra_snippets *hit_snippet;
-    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;