X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=553e6fbc11677b7bca2cbbb7adbb22660c518896;hb=b7918920dd34b8c4c93e8d3095203e236523f453;hp=a88cecd0ccb6c488bd33c95206fb0989a739d236;hpb=04c1e64ee5203e17b2e9618d38ff28a72e0c83d8;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index a88cecd..553e6fb 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.17  1995-10-16 09:32:40  adam
+ * Revision 1.20  1995-10-27 14:00:12  adam
+ * Implemented detection of database availability.
+ *
+ * Revision 1.19  1995/10/17  18:02:11  adam
+ * New feature: databases. Implemented as prefix to words in dictionary.
+ *
+ * Revision 1.18  1995/10/16  14:03:09  quinn
+ * Changes to support element set names and espec1
+ *
+ * Revision 1.17  1995/10/16  09:32:40  adam
  * More work on relational op.
  *
  * Revision 1.16  1995/10/13  12:26:44  adam
@@ -128,12 +137,14 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
 
     odr_reset (server_info.odr);
     server_info.errCode = 0;
+    server_info.errString = NULL;
     switch (q->query->which)
     {
     case Z_Query_type_1:
         r.errcode = rpn_search (&server_info, q->query->u.type_1,
                                 q->num_bases, q->basenames, q->setname,
                                 &r.hits);
+        r.errstring = server_info.errString;
         break;
     default:
         r.errcode = 107;
@@ -147,8 +158,9 @@ static int record_read (int fd, char *buf, size_t count)
 }
 
 static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
-                          oid_value input_format, oid_value *output_format,
-                          char **rec_bufp, int *rec_lenp)
+                          oid_value input_format, Z_RecordComposition *comp,
+			  oid_value *output_format, char **rec_bufp,
+			  int *rec_lenp)
 {
     char record_info[SYS_IDX_ENTRY_LEN];
     char *fname, *file_type;
@@ -189,6 +201,7 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     retrieveCtrl.odr = stream;
     retrieveCtrl.readf = record_read;
     retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
+    retrieveCtrl.comp = comp;
     retrieveCtrl.diagnostic = 0;
     (*rt->retrieve)(&retrieveCtrl);
     *output_format = retrieveCtrl.output_format;
@@ -226,8 +239,9 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
         return &r;
     }
     r.errcode = record_fetch (&server_info, records[0].sysno,
-                              records[0].score, q->stream,
-                              q->format, &r.format, &r.record, &r.len);
+                              records[0].score, q->stream, q->format,
+                              q->comp, &r.format, &r.record, &r.len);
+    resultSetSysnoDel (&server_info, records, 1);
     return &r;
 }
 
@@ -243,13 +257,15 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
 
     odr_reset (server_info.odr);
     server_info.errCode = 0;
+    server_info.errString = 0;
 
-    r.errstring = 0;
     r.term_position = q->term_position;
     r.num_entries = q->num_entries;
-    r.errcode = rpn_scan (&server_info, server_info.odr, q->term,
+    r.errcode = rpn_scan (&server_info, q->term,
+                          q->num_bases, q->basenames,
                           &r.term_position,
                           &r.num_entries, &r.entries, &status);
+    r.errstring = server_info.errString;
     r.status = status;
     return &r;
 }