X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=6d61dc3a2c2e358d302799588b09f27d71929c25;hb=44cec91a73f331f5825fea0f2ef640cc28fdda11;hp=9013c55a58425277bacadba039aad591a512c562;hpb=bf27228e5485151ee52bfd87dd91b025544ab6b2;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index 9013c55..6d61dc3 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.31  1995-12-08 16:22:56  adam
+ * Revision 1.34  1996-03-20 09:36:46  adam
+ * Function dict_lookup_grep got extra parameter, init_pos, which marks
+ * from which position in pattern approximate pattern matching should occur.
+ * Approximate pattern matching is used in relevance=re-2.
+ *
+ * Revision 1.33  1996/01/17  14:57:56  adam
+ * Prototype changed for reader functions in extract/retrieve. File
+ *  is identified by 'void *' instead of 'int.
+ *
+ * Revision 1.32  1995/12/11  09:12:58  adam
+ * The rec_get function returns NULL if record doesn't exist - will
+ * happen in the server if the result set records have been deleted since
+ * the creation of the set (i.e. the search).
+ * The server saves a result temporarily if it is 'volatile', i.e. the
+ * set is register dependent.
+ *
+ * Revision 1.31  1995/12/08  16:22:56  adam
  * Work on update while servers are running. Three lock files introduced.
  * The servers reload their registers when necessary, but they don't
  * reestablish result sets yet.
@@ -168,8 +184,20 @@ static int register_lock (ZServerInfo *zi)
     return 0;
 }
 
-static int register_unlock (ZServerInfo *zi)
+static void register_unlock (ZServerInfo *zi)
 {
+    static int waitSec = -1;
+
+    if (waitSec == -1)
+    {
+        char *s = res_get (common_resource, "debugRequestWait");
+        if (s)
+            waitSec = atoi (s);
+        else
+            waitSec = 0;
+    }
+    if (waitSec > 0)
+        sleep (waitSec);
     if (zi->registerState != -1)
         zebraServerUnlock (zi->registerState);
 }
@@ -238,16 +266,16 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
     return &r;
 }
 
-static int record_ext_read (int fd, char *buf, size_t count)
+static int record_ext_read (void *fh, char *buf, size_t count)
 {
-    return read (fd, buf, count);
+    return read (*((int*) fh), buf, count);
 }
 
 static int record_int_pos;
 static char *record_int_buf;
 static int record_int_len;
 
-static int record_int_read (int fd, char *buf, size_t count)
+static int record_int_read (void *fh, char *buf, size_t count)
 {
     int l = record_int_len - record_int_pos;
     if (l <= 0)
@@ -266,10 +294,20 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     Record rec;
     char *fname, *file_type;
     RecType rt;
+    int fd = -1;
     struct recRetrieveCtrl retrieveCtrl;
     char subType[128];
 
     rec = rec_get (zi->records, sysno);
+    if (!rec)
+    {
+        char *msg = "Record is deleted\n";
+        *output_format = VAL_SUTRS;
+        *rec_bufp = msg;
+        *rec_lenp = strlen (msg);
+        logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno);
+        return 0;
+    }
     file_type = rec->info[recInfo_fileType];
     fname = rec->info[recInfo_filename];
 
@@ -290,9 +328,9 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     }
     else 
     {
-        if ((retrieveCtrl.fd = open (fname, O_RDONLY)) == -1)
+        if ((fd = open (fname, O_RDONLY)) == -1)
         {
-            char *msg = "Record doesn't exist";
+            char *msg = "Record doesn't exist\n";
             logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname);
             *output_format = VAL_SUTRS;
             *rec_bufp = msg;
@@ -300,6 +338,7 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
             rec_rm (&rec);
             return 0;     /* or 14: System error in presenting records */
         }
+        retrieveCtrl.fh = &fd;
         retrieveCtrl.readf = record_ext_read;
     }
     retrieveCtrl.subType = subType;
@@ -313,7 +352,8 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     *output_format = retrieveCtrl.output_format;
     *rec_bufp = retrieveCtrl.rec_buf;
     *rec_lenp = retrieveCtrl.rec_len;
-    close (retrieveCtrl.fd);
+    if (fd != -1)
+        close (fd);
     rec_rm (&rec);
 
     return retrieveCtrl.diagnostic;