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

diff --git a/include/idzebra/recctrl.h b/include/idzebra/recctrl.h
index 1fbc831..8a147ba 100644
--- a/include/idzebra/recctrl.h
+++ b/include/idzebra/recctrl.h
@@ -1,5 +1,5 @@
-/* $Id: recctrl.h,v 1.17 2006-05-05 07:34:25 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: recctrl.h,v 1.31 2007-03-01 10:35:46 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #ifndef IDZEBRA_RECCTRL_H
@@ -30,53 +30,73 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <idzebra/res.h>
 #include <idzebra/data1.h>
 #include <idzebra/snippet.h>
-#include <idzebra/zebramap.h>
 
 YAZ_BEGIN_CDECL
 
-#if NATTR
+/* 1 */
 #define ZEBRA_XPATH_ELM_BEGIN "_XPATH_BEGIN"
+
+/* 2 */
 #define ZEBRA_XPATH_ELM_END   "_XPATH_END"
+
+/* 1016 */
 #define ZEBRA_XPATH_CDATA     "_XPATH_CDATA"
-#define ZEBRA_XPATH_ATTR      "_XPATH_ATTR"
-#endif
 
-/* single word entity */
+/* 3 */
+#define ZEBRA_XPATH_ATTR_NAME       "_XPATH_ATTR_NAME"
+
+/* 1015 */
+#define ZEBRA_XPATH_ATTR_CDATA      "_XPATH_ATTR_CDATA"
+
+/** Indexing token */
 typedef struct {
-#if NATTR
-#else
-    int  attrSet;
-    int  attrUse;
-#endif
+    /** index type ('w', 'p', .. */
     unsigned index_type;
+    /** index name, e.g. "title" */
     const char *index_name;
+    /** token char data */
     const char *term_buf;
+    /** length of term_buf */
     int  term_len;
+    /** sequence number */
     zint seqno;
+    /** segment number */
+    zint segment;
+    /** record ID */
     zint record_id;
+    /** section ID */
     zint section_id;
-    ZebraMaps zebra_maps;
     struct recExtractCtrl *extractCtrl;
 } RecWord;
 
-/* Extract record control */
+/** \brief record reader stream */
+struct ZebraRecStream {
+    /** client data */
+    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);              
+    /** \brief set and get of record position */
+    off_t     (*endf)(struct ZebraRecStream *s, off_t *offset);   
+    /** \brief close and destroy stream */
+    void      (*destroy)(struct ZebraRecStream *s);
+};
+
+/** \brief record extract for indexing */
 struct recExtractCtrl {
-    void      *fh;                    /* File handle and read function     */
-    int       (*readf)(void *fh, char *buf, size_t count);
-    off_t     (*seekf)(void *fh, off_t offset);  /* seek function          */
-    off_t     (*tellf)(void *fh);                /* tell function          */
-    void      (*endf)(void *fh, off_t offset);   /* end of record position */
-    off_t     offset;                            /* start offset           */
+    struct ZebraRecStream *stream;
     void      (*init)(struct recExtractCtrl *p, RecWord *w);
     void      *clientData;
     void      (*tokenAdd)(RecWord *w);
     void      (*setStoreData)(struct recExtractCtrl *p, void *buf, size_t size);
-    ZebraMaps zebra_maps;
     int       first_record;
     int       flagShowRecords;
     int       seqno[256];
     char      match_criteria[256];
-    int       staticrank;
+    zint      staticrank;
     void      (*schemaAdd)(struct recExtractCtrl *p, Odr_oid *oid);
     data1_handle dh;
     void      *handle;
@@ -84,19 +104,16 @@ struct recExtractCtrl {
 
 /* Retrieve record control */
 struct recRetrieveCtrl {
+    struct ZebraRecStream *stream;
     /* Input parameters ... */
     Res       res;		      /* Resource pool                     */
     ODR       odr;                    /* ODR used to create response       */
-    void     *fh;                     /* File descriptor and read function */
-    int       (*readf)(void *fh, char *buf, size_t count);
-    off_t     (*seekf)(void *fh, off_t offset);
-    off_t     (*tellf)(void *fh);
     oid_value input_format;           /* Preferred record syntax           */
     Z_RecordComposition *comp;        /* formatting instructions           */
     char      *encoding;              /* preferred character encoding      */
     zint      localno;                /* local id of record                */
     int       score;                  /* score 0-1000 or -1 if none        */
-    int       staticrank;             /* static rank >= 0,  0 if none */
+    zint      staticrank;             /* static rank >= 0,  0 if none */
     int       recordSize;             /* size of record in bytes */
     char      *fname;                 /* name of file (or NULL if internal) */
     data1_handle dh;
@@ -130,6 +147,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;
@@ -138,6 +156,10 @@ YAZ_EXPORT
 RecTypeClass recTypeClass_create (Res res, NMEM nmem);
 
 YAZ_EXPORT
+void recTypeClass_load_modules(RecTypeClass *rts, NMEM nmem,
+			       const char *module_path);
+
+YAZ_EXPORT
 RecTypeClass recTypeClass_add_modules(Res res, NMEM nmem,
 				      const char *module_path);
 
@@ -161,7 +183,14 @@ YAZ_EXPORT
 RecType recType_byName(RecTypes rts, Res res, const char *name,
 		       void **clientDataP);
 
-
 YAZ_END_CDECL
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+