Using yaz_log_init_prefix2 instead log_event_start for indexing

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

diff --git a/index/extract.c b/index/extract.c
index 3138c88..73fe1a1 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.121 2002-08-28 12:47:10 adam Exp $
+/* $Id: extract.c,v 1.123 2002-08-29 10:00:15 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -40,6 +40,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define PRINTF_OFF_T "%ld"
 #endif
 
+#define USE_SHELLSORT 0
+
+#if USE_SHELLSORT
 static void shellsort(void *ar, int r, size_t s,
                       int (*cmp)(const void *a, const void *b))
 {
@@ -62,7 +65,7 @@ static void shellsort(void *ar, int r, size_t s,
             memcpy (a+s*j, v, s);
         } 
 }
-
+#endif
 
 static void logRecord (ZebraHandle zh)
 {
@@ -411,19 +414,6 @@ struct recordLogInfo {
     struct recordGroup *rGroup;
 };
      
-static void recordLogPreamble (int level, const char *msg, void *info)
-{
-    struct recordLogInfo *p = (struct recordLogInfo *) info;
-    FILE *outf = yaz_log_file ();
-
-    if (level & LOG_LOG)
-        return ;
-    fprintf (outf, "File %s, offset %d, type %s\n",
-             p->rGroup->recordType, p->recordOffset, p->fname);
-    log_event_start (NULL, NULL);
-}
-
-
 static int recordExtract (ZebraHandle zh,
                           SYSNO *sysno, const char *fname,
                           struct recordGroup *rGroup, int deleteFlag,
@@ -435,7 +425,6 @@ static int recordExtract (ZebraHandle zh,
     char *matchStr;
     SYSNO sysnotmp;
     Record rec;
-    struct recordLogInfo logInfo;
     off_t recordOffset = 0;
 
     if (fi->fd != -1)
@@ -476,16 +465,16 @@ static int recordExtract (ZebraHandle zh,
 
         if (!rGroup->flagRw)
             printf ("File: %s " PRINTF_OFF_T "\n", fname, recordOffset);
-
-        logInfo.fname = fname;
-        logInfo.recordOffset = recordOffset;
-        logInfo.rGroup = rGroup;
-        log_event_start (recordLogPreamble, &logInfo);
+        if (rGroup->flagRw)
+        {
+            char msg[512];
+            sprintf (msg, "%s:" PRINTF_OFF_T , fname, recordOffset);
+            yaz_log_init_prefix2 (msg);
+        }
 
         r = (*recType->extract)(clientData, &extractCtrl);
 
-        log_event_start (NULL, NULL);
-
+        yaz_log_init_prefix2 (0);
        if (r == RECCTRL_EXTRACT_EOF)
            return 0;
        else if (r == RECCTRL_EXTRACT_ERROR_GENERIC)