X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=a9885fbd8ce4a8fcafd0e1152eed7c71cc24addd;hb=af7bc27d33843a8e667022f24589450c39f907f2;hp=2eb7fd54365fea57814cb07b2747eb8e46e9bfaf;hpb=8a10428f21d9a1c308a85eae620d2de8c7765577;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index 2eb7fd5..a9885fb 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.65  1996-11-14 08:57:56  adam
+ * Revision 1.67  1996-11-15 15:02:14  adam
+ * Minor changes regarding logging.
+ *
+ * Revision 1.66  1996/11/14  09:52:21  adam
+ * Strings in record keys bound by IT_MAX_WORD.
+ *
+ * Revision 1.65  1996/11/14  08:57:56  adam
  * Reduction of storeKeys area.
  *
  * Revision 1.64  1996/11/08 11:10:16  adam
@@ -559,7 +565,7 @@ static void addRecordKey (const RecWord *p)
         case Word_Numeric:
             *dst++ = 'n';
     }
-    for (i = 0; p->u.string[i]; i++)
+    for (i = 0; p->u.string[i] && i < IT_MAX_WORD-3; i++)
         *dst++ = p->u.string[i];
     *dst++ = '\0';
 
@@ -952,19 +958,26 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         extractCtrl.endf = file_end;
         extractCtrl.map_chrs_input = map_chrs_input;
         extractCtrl.flagShowRecords = rGroup->flagShowRecords;
+        if (rGroup->flagShowRecords)
+            printf ("File: %s %ld\n", fname, (long) recordOffset);
         r = (*recType->extract)(&extractCtrl);
 
         if (r)      
         {
             /* error occured during extraction ... */
-            logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
+            if (!rGroup->flagShowRecords)
+                logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
             return 0;
         }
         if (reckeys.buf_used == 0)
         {
             /* the extraction process returned no information - the record
                is probably empty */
-            logf (LOG_WARN, "Empty file %s", fname);
+            if (!rGroup->flagShowRecords)
+            {
+                logf (LOG_WARN, "No keys generated for file %s", fname);
+                logf (LOG_WARN, " The file is probably empty");
+            }
             return 0;
         }
     }
@@ -1006,7 +1019,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         }
         logInfo.op = "add";
         if (rGroup->fileVerboseFlag)
-            logf (LOG_LOG, "add %s %s+%ld", rGroup->recordType,
+            logf (LOG_LOG, "add %s %s %ld", rGroup->recordType,
                   fname, (long) recordOffset);
         rec = rec_new (records);
         *sysno = rec->sysno;