X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=662b52800da2c170ed8aec782f0036311cdc93df;hb=3e97ca3e99068d83691ad6d43d53dd9f1f316889;hp=798354a384f7bb1a92cf26ef7386ec373ca6738e;hpb=589b5761fb59634afc37909e62cb34ce56cbbb12;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index 798354a..662b528 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.49  1996-02-05 12:29:57  adam
+ * Revision 1.51  1996-03-19 11:08:42  adam
+ * Bug fix: Log preamble wasn't always turned off after recordExtract.
+ *
+ * Revision 1.50  1996/02/12  18:45:36  adam
+ * New fileVerboseFlag in record group control.
+ *
+ * Revision 1.49  1996/02/05  12:29:57  adam
  * Logging reduced a bit.
  * The remaining running time is estimated during register merge.
  *
@@ -864,10 +870,8 @@ static int recordExtract (SYSNO *sysno, const char *fname,
             return 1;
         }
         logInfo.op = "add";
-#if 0
-        logf (LOG_LOG, "update %s %s", rGroup->recordType,
-              fname);
-#endif
+        if (rGroup->fileVerboseFlag)
+            logf (LOG_LOG, "add %s %s", rGroup->recordType, fname);
         rec = rec_new (records);
         *sysno = rec->sysno;
 
@@ -897,9 +901,8 @@ static int recordExtract (SYSNO *sysno, const char *fname,
             }
             else
             {
-#if 0
-                logf (LOG_LOG, "delete %s %s", rGroup->recordType, fname);
-#endif
+                if (rGroup->fileVerboseFlag)
+                    logf (LOG_LOG, "delete %s %s", rGroup->recordType, fname);
                 records_deleted++;
                 if (matchStr)
                     dict_delete (matchDict, matchStr);
@@ -916,10 +919,8 @@ static int recordExtract (SYSNO *sysno, const char *fname,
             }
             else
             {
-#if 0
-                logf (LOG_LOG, "update %s %s", rGroup->recordType,
-                      fname);
-#endif
+                if (rGroup->fileVerboseFlag)
+                    logf (LOG_LOG, "update %s %s", rGroup->recordType, fname);
                 flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName); 
                 records_updated++;
             }
@@ -990,7 +991,6 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         rec_strdup (rGroup->databaseName, &rec->size[recInfo_databaseName]); 
 
     rec_put (records, &rec);
-    log_event_start (NULL, NULL);
     return 1;
 }
 
@@ -1037,18 +1037,16 @@ int fileExtract (SYSNO *sysno, const char *fname,
             sprintf (ext_res, "%srecordType", gprefix);
             if (!(rGroup->recordType = res_get (common_resource, ext_res)))
             {
-#if 0
-                logf (LOG_LOG, "? %s", fname);
-#endif
+                if (rGroup->fileVerboseFlag)
+                    logf (LOG_LOG, "? %s", fname);
                 return 0;
             }
         }
     }
     if (!rGroup->recordType)
     {
-#if 0
-        logf (LOG_LOG, "? record %s", fname);
-#endif
+        if (rGroup->fileVerboseFlag)
+            logf (LOG_LOG, "? record %s", fname);
         return 0;
     }
     if (!(recType = recType_byName (rGroup->recordType, subType)))
@@ -1120,6 +1118,7 @@ int fileExtract (SYSNO *sysno, const char *fname,
     }
     fi = file_read_start (fd);
     recordExtract (sysno, fname, rGroup, deleteFlag, fi, recType, subType);
+    log_event_start (NULL, NULL);
     file_read_stop (fi);
     if (fd != -1)
         close (fd);