X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=01a074c2f91f7446e3f866b5aa47b305d505ab31;hb=adfd6d1b6afa9964e4483a16dcf8c2f64d20989a;hp=13f36856b58d5f94f77aabed9aac4b20ef64c1e0;hpb=c41c84a497ae744aa825a90f144c85b54f1cd4bb;p=idzebra-moved-to-github.git

diff --git a/index/kinput.c b/index/kinput.c
index 13f3685..01a074c 100644
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
  *
- * (log at the end)
+ * $Id: kinput.c,v 1.50 2002-04-23 13:39:10 adam Exp $
  *
  * Bugs
  *  - Allocates a lot of memory for the merge process, but never releases it.
@@ -23,18 +23,12 @@
 #include <assert.h>
 
 #include "index.h"
-#include "zserver.h"
 
 #define KEY_SIZE (1+sizeof(struct it_key))
 #define INP_NAME_MAX 768
 #define INP_BUF_START 60000
 #define INP_BUF_ADD  400000
 
-static int no_diffs   = 0;
-static int no_updates = 0;
-static int no_deletions = 0;
-static int no_insertions = 0;
-static int no_iterations = 0;
 
 struct key_file {
     int   no;            /* file no */
@@ -65,7 +59,7 @@ void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no)
 {
     const char *pre;
     
-    pre = res_get_def (zh->service->res, "keyTmpDir", ".");
+    pre = res_get_def (zh->res, "keyTmpDir", ".");
     sprintf (fname, "%s/key%d.tmp", pre, no);
 }
 
@@ -117,6 +111,13 @@ void key_file_chunk_read (struct key_file *f)
     close (fd);
 }
 
+void key_file_destroy (struct key_file *f)
+{
+    xfree (f->buf);
+    xfree (f->prev_name);
+    xfree (f);
+}
+
 struct key_file *key_file_init (int no, int chunk, Res res)
 {
     struct key_file *f;
@@ -223,13 +224,13 @@ struct heap_info {
     int    heapnum;
     int    *ptr;
     int    (*cmp)(const void *p1, const void *p2);
-    Dict dict;
-    ISAMS isams;
-#if ZMBOL
-    ISAM isam;
-    ISAMC isamc;
-    ISAMD isamd;
-#endif
+    struct zebra_register *reg;
+
+    int no_diffs;
+    int no_updates;
+    int no_deletions;
+    int no_insertions;
+    int no_iterations;
 };
 
 struct heap_info *key_heap_init (int nkeys,
@@ -250,9 +251,28 @@ struct heap_info *key_heap_init (int nkeys,
         hi->ptr[i] = i;
         hi->info.buf[i] = (char *) xmalloc (INP_NAME_MAX);
     }
+    hi->no_diffs = 0;
+    hi->no_diffs = 0;
+    hi->no_updates = 0;
+    hi->no_deletions = 0;
+    hi->no_insertions = 0;
+    hi->no_iterations = 0;
     return hi;
 }
 
+void key_heap_destroy (struct heap_info *hi, int nkeys)
+{
+    int i;
+    yaz_log (LOG_LOG, "key_heap_destroy");
+    for (i = 0; i<=nkeys; i++)
+        xfree (hi->info.buf[i]);
+    
+    xfree (hi->info.buf);
+    xfree (hi->ptr);
+    xfree (hi->info.file);
+    xfree (hi);
+}
+
 static void key_heap_swap (struct heap_info *hi, int i1, int i2)
 {
     int swap;
@@ -323,7 +343,7 @@ static int heap_read_one (struct heap_info *hi, char *name, char *key)
     key_heap_delete (hi);
     if ((r = key_file_read (kf, rbuf)))
         key_heap_insert (hi, rbuf, r, kf);
-    no_iterations++;
+    hi->no_iterations++;
     return 1;
 }
 
@@ -363,7 +383,6 @@ int heap_cread_item (void *vp, char **dst, int *insertMode)
     return 1;
 }
 
-#if ZMBOL
 int heap_inpc (struct heap_info *hi)
 {
     struct heap_cread_info hci;
@@ -385,33 +404,111 @@ int heap_inpc (struct heap_info *hi)
 
         strcpy (this_name, hci.cur_name);
 	assert (hci.cur_name[1]);
-        no_diffs++;
-        if ((dict_info = dict_lookup (hi->dict, hci.cur_name)))
+        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->isamc, isamc_p, isamc_i);
+            isamc_p2 = isc_merge (hi->reg->isamc, isamc_p, isamc_i);
             if (!isamc_p2)
             {
-                no_deletions++;
-                if (!dict_delete (hi->dict, this_name))
+                hi->no_deletions++;
+                if (!dict_delete (hi->reg->dict, this_name))
                     abort();
             }
             else 
             {
-                no_updates++;
+                hi->no_updates++;
                 if (isamc_p2 != isamc_p)
-                    dict_insert (hi->dict, this_name,
+                    dict_insert (hi->reg->dict, this_name,
                                  sizeof(ISAMC_P), &isamc_p2);
             }
         } 
         else
         {
-            isamc_p = isc_merge (hi->isamc, 0, isamc_i);
-            no_insertions++;
-            dict_insert (hi->dict, this_name, sizeof(ISAMC_P), &isamc_p);
+            isamc_p = isc_merge (hi->reg->isamc, 0, isamc_i);
+            hi->no_insertions++;
+            dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p);
         }
     }
     xfree (isamc_i);
+    xfree (hci.key);
+    return 0;
+} 
+
+/* for debugging only */
+static void print_dict_item (ZebraMaps zm, const char *s)
+{
+    int reg_type = s[1];
+    char keybuf[IT_MAX_WORD+1];
+    char *to = keybuf;
+    const char *from = s + 2;
+
+    while (*from)
+    {
+        const char *res = zebra_maps_output (zm, reg_type, &from);
+        if (!res)
+            *to++ = *from++;
+        else
+            while (*res)
+                *to++ = *res++;
+    }
+    *to = '\0';
+    yaz_log (LOG_LOG, "%s", keybuf);
+}
+
+int heap_inpb (struct heap_info *hi)
+{
+    struct heap_cread_info hci;
+    ISAMC_I isamc_i = (ISAMC_I) xmalloc (sizeof(*isamc_i));
+
+    hci.key = (char *) xmalloc (KEY_SIZE);
+    hci.mode = 1;
+    hci.hi = hi;
+    hci.more = heap_read_one (hi, hci.cur_name, hci.key);
+
+    isamc_i->clientData = &hci;
+    isamc_i->read_item = heap_cread_item;
+
+    while (hci.more)
+    {
+        char this_name[INP_NAME_MAX];
+        ISAMC_P isamc_p, isamc_p2;
+        char *dict_info;
+
+        strcpy (this_name, hci.cur_name);
+	assert (hci.cur_name[1]);
+        hi->no_diffs++;
+
+#if 0
+        print_dict_item (hi->reg->zebra_maps, hci.cur_name);
+#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);
+            if (!isamc_p2)
+            {
+                hi->no_deletions++;
+                if (!dict_delete (hi->reg->dict, this_name))
+                    abort();
+            }
+            else 
+            {
+                hi->no_updates++;
+                if (isamc_p2 != isamc_p)
+                    dict_insert (hi->reg->dict, this_name,
+                                 sizeof(ISAMC_P), &isamc_p2);
+            }
+        } 
+        else
+        {
+            isamc_p = isamb_merge (hi->reg->isamb, 0, isamc_i);
+            hi->no_insertions++;
+            dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p);
+        }
+    }
+    xfree (isamc_i);
+    xfree (hci.key);
     return 0;
 } 
 
@@ -436,30 +533,30 @@ int heap_inpd (struct heap_info *hi)
 
         strcpy (this_name, hci.cur_name);
 	assert (hci.cur_name[1]);
-        no_diffs++;
-        if ((dict_info = dict_lookup (hi->dict, hci.cur_name)))
+        hi->no_diffs++;
+        if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name)))
         {
             memcpy (&isamd_p, dict_info+1, sizeof(ISAMD_P));
-            isamd_p2 = isamd_append (hi->isamd, isamd_p, isamd_i);
+            isamd_p2 = isamd_append (hi->reg->isamd, isamd_p, isamd_i);
             if (!isamd_p2)
             {
-                no_deletions++;
-                if (!dict_delete (hi->dict, this_name))
+                hi->no_deletions++;
+                if (!dict_delete (hi->reg->dict, this_name))
                     abort();
             }
             else 
             {
-                no_updates++;
+                hi->no_updates++;
                 if (isamd_p2 != isamd_p)
-                    dict_insert (hi->dict, this_name,
+                    dict_insert (hi->reg->dict, this_name,
                                  sizeof(ISAMD_P), &isamd_p2);
             }
         } 
         else
         {
-            isamd_p = isamd_append (hi->isamd, 0, isamd_i);
-            no_insertions++;
-            dict_insert (hi->dict, this_name, sizeof(ISAMD_P), &isamd_p);
+            isamd_p = isamd_append (hi->reg->isamd, 0, isamd_i);
+            hi->no_insertions++;
+            dict_insert (hi->reg->dict, this_name, sizeof(ISAMD_P), &isamd_p);
         }
     }
     xfree (isamd_i);
@@ -502,33 +599,34 @@ int heap_inp (struct heap_info *hi)
                 key_buf = new_key_buf;
             }
         }
-        no_diffs++;
+        hi->no_diffs++;
         nmemb = key_buf_ptr / KEY_SIZE;
         assert (nmemb * (int) KEY_SIZE == key_buf_ptr);
-        if ((info = dict_lookup (hi->dict, cur_name)))
+        if ((info = dict_lookup (hi->reg->dict, cur_name)))
         {
             ISAM_P isam_p, isam_p2;
             memcpy (&isam_p, info+1, sizeof(ISAM_P));
-            isam_p2 = is_merge (hi->isam, isam_p, nmemb, key_buf);
+            isam_p2 = is_merge (hi->reg->isam, isam_p, nmemb, key_buf);
             if (!isam_p2)
             {
-                no_deletions++;
-                if (!dict_delete (hi->dict, cur_name))
+                hi->no_deletions++;
+                if (!dict_delete (hi->reg->dict, cur_name))
                     abort ();
             }
             else 
             {
-                no_updates++;
+                hi->no_updates++;
                 if (isam_p2 != isam_p)
-                    dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_p2);
+                    dict_insert (hi->reg->dict, cur_name,
+                                 sizeof(ISAM_P), &isam_p2);
             }
         }
         else
         {
             ISAM_P isam_p;
-            no_insertions++;
-            isam_p = is_merge (hi->isam, 0, nmemb, key_buf);
-            dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_p);
+            hi->no_insertions++;
+            isam_p = is_merge (hi->reg->isam, 0, nmemb, key_buf);
+            dict_insert (hi->reg->dict, cur_name, sizeof(ISAM_P), &isam_p);
         }
         memcpy (key_buf, next_key, KEY_SIZE);
         strcpy (cur_name, next_name);
@@ -536,8 +634,6 @@ int heap_inp (struct heap_info *hi)
     return 0;
 }
 
-#endif
-
 int heap_inps (struct heap_info *hi)
 {
     struct heap_cread_info hci;
@@ -559,12 +655,12 @@ int heap_inps (struct heap_info *hi)
 
         strcpy (this_name, hci.cur_name);
 	assert (hci.cur_name[1]);
-        no_diffs++;
-        if (!(dict_info = dict_lookup (hi->dict, hci.cur_name)))
+        hi->no_diffs++;
+        if (!(dict_info = dict_lookup (hi->reg->dict, hci.cur_name)))
         {
-            isams_p = isams_merge (hi->isams, isams_i);
-            no_insertions++;
-            dict_insert (hi->dict, this_name, sizeof(ISAMS_P), &isams_p);
+            isams_p = isams_merge (hi->reg->isams, isams_i);
+            hi->no_insertions++;
+            dict_insert (hi->reg->dict, this_name, sizeof(ISAMS_P), &isams_p);
         }
 	else
 	{
@@ -618,7 +714,7 @@ void zebra_index_merge (ZebraHandle zh)
     int i, r;
     struct heap_info *hi;
     struct progressInfo progressInfo;
-    int nkeys = zh->key_file_no;
+    int nkeys = zh->reg->key_file_no;
     
     if (nkeys < 0)
     {
@@ -641,340 +737,45 @@ void zebra_index_merge (ZebraHandle zh)
     time (&progressInfo.lastTime);
     for (i = 1; i<=nkeys; i++)
     {
-        kf[i] = key_file_init (i, 32768, zh->service->res);
+        kf[i] = key_file_init (i, 8192, zh->res);
         kf[i]->readHandler = progressFunc;
         kf[i]->readInfo = &progressInfo;
         progressInfo.totalBytes += kf[i]->length;
         progressInfo.totalOffset += kf[i]->buf_size;
     }
     hi = key_heap_init (nkeys, key_qsort_compare);
-    hi->dict = zh->service->dict;
-    hi->isams = zh->service->isams;
-#if ZMBOL
-    hi->isam = zh->service->isam;
-    hi->isamc = zh->service->isamc;
-    hi->isamd = zh->service->isamd;
-#endif
+    hi->reg = zh->reg;
     
     for (i = 1; i<=nkeys; i++)
         if ((r = key_file_read (kf[i], rbuf)))
             key_heap_insert (hi, rbuf, r, kf[i]);
-    if (zh->service->isams)
+    if (zh->reg->isams)
 	heap_inps (hi);
-#if ZMBOL
-    else if (zh->service->isamc)
+    if (zh->reg->isamc)
         heap_inpc (hi);
-    else if (zh->service->isam)
+    if (zh->reg->isam)
 	heap_inp (hi);
-    else if (zh->service->isamd)
+    if (zh->reg->isamd)
 	heap_inpd (hi);
-#endif
+    if (zh->reg->isamb)
+	heap_inpb (hi);
 	
     for (i = 1; i<=nkeys; i++)
     {
-	extract_get_fname_tmp  (zh, rbuf, i);
+        extract_get_fname_tmp  (zh, rbuf, i);
         unlink (rbuf);
     }
-    logf (LOG_LOG, "Iterations . . .%7d", no_iterations);
-    logf (LOG_LOG, "Distinct words .%7d", no_diffs);
-    logf (LOG_LOG, "Updates. . . . .%7d", no_updates);
-    logf (LOG_LOG, "Deletions. . . .%7d", no_deletions);
-    logf (LOG_LOG, "Insertions . . .%7d", no_insertions);
-    zh->key_file_no = 0;
-}
-
-void key_input (BFiles bfs, int nkeys, int cache, Res res)
-                
-{
-    Dict dict;
-    ISAMS isams = NULL;
-#if ZMBOL
-    ISAM isam = NULL;
-    ISAMC isamc = NULL;
-    ISAMD isamd = NULL;
-#endif
-    struct key_file **kf;
-    char rbuf[1024];
-    int i, r;
-    struct heap_info *hi;
-    struct progressInfo progressInfo;
-
-    if (nkeys < 0)
-    {
-        char fname[1024];
-        nkeys = 0;
-        while (1)
-        {
-            getFnameTmp (res, fname, nkeys+1);
-            if (access (fname, R_OK) == -1)
-                break;
-            nkeys++;
-        }
-        if (!nkeys)
-            return ;
-    }
-    dict = dict_open (bfs, FNAME_DICT, cache, 1, 0);
-    if (!dict)
-    {
-        logf (LOG_FATAL, "dict_open fail");
-        exit (1);
-    }
-    if (res_get_match (res, "isam", "s", ISAM_DEFAULT))
-    {
-	struct ISAMS_M_s isams_m;
-        isams = isams_open (bfs, FNAME_ISAMS, 1,
-			    key_isams_m (res, &isams_m));
-        if (!isams)
-        {
-            logf (LOG_FATAL, "isams_open fail");
-            exit (1);
-        }
-	logf (LOG_LOG, "isams opened");
-    }
-#if ZMBOL
-    else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
-    {
-        isam = is_open (bfs, FNAME_ISAM, key_compare, 1,
-			sizeof(struct it_key), res);
-        if (!isam)
-        {
-            logf (LOG_FATAL, "is_open fail");
-            exit (1);
-        }
-    }
-    else if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
-    {
-	struct ISAMD_M_s isamd_m;
-        isamd = isamd_open (bfs, FNAME_ISAMD, 1,
-			  key_isamd_m (res,&isamd_m));
-        if (!isamd)
-        {
-            logf (LOG_FATAL, "isamd_open fail");
-            exit (1);
-        }
-    }
-    else if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
-    {
-	struct ISAMC_M_s isamc_m;
-        isamc = isc_open (bfs, FNAME_ISAMC, 1,
-			  key_isamc_m (res, &isamc_m));
-        if (!isamc)
-        {
-            logf (LOG_FATAL, "isc_open fail");
-            exit (1);
-        }
-    }
-#endif
-    kf = (struct key_file **) xmalloc ((1+nkeys) * sizeof(*kf));
-    progressInfo.totalBytes = 0;
-    progressInfo.totalOffset = 0;
-    time (&progressInfo.startTime);
-    time (&progressInfo.lastTime);
+    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);
+    zh->reg->key_file_no = 0;
+
+    key_heap_destroy (hi, nkeys);
     for (i = 1; i<=nkeys; i++)
-    {
-        kf[i] = key_file_init (i, 32768, res);
-        kf[i]->readHandler = progressFunc;
-        kf[i]->readInfo = &progressInfo;
-        progressInfo.totalBytes += kf[i]->length;
-        progressInfo.totalOffset += kf[i]->buf_size;
-    }
-    hi = key_heap_init (nkeys, key_qsort_compare);
-    hi->dict = dict;
-    hi->isams = isams;
-#if ZMBOL
-    hi->isam = isam;
-    hi->isamc = isamc;
-    hi->isamd = isamd;
-#endif
-    
-    for (i = 1; i<=nkeys; i++)
-        if ((r = key_file_read (kf[i], rbuf)))
-            key_heap_insert (hi, rbuf, r, kf[i]);
-    if (isams)
-	heap_inps (hi);
-#if ZMBOL
-    else if (isamc)
-        heap_inpc (hi);
-    else if (isam)
-	heap_inp (hi);
-    else if (isamd)
-	heap_inpd (hi);
-#endif
-	
-    dict_close (dict);
-    if (isams)
-	isams_close (isams);
-#if ZMBOL
-    if (isam)
-        is_close (isam);
-    if (isamc)
-        isc_close (isamc);
-    if (isamd)
-        isamd_close (isamd);
-#endif
-   
-    for (i = 1; i<=nkeys; i++)
-    {
-        getFnameTmp (res, rbuf, i);
-        unlink (rbuf);
-    }
-    logf (LOG_LOG, "Iterations . . .%7d", no_iterations);
-    logf (LOG_LOG, "Distinct words .%7d", no_diffs);
-    logf (LOG_LOG, "Updates. . . . .%7d", no_updates);
-    logf (LOG_LOG, "Deletions. . . .%7d", no_deletions);
-    logf (LOG_LOG, "Insertions . . .%7d", no_insertions);
-
-    /* xmalloc_trav("unfreed"); while hunting leaks */     
+        key_file_destroy (kf[i]);
+    xfree (kf);
 }
 
 
-
-/*
- * $Log: kinput.c,v $
- * Revision 1.43  2000-03-20 19:08:36  adam
- * Added remote record import using Z39.50 extended services and Segment
- * Requests.
- *
- * Revision 1.42  1999/12/01 21:58:48  adam
- * Proper handle of illegal use of isams.
- *
- * Revision 1.41  1999/11/30 13:48:03  adam
- * Improved installation. Updated for inclusion of YAZ header files.
- *
- * Revision 1.40  1999/09/08 12:12:39  adam
- * Removed log message.
- *
- * Revision 1.39  1999/08/18 10:39:20  heikki
- * Added a comment on memory leaks
- *
- * Revision 1.38  1999/08/18 08:38:04  heikki
- * Memory leak hunting
- *
- * Revision 1.37  1999/07/14 13:21:34  heikki
- * Added isam-d files. Compiles (almost) clean. Doesn't work at all
- *
- * Revision 1.36  1999/07/14 10:59:26  adam
- * Changed functions isc_getmethod, isams_getmethod.
- * Improved fatal error handling (such as missing EXPLAIN schema).
- *
- * Revision 1.35  1999/06/30 15:07:23  heikki
- * Adding isamh stuff
- *
- * Revision 1.34  1999/05/26 07:49:13  adam
- * C++ compilation.
- *
- * Revision 1.33  1999/05/15 14:36:38  adam
- * Updated dictionary. Implemented "compression" of dictionary.
- *
- * Revision 1.32  1999/05/12 13:08:06  adam
- * First version of ISAMS.
- *
- * Revision 1.31  1999/02/02 14:50:56  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.30  1998/10/28 10:53:57  adam
- * Added type cast to prevent warning.
- *
- * Revision 1.29  1998/06/11 15:41:39  adam
- * Minor changes.
- *
- * Revision 1.28  1998/03/05 08:45:12  adam
- * New result set model and modular ranking system. Moved towards
- * descent server API. System information stored as "SGML" records.
- *
- * Revision 1.27  1998/02/17 10:32:52  adam
- * Fixed bug: binary files weren't opened with flag b on NT.
- *
- * Revision 1.26  1998/01/29 13:39:13  adam
- * Compress ISAM is default.
- *
- * Revision 1.25  1997/09/17 12:19:14  adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.24  1997/09/09 13:38:07  adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.23  1997/09/04 13:57:39  adam
- * Added O_BINARY for open calls.
- *
- * Revision 1.22  1997/02/12 20:39:45  adam
- * Implemented options -f <n> that limits the log to the first <n>
- * records.
- * Changed some log messages also.
- *
- * Revision 1.21  1996/11/08 11:10:23  adam
- * Buffers used during file match got bigger.
- * Compressed ISAM support everywhere.
- * Bug fixes regarding masking characters in queries.
- * Redesigned Regexp-2 queries.
- *
- * Revision 1.20  1996/11/01 08:58:41  adam
- * Interface to isamc system now includes update and delete.
- *
- * Revision 1.19  1996/10/29 14:09:46  adam
- * Use of cisam system - enabled if setting isamc is 1.
- *
- * Revision 1.18  1996/06/04 10:18:59  adam
- * Minor changes - removed include of ctype.h.
- *
- * Revision 1.17  1996/05/14  15:47:07  adam
- * Cleanup of various buffer size entities.
- *
- * Revision 1.16  1996/04/09  10:05:20  adam
- * Bug fix: prev_name buffer possibly too small; allocated in key_file_init.
- *
- * Revision 1.15  1996/03/21  14:50:09  adam
- * File update uses modify-time instead of change-time.
- *
- * Revision 1.14  1996/02/07  14:06:37  adam
- * Better progress report during register merge.
- * New command: clean - removes temporary shadow files.
- *
- * Revision 1.13  1996/02/05  12:30:00  adam
- * Logging reduced a bit.
- * The remaining running time is estimated during register merge.
- *
- * Revision 1.12  1995/12/06  17:49:19  adam
- * Uses dict_delete now.
- *
- * Revision 1.11  1995/12/06  16:06:43  adam
- * Better diagnostics. Work on 'real' dictionary deletion.
- *
- * Revision 1.10  1995/12/06  12:41:22  adam
- * New command 'stat' for the index program.
- * Filenames can be read from stdin by specifying '-'.
- * Bug fix/enhancement of the transformation from terms to regular
- * expressons in the search engine.
- *
- * Revision 1.9  1995/10/10  12:24:39  adam
- * Temporary sort files are compressed.
- *
- * Revision 1.8  1995/10/04  16:57:19  adam
- * Key input and merge sort in one pass.
- *
- * Revision 1.7  1995/10/02  15:18:52  adam
- * New member in recRetrieveCtrl: diagnostic.
- *
- * Revision 1.6  1995/09/29  15:51:56  adam
- * First work on multi-way read.
- *
- * Revision 1.5  1995/09/29  14:01:43  adam
- * Bug fixes.
- *
- * Revision 1.4  1995/09/28  14:22:57  adam
- * Sort uses smaller temporary files.
- *
- * Revision 1.3  1995/09/06  16:11:17  adam
- * Option: only one word key per file.
- *
- * Revision 1.2  1995/09/04  12:33:42  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.1  1995/09/04  09:10:37  adam
- * More work on index add/del/update.
- * Merge sort implemented.
- * Initial work on z39 server.
- *
- */
-