X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=de9e04ff9d105b5e0e9e151afa836b2ac876fd4b;hb=75049be3951292bbbbd53d83ca38ccbd191e4b08;hp=dfde4a2a251c9cfbec5178454e76bc501efd8d1d;hpb=2d6227440bb26674cab2091b3d79c1934995b762;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index dfde4a2..de9e04f 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.85  1998-09-22 10:03:41  adam
+ * Revision 1.88  1998-10-16 08:14:29  adam
+ * Updated record control system.
+ *
+ * Revision 1.87  1998/10/15 13:10:33  adam
+ * Fixed bug in Zebra that caused it to stop indexing when empty
+ * record was read.
+ *
+ * Revision 1.86  1998/10/13 20:33:53  adam
+ * Fixed one log message and change use ordinal to be an unsigned char.
+ *
+ * Revision 1.85  1998/09/22 10:03:41  adam
  * Changed result sets to be persistent in the sense that they can
  * be re-searched if needed.
  * Fixed memory leak in rsm_or.
@@ -612,8 +622,8 @@ static struct recKeys {
 static void addIndexString (RecWord *p, const char *string, int length)
 {
     char *dst;
-    char attrSet;
-    short attrUse;
+    unsigned char attrSet;
+    unsigned short attrUse;
     int lead = 0;
     int diff = 0;
     int *pseqno = &p->seqnos[p->reg_type];
@@ -821,8 +831,8 @@ static void flushSortKeys (SYSNO sysno, int cmd)
 
 static void flushRecordKeys (SYSNO sysno, int cmd, struct recKeys *reckeys)
 {
-    char attrSet = -1;
-    short attrUse = -1;
+    unsigned char attrSet = (unsigned char) -1;
+    unsigned short attrUse = (unsigned short) -1;
     int seqno = 0;
     int off = 0;
 
@@ -1254,7 +1264,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
                 return 1;
             logf (LOG_WARN, "No keys generated for file %s", fname);
             logf (LOG_WARN, " The file is probably empty");
-            return 0;
+            return 1;
         }
     }
 
@@ -1427,8 +1437,8 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         rec->info[recInfo_storeData] = xmalloc (recordAttr->recordSize);
         if (lseek (fi->fd, recordOffset, SEEK_SET) < 0)
         {
-            logf (LOG_ERRNO|LOG_FATAL, "seek to %ld in %s", fname,
-                  (long) recordOffset);
+            logf (LOG_ERRNO|LOG_FATAL, "seek to %ld in %s",
+                  (long) recordOffset, fname);
             exit (1);
         }
         if (read (fi->fd, rec->info[recInfo_storeData], recordAttr->recordSize)
@@ -1508,7 +1518,8 @@ int fileExtract (SYSNO *sysno, const char *fname,
     }
     if (!*rGroup->recordType)
 	return 0;
-    if (!(recType = recType_byName (rGroup->recordType, subType)))
+    if (!(recType =
+	  recType_byName (rGroup->recTypes, rGroup->recordType, subType)))
     {
         logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
         return 0;