System call times(2) used again. More 64-bit fixes.

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

diff --git a/index/extract.c b/index/extract.c
index 7c325ca..269c21f 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.100  2000-03-20 19:08:36  adam
+ * Revision 1.103  2000-05-18 12:01:36  adam
+ * System call times(2) used again. More 64-bit fixes.
+ *
+ * Revision 1.102  2000/05/15 15:32:33  adam
+ * Added 64 bit file input.
+ *
+ * Revision 1.101  2000/05/15 13:02:39  adam
+ * Minor change.
+ *
+ * Revision 1.100  2000/03/20 19:08:36  adam
  * Added remote record import using Z39.50 extended services and Segment
  * Requests.
  *
@@ -375,6 +384,12 @@
 
 #include "zinfo.h"
 
+#if _FILE_OFFSET_BITS == 64
+#define PRINTF_OFF_T "%Ld"
+#else
+#define PRINTF_OFF_T "%ld"
+#endif
+
 #ifndef ZEBRASDR
 #define ZEBRASDR 0
 #endif
@@ -423,7 +438,7 @@ int key_open (struct recordGroup *rGroup, int mem)
     char *recordCompression;
     int record_compression = REC_COMPRESS_NONE;
     if (!mem)
-        mem = atoi(res_get_def (common_resource, "memMax", "4"))*1024*1024;
+        mem = atoi(res_get_def (common_resource, "memMax", "16"))*1024*1024;
     if (mem < 50000)
         mem = 50000;
     key_buf = (char **) xmalloc (mem);
@@ -1324,7 +1339,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
        extractCtrl.flagShowRecords = !rGroup->flagRw;
 
         if (!rGroup->flagRw)
-            printf ("File: %s %ld\n", fname, (long) recordOffset);
+            printf ("File: %s " PRINTF_OFF_T "\n", fname, recordOffset);
 
         logInfo.fname = fname;
         logInfo.recordOffset = recordOffset;
@@ -1343,8 +1358,8 @@ static int recordExtract (SYSNO *sysno, const char *fname,
             if (rGroup->flagRw &&
                records_processed < rGroup->fileVerboseLimit)
             {
-                logf (LOG_WARN, "fail %s %s %ld", rGroup->recordType,
-                      fname, (long) recordOffset);
+                logf (LOG_WARN, "fail %s %s " PRINTF_OFF_T, rGroup->recordType,
+                      fname, recordOffset);
             }
             return 0;
         }
@@ -1354,8 +1369,9 @@ static int recordExtract (SYSNO *sysno, const char *fname,
                is probably empty - unless flagShowRecords is in use */
             if (!rGroup->flagRw)
                 return 1;
-            logf (LOG_WARN, "No keys generated for file %s", fname);
-            logf (LOG_WARN, " The file is probably empty");
+           
+           logf (LOG_WARN, "empty %s %s " PRINTF_OFF_T, rGroup->recordType,
+                 fname, recordOffset);
             return 1;
         }
     }
@@ -1392,14 +1408,14 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         /* new record */
         if (deleteFlag)
         {
-           logf (LOG_LOG, "delete %s %s %ld", rGroup->recordType,
-                 fname, (long) recordOffset);
+           logf (LOG_LOG, "delete %s %s " PRINTF_OFF_T, rGroup->recordType,
+                 fname, recordOffset);
             logf (LOG_WARN, "cannot delete record above (seems new)");
             return 1;
         }
         if (records_processed < rGroup->fileVerboseLimit)
-            logf (LOG_LOG, "add %s %s %ld", rGroup->recordType,
-                  fname, (long) recordOffset);
+            logf (LOG_LOG, "add %s %s " PRINTF_OFF_T, rGroup->recordType,
+                  fname, recordOffset);
         rec = rec_new (records);
 
         *sysno = rec->sysno;
@@ -1427,8 +1443,8 @@ static int recordExtract (SYSNO *sysno, const char *fname,
 
        if (recordAttr->runNumber == zebraExplain_runNumberIncrement (zti, 0))
        {
-           logf (LOG_LOG, "skipped %s %s %ld", rGroup->recordType,
-                 fname, (long) recordOffset);
+           logf (LOG_LOG, "skipped %s %s " PRINTF_OFF_T, rGroup->recordType,
+                 fname, recordOffset);
            rec_rm (&rec);
            logRecord (0);
            return 1;
@@ -1442,15 +1458,15 @@ static int recordExtract (SYSNO *sysno, const char *fname,
             /* record going to be deleted */
             if (!delkeys.buf_used)
             {
-                logf (LOG_LOG, "delete %s %s %ld", rGroup->recordType,
-                      fname, (long) recordOffset);
+                logf (LOG_LOG, "delete %s %s " PRINTF_OFF_T,
+                      rGroup->recordType, fname, recordOffset);
                 logf (LOG_WARN, "cannot delete file above, storeKeys false");
             }
             else
             {
                 if (records_processed < rGroup->fileVerboseLimit)
-                    logf (LOG_LOG, "delete %s %s %ld", rGroup->recordType,
-                          fname, (long) recordOffset);
+                    logf (LOG_LOG, "delete %s %s " PRINTF_OFF_T,
+                         rGroup->recordType, fname, recordOffset);
                 records_deleted++;
                 if (matchStr)
                     dict_delete (matchDict, matchStr);
@@ -1465,15 +1481,15 @@ static int recordExtract (SYSNO *sysno, const char *fname,
             /* record going to be updated */
             if (!delkeys.buf_used)
             {
-                logf (LOG_LOG, "update %s %s %ld", rGroup->recordType,
-                      fname, (long) recordOffset);
+                logf (LOG_LOG, "update %s %s " PRINTF_OFF_T,
+                      rGroup->recordType, fname, recordOffset);
                 logf (LOG_WARN, "cannot update file above, storeKeys false");
             }
             else
             {
                 if (records_processed < rGroup->fileVerboseLimit)
-                    logf (LOG_LOG, "update %s %s %ld", rGroup->recordType,
-                          fname, (long) recordOffset);
+                    logf (LOG_LOG, "update %s %s " PRINTF_OFF_T,
+                        rGroup->recordType, fname, recordOffset);
                 flushRecordKeys (*sysno, 1, &reckeys);
                 records_updated++;
             }
@@ -1530,8 +1546,8 @@ static int recordExtract (SYSNO *sysno, const char *fname,
            xmalloc (recordAttr->recordSize);
         if (lseek (fi->fd, recordOffset, SEEK_SET) < 0)
         {
-            logf (LOG_ERRNO|LOG_FATAL, "seek to %ld in %s",
-                  (long) recordOffset, fname);
+            logf (LOG_ERRNO|LOG_FATAL, "seek to " PRINTF_OFF_T " in %s",
+                  recordOffset, fname);
             exit (1);
         }
         if (read (fi->fd, rec->info[recInfo_storeData], recordAttr->recordSize)