Added MARC filter - type grs.marc.<syntax> where syntax refers

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

diff --git a/index/extract.c b/index/extract.c
index 7af7190..35ec288 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.69  1997-04-29 09:26:03  adam
+ * 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.
  *
@@ -656,6 +667,9 @@ 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;
@@ -666,9 +680,6 @@ static const char **searchRecordKey (struct recKeys *reckeys,
         const char *src = reckeys->buf + off;
        const char *wstart;
         int lead;
-       short attrUse;
-       char attrSet;
-       int seqno;
     
         lead = *src++;
 
@@ -915,6 +926,7 @@ static char *fileMatchStr (struct recKeys *reckeys, struct recordGroup *rGroup,
               fname, rGroup->groupName ? rGroup->groupName : "none");
         return NULL;
     }
+    *dst = '\0';
     return dstBuf;
 }
 
@@ -1140,16 +1152,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);