X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fzserver.c;h=0aa0b12a8cc9a3eb6b33fb7c83f8346dcd632716;hb=40ca1d08c1d83b92e0b90951d918b252c61c63b2;hp=1a29c3bbfd9e2318b8fc7a27c3025af5986b536f;hpb=8c1de7f1c9610a8da280fe93d785054ce86e7330;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index 1a29c3b..0aa0b12 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.11  1995-10-06 10:43:57  adam
+ * Revision 1.13  1995-10-06 14:38:00  adam
+ * New result set method: r_score.
+ * Local no (sysno) and score is transferred to retrieveCtrl.
+ *
+ * Revision 1.12  1995/10/06  13:52:06  adam
+ * Bug fixes. Handler may abort further scanning.
+ *
+ * Revision 1.11  1995/10/06  10:43:57  adam
  * Scan added. 'occurrences' in scan entries not set yet.
  *
  * Revision 1.10  1995/10/02  16:43:32  quinn
@@ -90,7 +97,6 @@ bend_initresult *bend_init (bend_initrequest *q)
         r.errstring = "is_open fail: wordisam";
         return &r;
     }
-    server_info.recordBuf = NULL;
     server_info.odr = odr_createmem (ODR_ENCODE);
     return &r;
 }
@@ -103,6 +109,8 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
     r.errstring = 0;
     r.hits = 0;
 
+    odr_reset (server_info.odr);
+    server_info.errCode = 0;
     switch (q->query->which)
     {
     case Z_Query_type_1:
@@ -121,7 +129,7 @@ static int record_read (int fd, char *buf, size_t count)
     return read (fd, buf, count);
 }
 
-static int record_fetch (ZServerInfo *zi, int sysno, ODR stream,
+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)
 {
@@ -154,6 +162,9 @@ static int record_fetch (ZServerInfo *zi, int sysno, ODR stream,
         logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Open record file %s", fname);
         exit (1);
     }
+    logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score);
+    retrieveCtrl.localno = sysno;
+    retrieveCtrl.score = score;
     retrieveCtrl.odr = stream;
     retrieveCtrl.readf = record_read;
     retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
@@ -176,8 +187,9 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
     r.last_in_set = 0;
     r.basename = "base";
 
-    xfree (server_info.recordBuf);
-    server_info.recordBuf = NULL;
+    odr_reset (server_info.odr);
+    server_info.errCode = 0;
+
     positions[0] = q->number;
     records = resultSetSysnoGet (&server_info, q->setname, 1, positions);
     if (!records)
@@ -192,7 +204,8 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
         logf (LOG_DEBUG, "Out of range. pos=%d", q->number);
         return &r;
     }
-    r.errcode = record_fetch (&server_info, records[0].sysno, q->stream,
+    r.errcode = record_fetch (&server_info, records[0].sysno,
+                              records[0].score, q->stream,
                               q->format, &r.format, &r.record, &r.len);
     return &r;
 }
@@ -207,13 +220,14 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
     static bend_scanresult r;
 
     odr_reset (server_info.odr);
+    server_info.errCode = 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.term_position,
                           &r.num_entries, &r.entries);
-    r.errstring = 0;
     return &r;
 }
 
@@ -223,8 +237,6 @@ void bend_close (void *handle)
     dict_close (server_info.wordDict);
     is_close (server_info.wordIsam);
     close (server_info.sys_idx_fd);
-    xfree (server_info.recordBuf);
-    server_info.recordBuf = NULL;
     return;
 }