X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=index%2Fzserver.c;h=82df2c43c9fc8a92c684c6308440f67b73879f81;hb=0d1685e5db9bf74ff80a4b483754532a73fcbb74;hp=a88cecd0ccb6c488bd33c95206fb0989a739d236;hpb=04c1e64ee5203e17b2e9618d38ff28a72e0c83d8;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index a88cecd..82df2c4 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.17  1995-10-16 09:32:40  adam
+ * Revision 1.22  1995-11-16 15:34:55  adam
+ * Uses new record management system in both indexer and server.
+ *
+ * Revision 1.21  1995/11/01  16:25:52  quinn
+ * *** empty log message ***
+ *
+ * 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
@@ -65,6 +80,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <common.h>
+#include <data1.h>
 #include <recctrl.h>
 #include <dmalloc.h>
 #include "zserver.h"
@@ -81,7 +98,11 @@ bend_initresult *bend_init (bend_initrequest *q)
     r.handle = name;
 
     logf (LOG_DEBUG, "bend_init");
+    data1_tabpath = res_get(common_resource, "data1_tabpath");
     server_info.sets = NULL;
+#if RECORD_BASE
+    server_info.records = rec_open (0);
+#else
     if (!(server_info.sys_idx_fd = open (FNAME_SYS_IDX, O_RDONLY)))
     {
         logf (LOG_WARN|LOG_ERRNO, "sys_idx open fail");
@@ -89,6 +110,7 @@ bend_initresult *bend_init (bend_initrequest *q)
         r.errstring = "sys_idx open fail";
         return &r;
     }
+#endif
     if (!(server_info.fileDict = dict_open (FNAME_FILE_DICT, 10, 0)))
     {
         logf (LOG_WARN, "dict_open fail: fname dict");
@@ -128,12 +150,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,14 +171,24 @@ 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)
 {
+#if RECORD_BASE
+    Record rec;
+#else
     char record_info[SYS_IDX_ENTRY_LEN];
+#endif
     char *fname, *file_type;
     RecType rt;
     struct recRetrieveCtrl retrieveCtrl;
 
+#if RECORD_BASE
+    rec = rec_get (zi->records, sysno);
+    file_type = rec->info[0];
+    fname = rec->info[1];
+#else
     if (lseek (zi->sys_idx_fd, sysno * SYS_IDX_ENTRY_LEN,
                SEEK_SET) == -1)
     {
@@ -168,6 +202,8 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     }
     file_type = record_info;
     fname = record_info + strlen(record_info) + 1;
+#endif
+
     if (!(rt = recType_byName (file_type)))
     {
         logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Cannot handle type %s", 
@@ -182,6 +218,9 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
         *output_format = VAL_SUTRS;
         *rec_bufp = msg;
         *rec_lenp = strlen (msg);
+#if RECORD_BASE
+        rec_rm (rec);
+#endif
         return 0;     /* or 14: System error in presenting records */
     }
     retrieveCtrl.localno = sysno;
@@ -189,12 +228,16 @@ 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;
     *rec_bufp = retrieveCtrl.rec_buf;
     *rec_lenp = retrieveCtrl.rec_len;
     close (retrieveCtrl.fd);
+#if RECORD_BASE
+    rec_rm (rec);
+#endif
     return retrieveCtrl.diagnostic;
 }
 
@@ -226,8 +269,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 +287,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;
 }
@@ -259,7 +305,11 @@ void bend_close (void *handle)
     dict_close (server_info.fileDict);
     dict_close (server_info.wordDict);
     is_close (server_info.wordIsam);
+#if RECORD_BASE
+    rec_close (&server_info.records);
+#else
     close (server_info.sys_idx_fd);
+#endif
     return;
 }