X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frecctrl.h;h=722bbf720befc8bc36a4ef00b53a572d53089537;hb=5b886a7358c16434d5c9f5f0d4af2f6e2e5d5c73;hp=13879d446da82584744c23464a3bc4a8d8cb1e17;hpb=18689333339cd8c6039e1f8877eca72b891f5c38;p=idzebra-moved-to-github.git

diff --git a/include/recctrl.h b/include/recctrl.h
index 13879d4..722bbf7 100644
--- a/include/recctrl.h
+++ b/include/recctrl.h
@@ -1,10 +1,27 @@
 /*
- * 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.18  1997-09-04 13:56:15  adam
+ * Revision 1.22  1997-10-27 14:33:04  adam
+ * Moved towards generic character mapping depending on "structure"
+ * field in abstract syntax file. Fixed a few memory leaks. Fixed
+ * bug with negative integers when doing searches with relational
+ * operators.
+ *
+ * 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.
@@ -73,20 +90,20 @@
 #include <proto.h>
 #include <oid.h>
 #include <odr.h>
+#include <data1.h>
+#include <zebramap.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 /* single word entity */
 typedef struct {
     int  attrSet;
     int  attrUse;
-    enum {
-	Word_String,
-	Word_Phrase,
-        Word_Numeric
-    } which;
-    union {
-        char *string;
-        int  numeric;
-    } u;
+    unsigned reg_type;
+    char *string;
     int seqno;
 } RecWord;
 
@@ -101,8 +118,9 @@ struct recExtractCtrl {
     char      *subType;
     void      (*init)(RecWord *p);
     void      (*add)(const RecWord *p);
-    char **(*map_chrs_input)(char **from, int len);
+    ZebraMaps zebra_maps;
     int       flagShowRecords;
+    data1_handle dh;
 };
 
 /* Retrieve record control */
@@ -118,6 +136,7 @@ struct recRetrieveCtrl {
     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;
@@ -137,4 +156,8 @@ typedef struct recType
 
 RecType recType_byName (const char *name, char *subType);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif