Bump year. Change Aps->ApS

[idzebra-moved-to-github.git] / include / idzebra / recctrl.h

diff --git a/include/idzebra/recctrl.h b/include/idzebra/recctrl.h
index b9f8d3c..b468b92 100644 (file)
--- a/include/idzebra/recctrl.h
+++ b/include/idzebra/recctrl.h
@@ -1,6 +1,6 @@
-/* $Id: recctrl.h,v 1.1 2004-09-28 10:15:03 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: recctrl.h,v 1.6 2005-01-15 19:38:24 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,8 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #ifndef RECCTRL_H
 #define RECCTRL_H
 
@@ -30,11 +28,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/odr.h>
 #include <idzebra/res.h>
 #include <idzebra/data1.h>
-#include <zebramap.h>
+#include <idzebra/zebramap.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 /* single word entity */
 typedef struct {
@@ -43,7 +39,9 @@ typedef struct {
     unsigned reg_type;
     char *string;
     int  length;
-    int  seqno;
+    zint seqno;
+    zint record_id;
+    zint section_id;
     ZebraMaps zebra_maps;
     struct recExtractCtrl *extractCtrl;
 } RecWord;
@@ -62,6 +60,7 @@ struct recExtractCtrl {
     ZebraMaps zebra_maps;
     int       flagShowRecords;
     int       seqno[256];
+    char      match_criteria[256];
     void      (*schemaAdd)(struct recExtractCtrl *p, Odr_oid *oid);
     data1_handle dh;
     void      *handle;
@@ -90,7 +89,7 @@ struct recRetrieveCtrl {
     void       *rec_buf;
     int        rec_len;
     int        diagnostic;
-    char *message;
+    char       *addinfo;
 };
 
 typedef struct recType *RecType;
@@ -115,21 +114,30 @@ struct recType
 typedef struct recTypeClass *RecTypeClass;
 typedef struct recTypes *RecTypes;
 
+YAZ_EXPORT
 RecTypeClass recTypeClass_create (Res res, NMEM nmem);
+
+YAZ_EXPORT
 void recTypeClass_destroy(RecTypeClass rtc);
+
+YAZ_EXPORT
 void recTypeClass_info(RecTypeClass rtc, void *cd,
                       void (*cb)(void *cd, const char *s));
 
+YAZ_EXPORT
 RecTypes recTypes_init(RecTypeClass rtc, data1_handle dh);
+
+YAZ_EXPORT
 void recTypes_destroy(RecTypes recTypes);
+
+YAZ_EXPORT
 void recTypes_default_handlers(RecTypes recTypes, Res res);
 
+YAZ_EXPORT
 RecType recType_byName(RecTypes rts, Res res, const char *name,
                       void **clientDataP);
 
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif