X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frecctrl.h;h=bafc3e850c1f0a0772fa8b11f71430ea126bb126;hb=062978fe7432da086bd0cb468149d88d1b6414cf;hp=8522b858d56638792875cc16cab68c9024f6ed80;hpb=ae5e5891ad52a6e7c1717afe5954039538f81236;p=idzebra-moved-to-github.git

diff --git a/include/recctrl.h b/include/recctrl.h
index 8522b85..bafc3e8 100644
--- a/include/recctrl.h
+++ b/include/recctrl.h
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recctrl.h,v $
- * Revision 1.10  1995-10-16 14:03:06  quinn
+ * Revision 1.12  1996-01-17 15:01:25  adam
+ * Prototype changed for reader functions in extract/retrieve. File
+ *  is identified by 'void *' instead of 'int'.
+ *
+ * Revision 1.11  1995/12/04  14:20:54  adam
+ * Extra arg to recType_byName.
+ *
+ * Revision 1.10  1995/10/16  14:03:06  quinn
  * Changes to support element set names and espec1
  *
  * Revision 1.9  1995/10/06  14:37:53  adam
@@ -61,23 +68,24 @@ typedef struct {
 
 /* Extract record control */
 struct recExtractCtrl {
-    int        fd;                     /* File descriptor and read function */
-    int       (*readf)(int fd, char *buf, size_t count);
-    char *subType;
-    void (*init)(RecWord *p);
-    void (*add)(const RecWord *p);
+    void      *fh;                    /* File handle and read function */
+    int       (*readf)(void *fh, char *buf, size_t count);
+    char      *subType;
+    void      (*init)(RecWord *p);
+    void      (*add)(const RecWord *p);
 };
 
 /* Retrieve record control */
 struct recRetrieveCtrl {
     /* Input parameters ... */
-    ODR        odr;                    /* ODR used to create response */
-    int        fd;                     /* File descriptor and read function */
-    int       (*readf)(int fd, char *buf, size_t count);
-    oid_value  input_format;           /* Preferred record syntax */
+    ODR       odr;                    /* ODR used to create response */
+    void     *fh;                     /* File descriptor and read function */
+    int       (*readf)(void *fh, char *buf, size_t count);
+    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 */
+    int       localno;                /* local id of record */
+    int       score;                  /* score 0-1000 or -1 if none */
+    char      *subType;
     
     /* response */
     oid_value  output_format;
@@ -95,6 +103,6 @@ typedef struct recType
     int  (*retrieve)(struct recRetrieveCtrl *ctrl);   /* Retrieve proc */
 } *RecType;
 
-RecType recType_byName (const char *name);
+RecType recType_byName (const char *name, char *subType);
 
 #endif