X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frecctrl.h;h=45ae761999f2c24a051937269eaf7c77d9258bcc;hb=b7f00ecbe71200814196edcb38c378dcd4acaacc;hp=717a61df9776bcaeb61a598d40f8f456d11a17e6;hpb=a91b23986dd5ad1cbbc05522297b5db770b11c5d;p=idzebra-moved-to-github.git

diff --git a/include/recctrl.h b/include/recctrl.h
index 717a61d..45ae761 100644
--- a/include/recctrl.h
+++ b/include/recctrl.h
@@ -4,7 +4,26 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recctrl.h,v $
- * Revision 1.5  1995-10-02 14:55:52  quinn
+ * 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
+ * New result set method: r_score.
+ * Local no (sysno) and score is transferred to retrieveCtrl.
+ *
+ * Revision 1.8  1995/10/02  15:43:35  adam
+ * Extract uses file descriptors instead of FILE pointers.
+ *
+ * Revision 1.7  1995/10/02  15:18:09  adam
+ * Minor changes.
+ *
+ * Revision 1.6  1995/10/02  15:05:26  quinn
+ * Added a few fields.
+ *
+ * Revision 1.5  1995/10/02  14:55:52  quinn
  * *** empty log message ***
  *
  * Revision 1.4  1995/09/27  16:17:29  adam
@@ -24,6 +43,7 @@
 #ifndef RECCTRL_H
 #define RECCTRL_H
 
+#include <proto.h>
 #include <oid.h>
 #include <odr.h>
 
@@ -44,51 +64,31 @@ typedef struct {
 
 /* Extract record control */
 struct recExtractCtrl {
-<<<<<<< recctrl.h
-    int inf;
-    char *subType;
-    void (*init)(RecWord *p);
-    void (*add)(const RecWord *p);
-||||||| 1.4
-    FILE *inf;
-    char *subType;
-    void (*init)(RecWord *p);
-    void (*add)(const RecWord *p);
-=======
-    /* input parameters ... */
-    FILE *inf;                         /* Extract from this file */
-    char *subType;                     /* Sub type - may be NULL */
-    void (*init)(RecWord *p);          /* Init of word spec */
-    void (*add)(const RecWord *p);     /* Addition of a single word */
->>>>>>> /tmp/T4a00136
+    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);
 };
 
 /* Retrieve record control */
 struct recRetrieveCtrl {
     /* Input parameters ... */
-    ODR        odr;                    /* ODR used to create response */
-    int        fd;                     /* File descriptor and read function */
+    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 */
+    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;
     
-<<<<<<< recctrl.h
     /* response */
     oid_value  output_format;
     void       *rec_buf;
     size_t     rec_len;
-    int diagnostic;
+    int        diagnostic;
     char *message;
-||||||| 1.4
-    /* response */
-    oid_value  output_format;
-    void       *rec_buf;
-    size_t     rec_len;
-=======
-    /* output parameters ... */
-    oid_value  output_format;          /* Record syntax of returned record */
-    void       *rec_buf;               /* Record buffer */
-    size_t     rec_len;                /* Length of record */
->>>>>>> /tmp/T4a00136
 };
 
 typedef struct recType
@@ -99,6 +99,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