New file extract/retrieve method tellf (added).

[idzebra-moved-to-github.git] / index / extract.c

diff --git a/index/extract.c b/index/extract.c
index 611ce7f..aa69550 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,26 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.68  1997-02-12 20:39:45  adam
+ * Revision 1.73  1997-09-04 13:57:20  adam
+ * New file extract/retrieve method tellf (added).
+ * Added O_BINARY for open calls.
+ *
+ * Revision 1.72  1997/07/15 16:32:29  adam
+ * Bug fix: Match handler didn't terminate the resulting string!
+ *
+ * Revision 1.71  1997/07/15 16:28:41  adam
+ * Bug fix: storeData didn't work with files with multiple records.
+ * Bug fix: fixed memory management with records; not really well
+ *  thought through.
+ *
+ * Revision 1.70  1997/07/01 13:00:42  adam
+ * Bug fix in routine searchRecordKey: uninitialized variables.
+ *
+ * Revision 1.69  1997/04/29 09:26:03  adam
+ * Bug fix: generic recordId handling didn't work for compressed internal
+ * keys.
+ *
+ * Revision 1.68  1997/02/12 20:39:45  adam
  * Implemented options -f <n> that limits the log to the first <n>
  * records.
  * Changed some log messages also.
@@ -652,34 +671,42 @@ static const char **searchRecordKey (struct recKeys *reckeys,
     int off = 0;
     int startSeq = -1;
     int i;
+    short attrUse;
+    char attrSet;
+    int seqno = 0;
 
     for (i = 0; i<32; i++)
         ws[i] = NULL;
     
     while (off < reckeys->buf_used)
     {
-        const char *src = reckeys->buf + off;
-        char attrSet;
-        short attrUse;
-        int seqno;
-        const char *wstart;
-        
-        memcpy (&attrSet, src, sizeof(attrSet));
-        src += sizeof(attrSet);
 
-        memcpy (&attrUse, src, sizeof(attrUse));
-        src += sizeof(attrUse);
+        const char *src = reckeys->buf + off;
+       const char *wstart;
+        int lead;
+    
+        lead = *src++;
 
+        if (!(lead & 1))
+        {
+            memcpy (&attrSet, src, sizeof(attrSet));
+            src += sizeof(attrSet);
+        }
+        if (!(lead & 2))
+        {
+            memcpy (&attrUse, src, sizeof(attrUse));
+            src += sizeof(attrUse);
+        }
         wstart = src;
         while (*src++)
             ;
-
-        memcpy (&seqno, src, sizeof(seqno));
-        src += sizeof(seqno);
-
-#if 0
-        logf (LOG_LOG, "(%d,%d) %d %s", attrSet, attrUse, seqno, wstart);
-#endif
+        if (lead & 60)
+            seqno += ((lead>>2) & 15)-1;
+        else
+        {
+            memcpy (&seqno, src, sizeof(seqno));
+            src += sizeof(seqno);
+        }
         if (attrUseS == attrUse && attrSetS == attrSet)
         {
             int woff;
@@ -729,6 +756,12 @@ static off_t file_seek (void *handle, off_t offset)
     return lseek (p->fd, offset, SEEK_SET);
 }
 
+static off_t file_tell (void *handle)
+{
+    struct file_read_info *p = handle;
+    return p->file_offset;
+}
+
 static int file_read (void *handle, char *buf, size_t count)
 {
     struct file_read_info *p = handle;
@@ -903,6 +936,7 @@ static char *fileMatchStr (struct recKeys *reckeys, struct recordGroup *rGroup,
               fname, rGroup->groupName ? rGroup->groupName : "none");
         return NULL;
     }
+    *dst = '\0';
     return dstBuf;
 }
 
@@ -954,6 +988,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         extractCtrl.offset = recordOffset;
         extractCtrl.readf = file_read;
         extractCtrl.seekf = file_seek;
+        extractCtrl.tellf = file_tell;
         extractCtrl.endf = file_end;
         extractCtrl.map_chrs_input = map_chrs_input;
         extractCtrl.flagShowRecords = rGroup->flagShowRecords;
@@ -1128,16 +1163,18 @@ static int recordExtract (SYSNO *sysno, const char *fname,
     xfree (rec->info[recInfo_storeData]);
     if (rGroup->flagStoreData == 1)
     {
-        rec->size[recInfo_storeData] = fi->file_max;
-        rec->info[recInfo_storeData] = xmalloc (fi->file_max);
+        int size = fi->file_moffset - recordOffset; 
+        if (!size)
+            size = fi->file_max - recordOffset;
+        rec->size[recInfo_storeData] = size;
+        rec->info[recInfo_storeData] = xmalloc (size);
         if (lseek (fi->fd, recordOffset, SEEK_SET) < 0)
         {
             logf (LOG_ERRNO|LOG_FATAL, "seek to %ld in %s", fname,
                   (long) recordOffset);
             exit (1);
         }
-        if (read (fi->fd, rec->info[recInfo_storeData], fi->file_max)
-            < fi->file_max)
+        if (read (fi->fd, rec->info[recInfo_storeData], size) < size)
         {
             logf (LOG_ERRNO|LOG_FATAL, "read %d bytes of %s",
                   fi->file_max, fname);
@@ -1283,7 +1320,7 @@ int fileExtract (SYSNO *sysno, const char *fname,
         fd = -1;
     else
     {
-        if ((fd = open (fname, O_RDONLY)) == -1)
+        if ((fd = open (fname, O_BINARY|O_RDONLY)) == -1)
         {
             logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
             return 0;