X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fidzebra%2Frecctrl.h;h=c916d75dc4a2776060bbe928e928e777af648877;hb=4f71537a478fc551989245f0dde38997714eedc1;hp=0ac6639a342eba1e48725d4caa8a7f7f8e8b5111;hpb=5a8a42bede922e70156e7b289db071592c71529b;p=idzebra-moved-to-github.git

diff --git a/include/idzebra/recctrl.h b/include/idzebra/recctrl.h
index 0ac6639..c916d75 100644
--- a/include/idzebra/recctrl.h
+++ b/include/idzebra/recctrl.h
@@ -1,8 +1,5 @@
-/* $Id: recctrl.h,v 1.30 2007-01-15 20:08:24 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -25,7 +22,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 +46,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 */
@@ -72,19 +68,33 @@ typedef struct {
 /** \brief record reader stream */
 struct ZebraRecStream {
     /** client data */
-    void      *fh;    
+    void      *fh;
     /** \brief read function */
     int       (*readf)(struct ZebraRecStream *s, char *buf, size_t count);
     /** \brief seek function */
     off_t     (*seekf)(struct ZebraRecStream *s, off_t offset);
     /** \brief tell function */
-    off_t     (*tellf)(struct ZebraRecStream *s);              
+    off_t     (*tellf)(struct ZebraRecStream *s);
     /** \brief set and get of record position */
-    off_t     (*endf)(struct ZebraRecStream *s, off_t *offset);   
+    off_t     (*endf)(struct ZebraRecStream *s, off_t *offset);
     /** \brief close and destroy stream */
     void      (*destroy)(struct ZebraRecStream *s);
 };
 
+/** record update action */
+enum zebra_recctrl_action_t {
+    /** insert record (fail if it exists already) */
+    action_insert = 1,
+    /** replace record (fail it it does not exist) */
+    action_replace,
+    /** delete record (fail if it does not exist) */
+    action_delete,
+    /** insert or replace */
+    action_update,
+    /** delete record (ignore if it does not exist) */
+    action_a_delete
+};
+
 /** \brief record extract for indexing */
 struct recExtractCtrl {
     struct ZebraRecStream *stream;
@@ -94,12 +104,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 +118,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 +127,20 @@ 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;
+
+    /* special fetch to be included in retrieved response (say snippets) */
+    void *handle;
+    int (*special_fetch)(void *handle, const char *esn,
+                         const Odr_oid *input_format,
+                         const Odr_oid **output_format,
+                         WRBUF result, WRBUF addinfo);
 };
 
 typedef struct recType *RecType;
@@ -147,6 +162,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;
@@ -188,6 +204,7 @@ YAZ_END_CDECL
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab