Zebra with full functionality

diff --git a/CHANGELOG b/CHANGELOG
index 71c35ae..4d81c53 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,10 @@
 
 

+--- 1.2.0 2002/04/05
+
+Multiple registers. New setting in resource 'root' that holds base
+directory for register(s). A group a databases may be put in separate
+register in directory root/reg by using db name 'reg/db1' ... 'reg/dbN'.
+

 --- 1.1.1 2002/03/21
 
 Fixes for Digital Unix
 --- 1.1.1 2002/03/21
 
 Fixes for Digital Unix

diff --git a/LICENSE.zmbol b/LICENSE.zmbol
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/Makefile.am b/Makefile.am
index 317e3ec..91835e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,10 @@
-## $Id: Makefile.am,v 1.3 2000-10-11 12:31:27 adam Exp $
+## $Id: Makefile.am,v 1.4 2002-04-05 08:46:26 adam Exp $

 
 AUTOMAKE_OPTIONS=foreign
 
 EXTRA_DIST= README CHANGELOG 
 
 
 AUTOMAKE_OPTIONS=foreign
 
 EXTRA_DIST= README CHANGELOG 
 

-if ISZMBOL

 SUBDIRS=util bfile dfa dict isams isamb isamc isam rset recctrl tab index test
 SUBDIRS=util bfile dfa dict isams isamb isamc isam rset recctrl tab index test

-else
-SUBDIRS=util bfile dfa dict isams rset recctrl tab index test
-endif

 DIST_SUBDIRS=$(SUBDIRS) include doc
 
 SPEC_FILE=$(PACKAGE).spec
 DIST_SUBDIRS=$(SUBDIRS) include doc
 
 SPEC_FILE=$(PACKAGE).spec

diff --git a/README b/README
index 7d73fbd..b580bca 100644 (file)
--- a/README
+++ b/README
@@ -1,8 +1,7 @@
 Copyright (C) 1995-2002, Index Data ApS.
 See the file LICENSE.zebra for details.
 
 Copyright (C) 1995-2002, Index Data ApS.
 See the file LICENSE.zebra for details.
 

-README for Zebra
-  $Id: README,v 1.12 2002-03-20 20:24:29 adam Exp $
+Zebra: $Id: README,v 1.13 2002-04-05 08:46:26 adam Exp $

 
 Documentation about this software can be found in the subdirectory
 'doc' and Zebra's home page:  http://www.indexdata.dk/zebra/
 
 Documentation about this software can be found in the subdirectory
 'doc' and Zebra's home page:  http://www.indexdata.dk/zebra/

diff --git a/buildconf.sh b/buildconf.sh
index 4823d77..fc38762 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,14 +1,11 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: buildconf.sh,v 1.6 2002-04-04 14:14:13 adam Exp $
+# $Id: buildconf.sh,v 1.7 2002-04-05 08:46:26 adam Exp $

 dir=`aclocal --print-ac-dir`
 if [ -f $dir/yaz.m4 ]; then
        aclocal
 else
        aclocal -I .
 fi
 dir=`aclocal --print-ac-dir`
 if [ -f $dir/yaz.m4 ]; then
        aclocal
 else
        aclocal -I .
 fi

-test -d isamc || mkdir isamc
-test -d isamb || mkdir isamb
-test -d isam || mkdir isam

 automake -a >/dev/null 2>&1 
 autoconf
 if [ -f config.cache ]; then
 automake -a >/dev/null 2>&1 
 autoconf
 if [ -f config.cache ]; then

diff --git a/configure.in b/configure.in
index d5f70f4..5f55980 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1994-2002
 dnl Zebra, Index Data Aps, 1994-2002

-dnl $Id: configure.in,v 1.32 2002-03-15 20:11:36 adam Exp $
+dnl $Id: configure.in,v 1.33 2002-04-05 08:46:26 adam Exp $

 dnl
 AC_INIT(include/zebraver.h)
 AC_MSG_CHECKING(for package)
 dnl
 AC_INIT(include/zebraver.h)
 AC_MSG_CHECKING(for package)

@@ -7,24 +7,12 @@ if test -r ${srcdir}/LICENSE.zmbol; then
        AC_MSG_RESULT([Z'mbol])
        PROGPREFIX=zmbol
        AC_DEFINE(ZMBOL,1)
        AC_MSG_RESULT([Z'mbol])
        PROGPREFIX=zmbol
        AC_DEFINE(ZMBOL,1)

-       AM_INIT_AUTOMAKE(zmbol,1.1.1)
+       AM_INIT_AUTOMAKE(zmbol,1.2.0)

 else
        AC_MSG_RESULT([Zebra])
        PROGPREFIX=zebra
        AC_DEFINE(ZMBOL,0)
 else
        AC_MSG_RESULT([Zebra])
        PROGPREFIX=zebra
        AC_DEFINE(ZMBOL,0)

-       AM_INIT_AUTOMAKE(zebra,1.1.1)
-       if test ! -r ${srcdir}/isam; then
-               mkdir ${srcdir}/isam
-       fi
-       touch ${srcdir}/isam/Makefile.in
-       if test ! -r ${srcdir}/isamc; then
-               mkdir ${srcdir}/isamc
-       fi
-       touch ${srcdir}/isamc/Makefile.in
-       if test ! -r ${srcdir}/isamb; then
-               mkdir ${srcdir}/isamb
-       fi
-       touch ${srcdir}/isamb/Makefile.in
+       AM_INIT_AUTOMAKE(zebra,1.2.0)

 fi
 AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol)
 dnl ------ Substitutions
 fi
 AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol)
 dnl ------ Substitutions

diff --git a/include/zebraver.h b/include/zebraver.h
index 7b906f5..62a5c36 100644 (file)
--- a/include/zebraver.h
+++ b/include/zebraver.h
@@ -2,13 +2,13 @@
  * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  *
  * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  *

- * $Id: zebraver.h,v 1.19 2002-02-20 17:30:01 adam Exp $
+ * $Id: zebraver.h,v 1.20 2002-04-05 08:46:26 adam Exp $

  */
 
 #ifndef ZEBRAVER
  */
 
 #ifndef ZEBRAVER

-#define ZEBRAVER "1.1.1"
+#define ZEBRAVER "1.2.0"

 #endif
 
 #ifndef ZEBRADATE
 #endif
 
 #ifndef ZEBRADATE

-#define ZEBRADATE "$Date: 2002-02-20 17:30:01 $"
+#define ZEBRADATE "$Date: 2002-04-05 08:46:26 $"

 #endif
 #endif

diff --git a/index/Makefile.am b/index/Makefile.am
index 18cc727..559f341 100644 (file)
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.10 2002-03-21 20:12:27 adam Exp $
+## $Id: Makefile.am,v 1.11 2002-04-05 08:46:26 adam Exp $

 
 noinst_PROGRAMS = apitest kdump
 
 
 noinst_PROGRAMS = apitest kdump
 

@@ -9,15 +9,11 @@ libzebra_a_SOURCES = dir.c dirs.c trav.c kinput.c kcompare.c \
  zebraapi.c zinfo.c invstat.c sortidx.c compact.c zsets.c zrpn.c \
  rank1.c trunc.c retrieve.c extract.c index.h recindex.h recindxp.h \
  zebraapi.h zinfo.h zserver.h
  zebraapi.c zinfo.c invstat.c sortidx.c compact.c zsets.c zrpn.c \
  rank1.c trunc.c retrieve.c extract.c index.h recindex.h recindxp.h \
  zebraapi.h zinfo.h zserver.h

-if ISZMBOL
-zmbol_libs = ../isam/libisam.a ../isamc/libisamc.a ../isamb/libisamb.a
-else
-zmbol_libs =
-endif

 
 libzebra_a_LIBADD = \
  ../rset/librset.a ../dict/libdict.a  ../isams/libisams.a \
 
 libzebra_a_LIBADD = \
  ../rset/librset.a ../dict/libdict.a  ../isams/libisams.a \

- $(zmbol_libs) ../recctrl/librecctrl.a ../bfile/libbfile.a ../dfa/libdfa.a \
+ ../isam/libisam.a ../isamc/libisamc.a ../isamb/libisamb.a \
+ ../recctrl/librecctrl.a ../bfile/libbfile.a ../dfa/libdfa.a \

  ../util/libutil.a
 
 if ISZMBOL
  ../util/libutil.a
 
 if ISZMBOL

diff --git a/index/index.h b/index/index.h
index 7e72df1..345cf42 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2002, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
  * Copyright (C) 1995-2002, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto

- * $Id: index.h,v 1.76 2002-04-04 20:50:37 adam Exp $
+ * $Id: index.h,v 1.77 2002-04-05 08:46:26 adam Exp $

  */
 
 #ifndef INDEX_H
  */
 
 #ifndef INDEX_H

@@ -20,14 +20,10 @@
 
 #include <dict.h>
 #include <isams.h>
 
 #include <dict.h>
 #include <isams.h>

-#if ZMBOL

 #include <isam.h>
 #include <isamc.h>
 #include <isamd.h>
 #define ISAM_DEFAULT "c"
 #include <isam.h>
 #include <isamc.h>
 #include <isamd.h>
 #define ISAM_DEFAULT "c"

-#else
-#define ISAM_DEFAULT "s"
-#endif

 #include <yaz/data1.h>
 #include <recctrl.h>
 #include "recindex.h"
 #include <yaz/data1.h>
 #include <recctrl.h>
 #include "recindex.h"

@@ -98,10 +94,8 @@ void inv_prstat (ZebraHandle zh);
 void inv_compact (BFiles bfs);
 void key_input (ZebraHandle zh, int nkeys, int cache, Res res);
 ISAMS_M key_isams_m (Res res, ISAMS_M me);
 void inv_compact (BFiles bfs);
 void key_input (ZebraHandle zh, int nkeys, int cache, Res res);
 ISAMS_M key_isams_m (Res res, ISAMS_M me);

-#if ZMBOL

 ISAMC_M key_isamc_m (Res res, ISAMC_M me);
 ISAMD_M key_isamd_m (Res res, ISAMD_M me);
 ISAMC_M key_isamc_m (Res res, ISAMC_M me);
 ISAMD_M key_isamd_m (Res res, ISAMD_M me);

-#endif

 int merge_sort (char **buf, int from, int to);
 int key_SU_code (int ch, char *out);
 
 int merge_sort (char **buf, int from, int to);
 int key_SU_code (int ch, char *out);
 

@@ -205,11 +199,9 @@ struct zebra_register {
     char *name;
     
     ISAMS isams;
     char *name;
     
     ISAMS isams;

-#if ZMBOL

     ISAM isam;
     ISAMC isamc;
     ISAMD isamd;
     ISAM isam;
     ISAMC isamc;
     ISAMD isamd;

-#endif

     Dict dict;
     Dict matchDict;
     SortIdx sortIdx;
     Dict dict;
     Dict matchDict;
     SortIdx sortIdx;

diff --git a/index/invstat.c b/index/invstat.c
index ba98053..b810496 100644 (file)
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -10,17 +10,13 @@
 #include <string.h>
 
 #include "index.h"
 #include <string.h>
 
 #include "index.h"

-#if ZMBOL

 #include "../isamc/isamd-p.h"
 #include "../isamc/isamd-p.h"

-#endif

 
 struct inv_stat_info {
     ISAMS isams;
 
 struct inv_stat_info {
     ISAMS isams;

-#if ZMBOL

     ISAM isam;
     ISAMC isamc;
     ISAMD isamd;
     ISAM isam;
     ISAMC isamc;
     ISAMD isamd;

-#endif

     int no_isam_entries[9];
     int no_dict_entries;
     int no_dict_bytes;
     int no_isam_entries[9];
     int no_dict_entries;
     int no_dict_bytes;

@@ -63,7 +59,6 @@ static int inv_stat_handle (char *name, const char *info, int pos,
        stat_info->no_isam_entries[0] += occur;
         isams_pp_close (pp);
     }
        stat_info->no_isam_entries[0] += occur;
         isams_pp_close (pp);
     }

-#if ZMBOL

     if (stat_info->isam)
     {
         ISPT ispt;
     if (stat_info->isam)
     {
         ISPT ispt;

@@ -120,7 +115,6 @@ static int inv_stat_handle (char *name, const char *info, int pos,
            stat_info->no_isam_entries[isamd_type(isam_p)] += occur;
         isamd_pp_close (pp);
     }
            stat_info->no_isam_entries[isamd_type(isam_p)] += occur;
         isamd_pp_close (pp);
     }

-#endif

     while (occur > stat_info->isam_bounds[i] && stat_info->isam_bounds[i])
         i++;
     ++(stat_info->isam_occurrences[i]);
     while (occur > stat_info->isam_bounds[i] && stat_info->isam_bounds[i])
         i++;
     ++(stat_info->isam_occurrences[i]);

@@ -133,14 +127,12 @@ void inv_prstat (ZebraHandle zh)
     BFiles bfs;
     Dict dict;
     ISAMS isams = NULL;
     BFiles bfs;
     Dict dict;
     ISAMS isams = NULL;

-#if ZMBOL

     ISAM  isam  = NULL;
     ISAMC isamc = NULL;
     ISAMD isamd = NULL;
     int blocks;
     int size;
     int count;
     ISAM  isam  = NULL;
     ISAMC isamc = NULL;
     ISAMD isamd = NULL;
     int blocks;
     int size;
     int count;

-#endif

     Records records;
     int i, prev;
     int before = 0;
     Records records;
     int i, prev;
     int before = 0;

@@ -173,7 +165,6 @@ void inv_prstat (ZebraHandle zh)
             exit (1);
         }
     }
             exit (1);
         }
     }

-#if ZMBOL

     else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
     {
         isam = is_open (bfs, FNAME_ISAM, key_compare, 0,
     else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
     {
         isam = is_open (bfs, FNAME_ISAM, key_compare, 0,

@@ -206,7 +197,6 @@ void inv_prstat (ZebraHandle zh)
             exit (1);
         }
     }
             exit (1);
         }
     }

-#endif

     records = rec_open (bfs, 0, 0);
 
     for (i = 0; i<=SINGLETON_TYPE; i++)
     records = rec_open (bfs, 0, 0);
 
     for (i = 0; i<=SINGLETON_TYPE; i++)

@@ -214,11 +204,9 @@ void inv_prstat (ZebraHandle zh)
     stat_info.no_dict_entries = 0;
     stat_info.no_dict_bytes = 0;
     stat_info.isams = isams;
     stat_info.no_dict_entries = 0;
     stat_info.no_dict_bytes = 0;
     stat_info.isams = isams;

-#if ZMBOL

     stat_info.isam = isam;
     stat_info.isamc = isamc;
     stat_info.isamd = isamd;
     stat_info.isam = isam;
     stat_info.isamc = isamc;
     stat_info.isamd = isamd;

-#endif

     stat_info.isam_bounds[0] = 1;
     stat_info.isam_bounds[1] = 2;
     stat_info.isam_bounds[2] = 3;
     stat_info.isam_bounds[0] = 1;
     stat_info.isam_bounds[1] = 2;
     stat_info.isam_bounds[2] = 3;

@@ -244,7 +232,6 @@ void inv_prstat (ZebraHandle zh)
 
     dict_scan (dict, term_dict, &before, &after, &stat_info, inv_stat_handle);
 
 
     dict_scan (dict, term_dict, &before, &after, &stat_info, inv_stat_handle);
 

-#if ZMBOL

     if (isamc)
     {
        fprintf (stderr, "   Blocks    Occur  Size KB   Bytes/Entry\n");
     if (isamc)
     {
        fprintf (stderr, "   Blocks    Occur  Size KB   Bytes/Entry\n");

@@ -296,7 +283,6 @@ void inv_prstat (ZebraHandle zh)
     if ( (isamd) && (isamd->method->debug>0))
         fprintf (stderr, "\n%d words using %d bytes\n",
              stat_info.no_dict_entries, stat_info.no_dict_bytes);
     if ( (isamd) && (isamd->method->debug>0))
         fprintf (stderr, "\n%d words using %d bytes\n",
              stat_info.no_dict_entries, stat_info.no_dict_bytes);

-#endif

     fprintf (stderr, "    Occurrences     Words\n");
     prev = 1;
     for (i = 0; stat_info.isam_bounds[i]; i++)
     fprintf (stderr, "    Occurrences     Words\n");
     prev = 1;
     for (i = 0; stat_info.isam_bounds[i]; i++)

@@ -313,15 +299,12 @@ void inv_prstat (ZebraHandle zh)
 
     if (isams)
         isams_close (isams);
 
     if (isams)
         isams_close (isams);

-#if ZMBOL

     if (isam)
         is_close (isam);
     if (isamc)
         isc_close (isamc);
     if (isamd)
         isamd_close (isamd);
     if (isam)
         is_close (isam);
     if (isamc)
         isc_close (isamc);
     if (isamd)
         isamd_close (isamd);

-#endif
-

     xmalloc_trav("unfreed"); /*! while hunting memory leaks */    
 }
 
     xmalloc_trav("unfreed"); /*! while hunting memory leaks */    
 }
 

@@ -329,7 +312,10 @@ void inv_prstat (ZebraHandle zh)
 /*
  *
  * $Log: invstat.c,v $
 /*
  *
  * $Log: invstat.c,v $

- * Revision 1.23  2002-04-04 14:14:13  adam
+ * Revision 1.24  2002-04-05 08:46:26  adam
+ * Zebra with full functionality
+ *
+ * Revision 1.23  2002/04/04 14:14:13  adam

  * Multiple registers (alpha early)
  *
  * Revision 1.22  2002/02/20 17:30:01  adam
  * Multiple registers (alpha early)
  *
  * Revision 1.22  2002/02/20 17:30:01  adam

diff --git a/index/kcompare.c b/index/kcompare.c
index 5d74547..f39b750 100644 (file)
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -216,8 +216,6 @@ ISAMS_M key_isams_m (Res res, ISAMS_M me)
     return me;
 }
 
     return me;
 }
 

-#if ZMBOL
-

 ISAMC_M key_isamc_m (Res res, ISAMC_M me)
 {
     isc_getmethod (me);
 ISAMC_M key_isamc_m (Res res, ISAMC_M me)
 {
     isc_getmethod (me);

@@ -251,8 +249,6 @@ ISAMD_M key_isamd_m (Res res,ISAMD_M me)
     return me;
 }
 
     return me;
 }
 

-#endif
-

 int key_SU_encode (int ch, char *out)
 {
     int i;
 int key_SU_encode (int ch, char *out)
 {
     int i;

@@ -294,7 +290,10 @@ int key_SU_decode (int *ch, const unsigned char *out)
 
 /* 
  * $Log: kcompare.c,v $
 
 /* 
  * $Log: kcompare.c,v $

- * Revision 1.37  2001-11-19 23:08:30  adam
+ * Revision 1.38  2002-04-05 08:46:26  adam
+ * Zebra with full functionality
+ *
+ * Revision 1.37  2001/11/19 23:08:30  adam

  * Added const qualifier for name parameter of key_SU_decode.
  *
  * Revision 1.36  2001/10/15 19:53:43  adam
  * Added const qualifier for name parameter of key_SU_decode.
  *
  * Revision 1.36  2001/10/15 19:53:43  adam

diff --git a/index/kinput.c b/index/kinput.c
index b6eaca2..b1fb8dd 100644 (file)
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
  *
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
  *

- * $Id: kinput.c,v 1.47 2002-04-04 14:14:13 adam Exp $
+ * $Id: kinput.c,v 1.48 2002-04-05 08:46:26 adam Exp $

  *
  * Bugs
  *  - Allocates a lot of memory for the merge process, but never releases it.
  *
  * Bugs
  *  - Allocates a lot of memory for the merge process, but never releases it.

@@ -231,11 +231,9 @@ struct heap_info {
     int    (*cmp)(const void *p1, const void *p2);
     Dict dict;
     ISAMS isams;
     int    (*cmp)(const void *p1, const void *p2);
     Dict dict;
     ISAMS isams;

-#if ZMBOL

     ISAM isam;
     ISAMC isamc;
     ISAMD isamd;
     ISAM isam;
     ISAMC isamc;
     ISAMD isamd;

-#endif

 };
 
 struct heap_info *key_heap_init (int nkeys,
 };
 
 struct heap_info *key_heap_init (int nkeys,

@@ -382,7 +380,6 @@ int heap_cread_item (void *vp, char **dst, int *insertMode)
     return 1;
 }
 
     return 1;
 }
 

-#if ZMBOL

 int heap_inpc (struct heap_info *hi)
 {
     struct heap_cread_info hci;
 int heap_inpc (struct heap_info *hi)
 {
     struct heap_cread_info hci;

@@ -556,8 +553,6 @@ int heap_inp (struct heap_info *hi)
     return 0;
 }
 
     return 0;
 }
 

-#endif
-

 int heap_inps (struct heap_info *hi)
 {
     struct heap_cread_info hci;
 int heap_inps (struct heap_info *hi)
 {
     struct heap_cread_info hci;

@@ -670,25 +665,21 @@ void zebra_index_merge (ZebraHandle zh)
     hi = key_heap_init (nkeys, key_qsort_compare);
     hi->dict = zh->reg->dict;
     hi->isams = zh->reg->isams;
     hi = key_heap_init (nkeys, key_qsort_compare);
     hi->dict = zh->reg->dict;
     hi->isams = zh->reg->isams;

-#if ZMBOL

     hi->isam = zh->reg->isam;
     hi->isamc = zh->reg->isamc;
     hi->isamd = zh->reg->isamd;
     hi->isam = zh->reg->isam;
     hi->isamc = zh->reg->isamc;
     hi->isamd = zh->reg->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 (zh->reg->isams)
        heap_inps (hi);
     
     for (i = 1; i<=nkeys; i++)
         if ((r = key_file_read (kf[i], rbuf)))
             key_heap_insert (hi, rbuf, r, kf[i]);
     if (zh->reg->isams)
        heap_inps (hi);

-#if ZMBOL

     else if (zh->reg->isamc)
         heap_inpc (hi);
     else if (zh->reg->isam)
        heap_inp (hi);
     else if (zh->reg->isamd)
        heap_inpd (hi);
     else if (zh->reg->isamc)
         heap_inpc (hi);
     else if (zh->reg->isam)
        heap_inp (hi);
     else if (zh->reg->isamd)
        heap_inpd (hi);

-#endif

        
     for (i = 1; i<=nkeys; i++)
     {
        
     for (i = 1; i<=nkeys; i++)
     {

diff --git a/index/main.c b/index/main.c
index 5231053..712a2fa 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  *
  * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  *

- * $Id: main.c,v 1.84 2002-04-04 20:50:37 adam Exp $
+ * $Id: main.c,v 1.85 2002-04-05 08:46:26 adam Exp $

  */
 #include <stdio.h>
 #include <string.h>
  */
 #include <stdio.h>
 #include <string.h>

@@ -89,10 +89,10 @@ int main (int argc, char **argv)
                 if (!zs)
                 {
 #if ZMBOL
                 if (!zs)
                 {
 #if ZMBOL

-                    logf (LOG_LOG, "zmbol version %s %s",
+                    logf (LOG_LOG, "Z'mbol version %s %s",

                           ZEBRAVER, ZEBRADATE);
 #else
                           ZEBRAVER, ZEBRADATE);
 #else

-                    logf (LOG_LOG, "zebra version %s %s",
+                    logf (LOG_LOG, "Zebra version %s %s",

                           ZEBRAVER, ZEBRADATE);
 #endif
                     zs = zebra_start (configName ? configName : "zebra.cfg");
                           ZEBRAVER, ZEBRADATE);
 #endif
                     zs = zebra_start (configName ? configName : "zebra.cfg");

diff --git a/index/recindex.c b/index/recindex.c
index 72e8259..4563fc4 100644 (file)
--- a/index/recindex.c
+++ b/index/recindex.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recindex.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recindex.c,v $

- * Revision 1.31  2001-02-26 22:14:59  adam
+ * Revision 1.32  2002-04-05 08:46:26  adam
+ * Zebra with full functionality
+ *
+ * Revision 1.31  2001/02/26 22:14:59  adam

  * Updated for BZIP2 1.0.X. Configure script doesn't enable 64 bit LFS
  * on broken glibc on Redhat 7.0.
  *
  * Updated for BZIP2 1.0.X. Configure script doesn't enable 64 bit LFS
  * on broken glibc on Redhat 7.0.
  *

@@ -841,14 +844,6 @@ static Record rec_new_int (Records p)
         sysno = p->head.index_free;
         p->head.index_free = entry.next;
     }
         sysno = p->head.index_free;
         p->head.index_free = entry.next;
     }

-#if ZMBOL
-#else
-    if (sysno > 100000)
-    {
-        logf (LOG_FATAL, "100,000 record limit reached");
-        exit (1);
-    }
-#endif

     (p->head.no_records)++;
     rec->sysno = sysno;
     for (i = 0; i < REC_NO_INFO; i++)
     (p->head.no_records)++;
     rec->sysno = sysno;
     for (i = 0; i < REC_NO_INFO; i++)

diff --git a/index/trunc.c b/index/trunc.c
index 1638684..0f9128e 100644 (file)
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: trunc.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: trunc.c,v $

- * Revision 1.21  2002-04-04 14:14:13  adam
+ * Revision 1.22  2002-04-05 08:46:26  adam
+ * Zebra with full functionality
+ *
+ * Revision 1.21  2002/04/04 14:14:13  adam

  * Multiple registers (alpha early)
  *
  * Revision 1.20  2002/03/20 20:24:29  adam
  * Multiple registers (alpha early)
  *
  * Revision 1.20  2002/03/20 20:24:29  adam

@@ -83,14 +86,12 @@
 #include <rstemp.h>
 #include <rsnull.h>
 #include <rsisams.h>
 #include <rstemp.h>
 #include <rsnull.h>
 #include <rsisams.h>

-#if ZMBOL

 #include <rsisam.h>
 #include <rsisamc.h>
 #include <rsisamd.h>
 #if NEW_TRUNC
 #include <rsm_or.h>
 #endif
 #include <rsisam.h>
 #include <rsisamc.h>
 #include <rsisamd.h>
 #if NEW_TRUNC
 #include <rsm_or.h>
 #endif

-#endif

 
 struct trunc_info {
     int  *ptr;
 
 struct trunc_info {
     int  *ptr;

@@ -265,7 +266,6 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         xfree (rsfd);
         heap_close (ti);
     }
         xfree (rsfd);
         heap_close (ti);
     }

-#if ZMBOL

     else if (zi->reg->isam)
     {
         ISPT *ispt;
     else if (zi->reg->isam)
     {
         ISPT *ispt;

@@ -424,7 +424,6 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         xfree (ispt);
     }
 
         xfree (ispt);
     }
 

-#endif

     else if (zi->reg->isams)
     {
         ISAMS_PP *ispt;
     else if (zi->reg->isams)
     {
         ISAMS_PP *ispt;

@@ -482,7 +481,6 @@ static int isams_trunc_cmp (const void *p1, const void *p2)
     return i1 - i2;
 }
 
     return i1 - i2;
 }
 

-#if ZMBOL

 static int isam_trunc_cmp (const void *p1, const void *p2)
 {
     ISAM_P i1 = *(ISAM_P*) p1;
 static int isam_trunc_cmp (const void *p1, const void *p2)
 {
     ISAM_P i1 = *(ISAM_P*) p1;

@@ -517,7 +515,6 @@ static int isamd_trunc_cmp (const void *p1, const void *p2)
         return d;
     return isamd_block (i1) - isamd_block (i2);
 }
         return d;
     return isamd_block (i1) - isamd_block (i2);
 }

-#endif

 
 RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
                 const char *term, int length, const char *flags)
 
 RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
                 const char *term, int length, const char *flags)

@@ -542,7 +539,6 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
         }
         qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp);
     }
         }
         qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp);
     }

-#if ZMBOL

     else if (zi->reg->isam)
     {
         if (no == 1)
     else if (zi->reg->isam)
     {
         if (no == 1)

@@ -615,7 +611,6 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
 #endif
         qsort (isam_p, no, sizeof(*isam_p), isamd_trunc_cmp);
     }
 #endif
         qsort (isam_p, no, sizeof(*isam_p), isamd_trunc_cmp);
     }

-#endif

     else
     {
         logf (LOG_WARN, "Unknown isam set in rset_trunc");
     else
     {
         logf (LOG_WARN, "Unknown isam set in rset_trunc");

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 13b913e..f9effec 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2002, Index Data
  * All rights reserved.
  *
  * Copyright (C) 1995-2002, Index Data
  * All rights reserved.
  *

- * $Id: zebraapi.c,v 1.52 2002-04-04 20:50:37 adam Exp $
+ * $Id: zebraapi.c,v 1.53 2002-04-05 08:46:26 adam Exp $

  */
 
 #include <assert.h>
  */
 
 #include <assert.h>

@@ -182,11 +182,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     reg->sortIdx = 0;
     reg->isams = 0;
     reg->matchDict = 0;
     reg->sortIdx = 0;
     reg->isams = 0;
     reg->matchDict = 0;

-#if ZMBOL

     reg->isam = 0;
     reg->isamc = 0;
     reg->isamd = 0;
     reg->isam = 0;
     reg->isamc = 0;
     reg->isamd = 0;

-#endif

     reg->zei = 0;
     reg->matchDict = 0;
     
     reg->zei = 0;
     reg->matchDict = 0;
     

@@ -227,7 +225,6 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
            return 0;
        }
     }
            return 0;
        }
     }

-#if ZMBOL

     else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
     {
        if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,
     else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
     {
        if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,

@@ -258,7 +255,6 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
            return 0;
        }
     }
            return 0;
        }
     }

-#endif

     reg->zei = zebraExplain_open (reg->records, reg->dh,
                                   res, rw, reg,
                                   explain_extract);
     reg->zei = zebraExplain_open (reg->records, reg->dh,
                                   res, rw, reg,
                                   explain_extract);

@@ -301,14 +297,12 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
        sortIdx_close (reg->sortIdx);
        if (reg->isams)
            isams_close (reg->isams);
        sortIdx_close (reg->sortIdx);
        if (reg->isams)
            isams_close (reg->isams);

-#if ZMBOL

         if (reg->isam)
             is_close (reg->isam);
         if (reg->isamc)
             isc_close (reg->isamc);
         if (reg->isamd)
             isamd_close (reg->isamd);
         if (reg->isam)
             is_close (reg->isam);
         if (reg->isamc)
             isc_close (reg->isamc);
         if (reg->isamd)
             isamd_close (reg->isamd);

-#endif

         rec_close (&reg->records);
     }
 
         rec_close (&reg->records);
     }
 

diff --git a/index/zserver.c b/index/zserver.c
index 4930473..66217cd 100644 (file)
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (C) 1995-2000, Index Data 
+ * Copyright (C) 1995-2002, Index Data 

  * All rights reserved.
  *
  * All rights reserved.
  *

- * $Id: zserver.c,v 1.86 2002-04-04 20:50:37 adam Exp $
+ * $Id: zserver.c,v 1.87 2002-04-05 08:46:26 adam Exp $

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/rset/rsisam.c b/rset/rsisam.c
index 92e6f4c..bbb3859 100644 (file)
--- a/rset/rsisam.c
+++ b/rset/rsisam.c
@@ -1,84 +1,12 @@
 /*
 /*

- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2002, Index Data

  * All rights reserved.
  * All rights reserved.

- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsisam.c,v $
- * Revision 1.21  1999-11-30 13:48:04  adam
- * Improved installation. Updated for inclusion of YAZ header files.
- *
- * Revision 1.20  1999/05/26 07:49:14  adam
- * C++ compilation.
- *
- * Revision 1.19  1999/02/02 14:51:34  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.18  1998/03/05 08:36:28  adam
- * New result set model.
- *
- * Revision 1.17  1997/12/18 10:54:25  adam
- * New method result set method rs_hits that returns the number of
- * hits in result-set (if known). The ranked result set returns real
- * number of hits but only when not combined with other operands.
- *
- * Revision 1.16  1997/10/31 12:37:01  adam
- * Code calls xfree() instead of free().
- *
- * Revision 1.15  1996/10/29 13:55:22  adam
- * Include of zebrautl.h instead of alexutil.h.
- *
- * Revision 1.14  1995/12/11 09:15:24  adam
- * New set types: sand/sor/snot - ranked versions of and/or/not in
- * ranked/semi-ranked result sets.
- * Note: the snot not finished yet.
- * New rset member: flag.
- * Bug fix: r_delete in rsrel.c did free bad memory block.
- *
- * Revision 1.13  1995/10/12  12:41:56  adam
- * Private info (buf) moved from struct rset_control to struct rset.
- * Bug fixes in relevance.
- *
- * Revision 1.12  1995/10/10  14:00:04  adam
- * Function rset_open changed its wflag parameter to general flags.
- *
- * Revision 1.11  1995/10/06  14:38:05  adam
- * New result set method: r_score.
- * Local no (sysno) and score is transferred to retrieveCtrl.
- *
- * Revision 1.10  1995/09/08  14:52:42  adam
- * Work on relevance feedback.
- *
- * Revision 1.9  1995/09/07  13:58:43  adam
- * New parameter: result-set file descriptor (RSFD) to support multiple
- * positions within the same result-set.
- * Boolean operators: and, or, not implemented.
- *
- * Revision 1.8  1995/09/06  16:11:56  adam
- * More work on boolean sets.
- *
- * Revision 1.7  1995/09/06  10:35:44  adam
- * Null set implemented.
- *
- * Revision 1.6  1995/09/05  11:43:24  adam
- * Complete version of temporary sets. Not tested yet though.
- *
- * Revision 1.5  1995/09/04  12:33:56  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.4  1995/09/04  09:10:55  adam
- * Minor changes.
- *
- * Revision 1.3  1994/11/22  13:15:37  quinn
- * Simple
- *
- * Revision 1.2  1994/11/04  14:53:12  quinn
- * Work

  *
  *

+ * $Id: rsisam.c,v 1.22 2002-04-05 08:46:26 adam Exp $

  */
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>
  */
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>

-#if ZMBOL

 #include <rsisam.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 #include <rsisam.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);

@@ -206,4 +134,3 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAM set type is read-only");
     return -1;
 }
     logf (LOG_FATAL, "ISAM set type is read-only");
     return -1;
 }

-#endif

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 285fd17..110bbcd 100644 (file)
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,48 +1,14 @@
 /*
 /*

- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2002, Index Data

  * All rights reserved.
  * All rights reserved.

- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsisamc.c,v $
- * Revision 1.10  2002-04-04 14:14:13  adam
- * Multiple registers (alpha early)
- *
- * Revision 1.9  2002/03/20 20:24:30  adam
- * Hits per term. Returned in SearchResult-1
- *
- * Revision 1.8  1999/11/30 13:48:04  adam
- * Improved installation. Updated for inclusion of YAZ header files.
- *
- * Revision 1.7  1999/05/26 07:49:14  adam
- * C++ compilation.
- *
- * Revision 1.6  1999/02/02 14:51:35  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.5  1998/03/05 08:36:28  adam
- * New result set model.
- *
- * Revision 1.4  1997/12/18 10:54:25  adam
- * New method result set method rs_hits that returns the number of
- * hits in result-set (if known). The ranked result set returns real
- * number of hits but only when not combined with other operands.
- *
- * Revision 1.3  1997/10/31 12:37:01  adam
- * Code calls xfree() instead of free().
- *
- * Revision 1.2  1996/11/08 11:15:57  adam
- * Compressed isam fully supported.
- *
- * Revision 1.1  1996/10/29 13:41:48  adam
- * First use of isamc.

  *
  *

+ * $Id: rsisamc.c,v 1.11 2002-04-05 08:46:26 adam Exp $

  */
 
 
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>
  */
 
 
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>

-#if ZMBOL

 #include <rsisamc.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 #include <rsisamc.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);

@@ -189,4 +155,3 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAMC set type is read-only");
     return -1;
 }
     logf (LOG_FATAL, "ISAMC set type is read-only");
     return -1;
 }

-#endif

diff --git a/rset/rsisamd.c b/rset/rsisamd.c
index 3aceccb..a66c5b1 100644 (file)
--- a/rset/rsisamd.c
+++ b/rset/rsisamd.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsisamd.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsisamd.c,v $

- * Revision 1.1  2001-01-16 19:17:18  heikki
+ * Revision 1.2  2002-04-05 08:46:26  adam
+ * Zebra with full functionality
+ *
+ * Revision 1.1  2001/01/16 19:17:18  heikki

  * Added rsisamd.c
  *
  *
  * Added rsisamd.c
  *
  *

@@ -14,7 +17,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>

-#if ZMBOL

 #include <rsisamd.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 #include <rsisamd.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);

@@ -140,4 +142,3 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAMD set type is read-only");
     return -1;
 }
     logf (LOG_FATAL, "ISAMD set type is read-only");
     return -1;
 }

-#endif

diff --git a/rset/rsm_or.c b/rset/rsm_or.c
index 5232aa0..05f7fe1 100644 (file)
--- a/rset/rsm_or.c
+++ b/rset/rsm_or.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *

- * $Id: rsm_or.c,v 1.11 2002-03-20 20:24:30 adam Exp $
+ * $Id: rsm_or.c,v 1.12 2002-04-05 08:46:26 adam Exp $

  *
  */
 
  *
  */
 

@@ -14,7 +14,6 @@
 #include <string.h>
 
 #include <zebrautl.h>
 #include <string.h>
 
 #include <zebrautl.h>

-#if ZMBOL

 #include <isam.h>
 #include <isamc.h>
 #include <rsm_or.h>
 #include <isam.h>
 #include <isamc.h>
 #include <rsm_or.h>

@@ -344,4 +343,3 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "mor set type is read-only");
     return -1;
 }
     logf (LOG_FATAL, "mor set type is read-only");
     return -1;
 }

-#endif

diff --git a/zebra.spec b/zebra.spec
index 8428878..42e0307 100644 (file)
--- a/zebra.spec
+++ b/zebra.spec
@@ -1,5 +1,5 @@
 Name: zebra
 Name: zebra

-Version: 1.1.1
+Version: 1.2.0

 Release: 1
 Requires: yaz
 Copyright: Distributable
 Release: 1
 Requires: yaz
 Copyright: Distributable

diff --git a/zmbol.spec b/zmbol.spec
deleted file mode 100644 (file)
index 61bd9ec..0000000
--- a/zmbol.spec
+++ /dev/null
@@ -1,39 +0,0 @@
-Name: zmbol
-Version: 1.1.1
-Release: 1
-Requires: yaz
-Copyright: Commercial
-Group: Applications/Databases
-Vendor: Index Data ApS <info@indexdata.dk>
-Source: zmbol-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}-%{version}-root
-Packager: Adam Dickmeiss <adam@indexdata.dk>
-URL: http://www.indexdata.dk/zmbol/
-Summary: Z'mbol: a fielded free-text engine with a Z39.50 frontend.
-
-%description
-Zmbol is a fielded free-text indexing and retrieval engine with a Z39.50
-frontend. You can use any compatible, commercial or freeware Z39.50 client to
-access data stored in Zmbol.
-
-%prep
-%setup
-
-%build
-
-CFLAGS="$RPM_OPT_FLAGS" \
- ./configure --prefix=/usr --with-yazconfig=/usr/bin
-make CFLAGS="$RPM_OPT_FLAGS"
-
-%install
-rm -fr $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT/usr install
-cd doc; make prefix=$RPM_BUILD_ROOT/usr install
-
-%files
-%defattr(-,root,root)
-%doc README LICENSE.zmbol CHANGELOG 
-%config /usr/share/zmbol/tab
-/usr/bin/zmbolsrv
-/usr/bin/zmbolidx
-/usr/share/zmbol/doc