X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=cc464c299d7588a885194047e661804f899fadad;hb=74c8a62d1403d51315d58bd293b6284490e78003;hp=5ee8829d4b4edd3541d099f2d61a5b1801a70c6d;hpb=f7e93f016e75e43d037b5c3e89aeb27b7176513a;p=idzebra-moved-to-github.git

diff --git a/index/kinput.c b/index/kinput.c
index 5ee8829..cc464c2 100644
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -1,6 +1,6 @@
-/* $Id: kinput.c,v 1.61 2004-08-06 13:14:46 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: kinput.c,v 1.65 2005-04-13 13:03:47 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -47,12 +47,7 @@ struct key_file {
     size_t chunk;        /* number of bytes allocated */
     size_t buf_ptr;      /* current position in buffer */
     char *prev_name;     /* last word read */
-#if IT_KEY_NEW
     void *decode_handle;
-#else
-    int   sysno;         /* last sysno */
-    int   seqno;         /* last seqno */
-#endif
     off_t length;        /* length of file */
                          /* handler invoked in each read */
     void (*readHandler)(struct key_file *keyp, void *rinfo);
@@ -87,21 +82,21 @@ void key_file_chunk_read (struct key_file *f)
     f->buf_size = 0;
     if (fd == -1)
     {
-        logf (LOG_WARN|LOG_ERRNO, "cannot open %s", fname);
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot open %s", fname);
 	return ;
     }
     if (!f->length)
     {
         if ((f->length = lseek (fd, 0L, SEEK_END)) == (off_t) -1)
         {
-            logf (LOG_WARN|LOG_ERRNO, "cannot seek %s", fname);
+            yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
 	    close (fd);
 	    return ;
         }
     }
     if (lseek (fd, f->offset, SEEK_SET) == -1)
     {
-        logf (LOG_WARN|LOG_ERRNO, "cannot seek %s", fname);
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
 	close(fd);
 	return ;
     }
@@ -114,7 +109,7 @@ void key_file_chunk_read (struct key_file *f)
     }
     if (r == -1)
     {
-        logf (LOG_WARN|LOG_ERRNO, "read of %s", fname);
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "read of %s", fname);
 	close (fd);
 	return;
     }
@@ -126,9 +121,7 @@ void key_file_chunk_read (struct key_file *f)
 
 void key_file_destroy (struct key_file *f)
 {
-#if IT_KEY_NEW
     iscz1_stop(f->decode_handle);
-#endif
     xfree (f->buf);
     xfree (f->prev_name);
     xfree (f);
@@ -140,12 +133,7 @@ struct key_file *key_file_init (int no, int chunk, Res res)
 
     f = (struct key_file *) xmalloc (sizeof(*f));
     f->res = res;
-#if IT_KEY_NEW
     f->decode_handle = iscz1_start();
-#else
-    f->sysno = 0;
-    f->seqno = 0;
-#endif
     f->no = no;
     f->chunk = chunk;
     f->offset = 0;
@@ -202,14 +190,9 @@ int key_file_read (struct key_file *f, char *key)
 {
     int i, c;
     char srcbuf[128];
-#if IT_KEY_NEW
     const char *src = srcbuf;
     char *dst;
     int j;
-#else
-    struct it_key itkey;
-    int d;
-#endif
 
     c = key_file_getc (f);
     if (c == 0)
@@ -226,11 +209,8 @@ int key_file_read (struct key_file *f, char *key)
         while ((key[i++] = key_file_getc (f)))
             ;
         strcpy (f->prev_name, key);
-#if IT_KEY_NEW
 	iscz1_reset(f->decode_handle);
-#endif
     }
-#if IT_KEY_NEW
     c = key_file_getc(f); /* length +  insert/delete combined */
     key[i++] = c & 128;
     c = c & 127;
@@ -239,22 +219,6 @@ int key_file_read (struct key_file *f, char *key)
     dst = key + i;
     iscz1_decode(f->decode_handle, &dst, &src);
     return i + sizeof(struct it_key);
-#else
-    d = key_file_decode (f);
-    key[i++] = d & 1;
-    d = d >> 1;
-    itkey.sysno = d + f->sysno;
-    if (d) 
-    {
-        f->sysno = itkey.sysno;
-        f->seqno = 0;
-    }
-    d = key_file_decode (f);
-    itkey.seqno = d + f->seqno;
-    f->seqno = itkey.seqno;
-    memcpy (key + i, &itkey, sizeof(struct it_key));
-    return i + sizeof (struct it_key);
-#endif
 }
 
 struct heap_info {
@@ -324,8 +288,8 @@ struct heap_info *key_heap_init_buff ( ZebraHandle zh,
 void key_heap_destroy (struct heap_info *hi, int nkeys)
 {
     int i;
-    yaz_log (LOG_DEBUG, "key_heap_destroy");
-    yaz_log (LOG_DEBUG, "key_heap_destroy nk=%d",nkeys);
+    yaz_log (YLOG_DEBUG, "key_heap_destroy");
+    yaz_log (YLOG_DEBUG, "key_heap_destroy nk=%d",nkeys);
     if (!hi->zh)
         for (i = 0; i<=nkeys; i++)
             xfree (hi->info.buf[i]);
@@ -399,7 +363,7 @@ static int heap_read_one_raw (struct heap_info *hi, char *name, char *key)
         return 0;
     --(zh->reg->ptr_i);
     cp=(zh->reg->key_buf)[zh->reg->ptr_top - ptr_i];
-    logf (LOG_DEBUG, " raw: i=%ld top=%ld cp=%p", (long) ptr_i,
+    yaz_log (YLOG_DEBUG, " raw: i=%ld top=%ld cp=%p", (long) ptr_i,
 	  (long) zh->reg->ptr_top, cp);
     strcpy(name, cp);
     memcpy(key, cp+strlen(name)+1, KEY_SIZE);
@@ -582,7 +546,7 @@ int heap_inpc (struct heap_info *hi)
     while (hci.more)
     {
         char this_name[INP_NAME_MAX];
-        ISAMC_P isamc_p, isamc_p2;
+        ISAM_P isamc_p, isamc_p2;
         char *dict_info;
 
         strcpy (this_name, hci.cur_name);
@@ -590,8 +554,9 @@ int heap_inpc (struct heap_info *hi)
         hi->no_diffs++;
         if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name)))
         {
-            memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P));
-            isamc_p2 = isc_merge (hi->reg->isamc, isamc_p, isamc_i);
+            memcpy (&isamc_p, dict_info+1, sizeof(ISAM_P));
+	    isamc_p2 = isamc_p;
+            isamc_merge (hi->reg->isamc, &isamc_p2, isamc_i);
             if (!isamc_p2)
             {
                 hi->no_deletions++;
@@ -603,14 +568,15 @@ int heap_inpc (struct heap_info *hi)
                 hi->no_updates++;
                 if (isamc_p2 != isamc_p)
                     dict_insert (hi->reg->dict, this_name,
-                                 sizeof(ISAMC_P), &isamc_p2);
+                                 sizeof(ISAM_P), &isamc_p2);
             }
         } 
         else
         {
-            isamc_p = isc_merge (hi->reg->isamc, 0, isamc_i);
+	    isamc_p = 0;
+	    isamc_merge (hi->reg->isamc, &isamc_p, isamc_i);
             hi->no_insertions++;
-            dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p);
+            dict_insert (hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p);
         }
     }
     xfree (isamc_i);
@@ -639,7 +605,7 @@ static void print_dict_item (ZebraMaps zm, const char *s)
                 *to++ = *res++;
     }
     *to = '\0';
-    yaz_log (LOG_LOG, "%s", keybuf);
+    yaz_log (YLOG_LOG, "%s", keybuf);
 }
 #endif
 
@@ -662,7 +628,7 @@ int heap_inpb (struct heap_info *hi)
     while (hci.more)
     {
         char this_name[INP_NAME_MAX];
-        ISAMC_P isamc_p, isamc_p2;
+        ISAM_P isamc_p, isamc_p2;
         char *dict_info;
 
         strcpy (this_name, hci.cur_name);
@@ -674,8 +640,9 @@ int heap_inpb (struct heap_info *hi)
 #endif
         if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name)))
         {
-            memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P));
-            isamc_p2 = isamb_merge (hi->reg->isamb, isamc_p, isamc_i);
+            memcpy (&isamc_p, dict_info+1, sizeof(ISAM_P));
+	    isamc_p2 = isamc_p;
+            isamb_merge (hi->reg->isamb, &isamc_p2, isamc_i);
             if (!isamc_p2)
             {
                 hi->no_deletions++;
@@ -687,14 +654,15 @@ int heap_inpb (struct heap_info *hi)
                 hi->no_updates++;
                 if (isamc_p2 != isamc_p)
                     dict_insert (hi->reg->dict, this_name,
-                                 sizeof(ISAMC_P), &isamc_p2);
+                                 sizeof(ISAM_P), &isamc_p2);
             }
         } 
         else
         {
-            isamc_p = isamb_merge (hi->reg->isamb, 0, isamc_i);
+	    isamc_p = 0;
+            isamb_merge (hi->reg->isamb, &isamc_p, isamc_i);
             hi->no_insertions++;
-            dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p);
+            dict_insert (hi->reg->dict, this_name, sizeof(ISAM_P), &isamc_p);
         }
     }
     xfree (isamc_i);
@@ -723,7 +691,7 @@ int heap_inps (struct heap_info *hi)
     while (hci.more)
     {
         char this_name[INP_NAME_MAX];
-        ISAMS_P isams_p;
+        ISAM_P isams_p;
         char *dict_info;
 
         strcpy (this_name, hci.cur_name);
@@ -733,11 +701,11 @@ int heap_inps (struct heap_info *hi)
         {
             isams_p = isams_merge (hi->reg->isams, isams_i);
             hi->no_insertions++;
-            dict_insert (hi->reg->dict, this_name, sizeof(ISAMS_P), &isams_p);
+            dict_insert (hi->reg->dict, this_name, sizeof(ISAM_P), &isams_p);
         }
 	else
 	{
-	    logf (LOG_FATAL, "isams doesn't support this kind of update");
+	    yaz_log (YLOG_FATAL, "isams doesn't support this kind of update");
 	    break;
 	}
     }
@@ -767,10 +735,10 @@ void progressFunc (struct key_file *keyp, void *info)
         remaining = (time_t) ((now - p->startTime)*
             ((double) p->totalBytes/p->totalOffset - 1.0));
         if (remaining <= 130)
-            logf (LOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining",
+            yaz_log (YLOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining",
                  (100.0*p->totalOffset) / p->totalBytes, (long) remaining);
         else
-            logf (LOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
+            yaz_log (YLOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
 	         (100.0*p->totalOffset) / p->totalBytes, (long) remaining/60);
     }
     p->totalOffset += keyp->buf_size;
@@ -790,7 +758,7 @@ void zebra_index_merge (ZebraHandle zh)
     int nkeys = zh->reg->key_file_no;
     int usefile; 
     
-    logf (LOG_DEBUG, " index_merge called with nk=%d b=%p", 
+    yaz_log (YLOG_DEBUG, " index_merge called with nk=%d b=%p", 
                     nkeys, zh->reg->key_buf);
     if ( (nkeys==0) && (zh->reg->key_buf==0) )
         return; /* nothing to merge - probably flush after end-trans */
@@ -858,11 +826,11 @@ void zebra_index_merge (ZebraHandle zh)
     }
     if (hi->no_iterations)
     { /* do not log if nothing happened */
-        logf (LOG_LOG, "Iterations . . .%7d", hi->no_iterations);
-        logf (LOG_LOG, "Distinct words .%7d", hi->no_diffs);
-        logf (LOG_LOG, "Updates. . . . .%7d", hi->no_updates);
-        logf (LOG_LOG, "Deletions. . . .%7d", hi->no_deletions);
-        logf (LOG_LOG, "Insertions . . .%7d", hi->no_insertions);
+        yaz_log (YLOG_LOG, "Iterations . . .%7d", hi->no_iterations);
+        yaz_log (YLOG_LOG, "Distinct words .%7d", hi->no_diffs);
+        yaz_log (YLOG_LOG, "Updates. . . . .%7d", hi->no_updates);
+        yaz_log (YLOG_LOG, "Deletions. . . .%7d", hi->no_deletions);
+        yaz_log (YLOG_LOG, "Insertions . . .%7d", hi->no_insertions);
     }
     zh->reg->key_file_no = 0;