X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=index%2Fzserver.c;h=e9fc32053c1acd669be2b50bd3e980f3e10a52ec;hb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;hp=61df429c87ff4935e88c36c5ffb9075c3c7d878c;hpb=ebb67760aea966de2e476018400f7449bc6f2ae8;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index 61df429..e9fc320 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.44  1996-12-11 12:08:01  adam
+ * Revision 1.47  1997-09-04 13:58:36  adam
+ * New retrieve/extract method tellf (added).
+ * Added O_BINARY for open calls.
+ *
+ * Revision 1.46  1997/07/28 08:30:47  adam
+ * Server returns diagnostic 14 when record doesn't exist.
+ *
+ * Revision 1.45  1996/12/23 15:30:45  adam
+ * Work on truncation.
+ * Bug fix: result sets weren't deleted after server shut down.
+ *
+ * Revision 1.44  1996/12/11 12:08:01  adam
  * Added better compression.
  *
  * Revision 1.43  1996/11/15 15:03:58  adam
@@ -171,6 +182,7 @@
 #include <recctrl.h>
 #include <dmalloc.h>
 
+#define USE_TIMES 1
 #ifdef __linux__
 #define USE_TIMES 1
 #endif
@@ -350,6 +362,11 @@ static off_t record_ext_seek (void *fh, off_t offset)
     return lseek (*((int*) fh), offset + record_offset, SEEK_SET);
 }
 
+static off_t record_ext_tell (void *fh)
+{
+    return lseek (*((int*) fh), 0, SEEK_CUR) - record_offset;
+}
+
 static int record_int_pos;
 static char *record_int_buf;
 static int record_int_len;
@@ -359,6 +376,11 @@ static off_t record_int_seek (void *fh, off_t offset)
     return (off_t) (record_int_pos = offset);
 }
 
+static off_t record_int_tell (void *fh)
+{
+    return (off_t) record_int_pos;
+}
+
 static int record_int_read (void *fh, char *buf, size_t count)
 {
     int l = record_int_len - record_int_pos;
@@ -385,12 +407,8 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     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;
+        return 14;
     }
     file_type = rec->info[recInfo_fileType];
     fname = rec->info[recInfo_filename];
@@ -409,6 +427,7 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     {
         retrieveCtrl.readf = record_int_read;
         retrieveCtrl.seekf = record_int_seek;
+        retrieveCtrl.tellf = record_int_tell;
         record_int_len = rec->size[recInfo_storeData];
         record_int_buf = rec->info[recInfo_storeData];
         record_int_pos = 0;
@@ -416,23 +435,20 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     }
     else 
     {
-        if ((fd = open (fname, O_RDONLY)) == -1)
+        if ((fd = open (fname, O_BINARY|O_RDONLY)) == -1)
         {
-            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;
-            *rec_lenp = strlen (msg);
+            logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s",
+		  fname);
             rec_rm (&rec);
-            return 0;     /* or 14: System error in presenting records */
+            return 14;
         }
-
         memcpy (&record_offset, rec->info[recInfo_offset],
                 sizeof(record_offset));
 
         retrieveCtrl.fh = &fd;
         retrieveCtrl.readf = record_ext_read;
         retrieveCtrl.seekf = record_ext_seek;
+        retrieveCtrl.tellf = record_ext_tell;
 
         record_ext_seek (retrieveCtrl.fh, 0);
     }
@@ -528,6 +544,7 @@ void bend_close (void *handle)
 {
     if (server_info.records)
     {
+        resultSetDestroy (&server_info);
         dict_close (server_info.dict);
         if (server_info.isam)
             is_close (server_info.isam);