X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=ea31d07d2208e3db4e217fa1badfc378709506dc;hb=9af45a7f129664e5f802ff1cdfce08fbce8b1adb;hp=0d9afd5b171a701ef5dcd008e85607bd81a78bf5;hpb=eb4e33573a00795f2b1c0dfebb51ab59ffd5a0d9;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index 0d9afd5..ea31d07 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,28 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.13  1995-09-29 14:01:39  adam
+ * Revision 1.20  1995-10-06 13:52:05  adam
+ * Bug fixes. Handler may abort further scanning.
+ *
+ * Revision 1.19  1995/10/04  12:55:16  adam
+ * Bug fix in ranked search. Use=Any keys inserted.
+ *
+ * Revision 1.18  1995/10/04  09:37:08  quinn
+ * Fixed bug.
+ *
+ * Revision 1.17  1995/10/03  14:28:57  adam
+ * Buffered read in extract works.
+ *
+ * Revision 1.16  1995/10/03  14:28:45  adam
+ * Work on more effecient read handler in extract.
+ *
+ * Revision 1.15  1995/10/02  15:42:53  adam
+ * Extract uses file descriptors instead of FILE pointers.
+ *
+ * Revision 1.14  1995/10/02  15:29:13  adam
+ * More logging in file_extract.
+ *
+ * Revision 1.13  1995/09/29  14:01:39  adam
  * Bug fixes.
  *
  * Revision 1.12  1995/09/28  14:22:56  adam
@@ -204,19 +225,100 @@ static void wordAdd (const RecWord *p)
     kused += sizeof(key);
 }
 
+static void wordAddAny (const RecWord *p)
+{
+    if (p->attrSet != 1 || p->attrUse != 1016)
+    {
+        RecWord w;
+
+        memcpy (&w, p, sizeof(w));
+        w.attrSet = 1;
+        w.attrUse = 1016;
+        wordAdd (&w);
+    }
+    wordAdd (p);
+}
+
+
+#define FILE_READ_BUF 1
+#if FILE_READ_BUF
+static char *file_buf;
+static int file_offset;
+static int file_bufsize;
+
+static void file_read_start (int fd)
+{
+    file_offset = 0;
+    file_buf = xmalloc (4096);
+    file_bufsize = read (fd, file_buf, 4096);
+}
+
+static void file_read_stop (int fd)
+{
+    xfree (file_buf);
+}
+
+static int file_read (int fd, char *buf, size_t count)
+{
+    int l = file_bufsize - file_offset;
+
+    if (count > l)
+    {
+        int r;
+        if (l > 0)
+            memcpy (buf, file_buf + file_offset, l);
+        count = count-l;
+        if (count > file_bufsize)
+        {
+            if ((r = read (fd, buf + l, count)) == -1)
+            {
+                logf (LOG_FATAL|LOG_ERRNO, "read");
+                exit (1);
+            }
+            file_bufsize = 0;
+            file_offset = 0;
+            return r;
+        }
+        file_bufsize = r = read (fd, file_buf, 4096);
+        if (r == -1)
+        {
+            logf (LOG_FATAL|LOG_ERRNO, "read");
+            exit (1);
+        }
+        else if (r <= count)
+        {
+            file_offset = r;
+            memcpy (buf + l, file_buf, r);
+            return l + r;
+        }
+        else
+        {
+            file_offset = count;
+            memcpy (buf + l, file_buf, count - l);
+            return count;
+        }
+    }
+    memcpy (buf, file_buf + file_offset, count);
+    file_offset += count;
+    return count;
+}
+#else
+static int file_read (int fd, char *buf, size_t count)
+{
+    return read (fd, buf, count);
+}
+#endif
 void file_extract (int cmd, const char *fname, const char *kname)
 {
-    int i;
+    int i, r;
     char ext[128];
     SYSNO sysno;
     char ext_res[128];
     const char *file_type;
     void *file_info;
-    FILE *inf;
     struct recExtractCtrl extractCtrl;
     RecType rt;
 
-    logf (LOG_DEBUG, "%c %s k=%s", cmd, fname, kname);
     for (i = strlen(fname); --i >= 0; )
         if (fname[i] == '/')
         {
@@ -233,6 +335,7 @@ void file_extract (int cmd, const char *fname, const char *kname)
         return;
     if (!(rt = recType_byName (file_type)))
         return;
+    logf (LOG_DEBUG, "%c %s k=%s", cmd, fname, kname);
     file_info = dict_lookup (file_idx, kname);
     if (!file_info)
     {
@@ -245,17 +348,25 @@ void file_extract (int cmd, const char *fname, const char *kname)
     else
         memcpy (&sysno, (char*) file_info+1, sizeof(sysno));
 
-    if (!(inf = fopen (fname, "r")))
+    if ((extractCtrl.fd = open (fname, O_RDONLY)) == -1)
     {
         logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
         return;
     }
-    extractCtrl.inf = inf;
     extractCtrl.subType = "";
     extractCtrl.init = wordInit;
-    extractCtrl.add = wordAdd;
+    extractCtrl.add = wordAddAny;
+#if FILE_READ_BUF
+    file_read_start (extractCtrl.fd);
+#endif
+    extractCtrl.readf = file_read;
     key_sysno = sysno;
     key_cmd = cmd;
-    (*rt->extract)(&extractCtrl);
-    fclose (inf);
+    r = (*rt->extract)(&extractCtrl);
+#if FILE_READ_BUF
+    file_read_stop (extractCtrl.fd);
+#endif
+    close (extractCtrl.fd);
+    if (r)
+        logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
 }