a7

diff --git a/CHANGELOG b/CHANGELOG
index a74effe..ee72b28 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,19 @@
+<<<<<<< CHANGELOG
+--- 1.0a7 1997/5/16
+
+Fixed buffer-size problem in indexing.
+
+Added compression to temporary files for updating.
+
+Added phrase registers.
+
+Added dynamic mapping of search attribute to multiple termlists (ANY).
+
+||||||| 1.18
+=======
 Scan support in multiple databases/registers.
 
+>>>>>>> /tmp/T4a11432
 Configuration settings are case-insensitive and single dash (-)
 characters are ignored in comparisons.
 

diff --git a/Makefile b/Makefile
index ef09c87..376f126 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1996, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.52 1996-05-14 11:33:22 adam Exp $
+# $Id: Makefile,v 1.53 1996-05-16 15:31:04 quinn Exp $
 
 SHELL=/bin/sh
 MAKE=make
@@ -14,7 +14,7 @@ YAZLIB=../../yaz/lib/libyaz.a
 # Where are Yaz header files located?
 YAZINC=-I../../yaz/include
 # If Yaz is compiled with mosi support uncomment and specify.
-#OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
+OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
 #OSILIB=../../xtimosi/src/libmosi.a -lrfc
 
 # Some systems have seperate socket libraries

diff --git a/include/zebraver.h b/include/zebraver.h
index c7235be..93fcfa4 100644 (file)
--- a/include/zebraver.h
+++ b/include/zebraver.h
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraver.h,v $
- * Revision 1.5  1996-04-26 09:59:47  adam
+ * Revision 1.6  1996-05-16 15:31:07  quinn
+ * a7
+ *
+ * Revision 1.5  1996/04/26  09:59:47  adam
  * Added ZEBRADATE; date of this file.
  *
  * Revision 1.4  1996/04/24  13:36:22  quinn
@@ -22,9 +25,9 @@
  */
 
 #ifndef ZEBRAVER
-#define ZEBRAVER "1.0a6"
+#define ZEBRAVER "1.0a7"
 #endif
 
 #ifndef ZEBRADATE
-#define ZEBRADATE "$Date: 1996-04-26 09:59:47 $"
+#define ZEBRADATE "$Date: 1996-05-16 15:31:07 $"
 #endif