X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frecctrl.h;h=93de77b410703e457596ac8043db373f5c89350a;hb=c9ac021f1381269609f3654384698f398cf46b96;hp=adc12c43371169085b47feb03d0447291870e4ff;hpb=bf52d699af06165384b2dfd74a1848bf529ed600;p=idzebra-moved-to-github.git

diff --git a/include/recctrl.h b/include/recctrl.h
index adc12c4..93de77b 100644
--- a/include/recctrl.h
+++ b/include/recctrl.h
@@ -1,10 +1,29 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1997, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recctrl.h,v $
- * Revision 1.16  1996-10-11 10:56:25  adam
+ * Revision 1.21  1997-09-18 08:59:19  adam
+ * Extra generic handle for the character mapping routines.
+ *
+ * Revision 1.20  1997/09/17 12:19:10  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.19  1997/09/05 15:30:02  adam
+ * Changed prototype for chr_map_input - added const.
+ * Added support for C++, headers uses extern "C" for public definitions.
+ *
+ * Revision 1.18  1997/09/04 13:56:15  adam
+ * Added new filter grs.marc.<syntax> where <syntax> refers to
+ * abstract syntax. New method tellf in extract/retrieve control
+ * block.
+ *
+ * Revision 1.17  1997/04/30 08:56:04  quinn
+ * null
+ *
+ * Revision 1.16  1996/10/11  10:56:25  adam
  * New module recctrl. Used to manage records (extract/retrieval).
  * All record types are accessed by means of definitions in recctrl.h.
  *
@@ -65,16 +84,30 @@
 #include <proto.h>
 #include <oid.h>
 #include <odr.h>
+#include <data1.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    Word_String,
+    Word_Phrase,
+    Word_Numeric
+} RecWordType;
 
 /* single word entity */
 typedef struct {
     int  attrSet;
     int  attrUse;
+    RecWordType which;
+#if 0
     enum {
 	Word_String,
 	Word_Phrase,
         Word_Numeric
     } which;
+#endif
     union {
         char *string;
         int  numeric;
@@ -87,13 +120,15 @@ 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           */
     char      *subType;
     void      (*init)(RecWord *p);
     void      (*add)(const RecWord *p);
-    char **(*map_chrs_input)(char **from, int len);
+    const char **(*map_chrs_input)(void *vp, const char **from, int len);
     int       flagShowRecords;
+    data1_handle dh;
 };
 
 /* Retrieve record control */
@@ -103,11 +138,13 @@ struct recRetrieveCtrl {
     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           */
     int       localno;                /* local id of record                */
     int       score;                  /* score 0-1000 or -1 if none        */
     char      *subType;
+    data1_handle dh;
     
     /* response */
     oid_value  output_format;
@@ -127,4 +164,8 @@ typedef struct recType
 
 RecType recType_byName (const char *name, char *subType);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif