From 01d003d2633f2c160e255737ae63165effaf2dde Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 20 Dec 1996 11:06:36 +0000
Subject: [PATCH] Implemented multi-or result set.

---
 CHANGELOG        |    2 +-
 Makefile         |    4 +---
 include/rsm_or.h |   31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 include/rsm_or.h

diff --git a/CHANGELOG b/CHANGELOG
index 56ce29b..4a16dd7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Reduction in size of saved keys (storeKeys = 1).
+Reduced disk space for saved keys (storeKeys = 1).
 
 Implemented proximity operator in search.
 
diff --git a/Makefile b/Makefile
index ede81ca..1837e1b 100644
--- 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.56 1996-10-29 14:12:11 adam Exp $
+# $Id: Makefile,v 1.57 1996-12-20 11:06:37 adam Exp $
 
 SHELL=/bin/sh
 MAKE=make
@@ -9,8 +9,6 @@ RANLIB=ranlib
 
 # Where are Yaz libraries located?
 YAZLIB=../../yaz/lib/libyaz.a
-#YAZLIB=/usr/local/lib/libyazchkr.a
-#YAZLIB=-lyaz
 # Where are Yaz header files located?
 YAZINC=-I../../yaz/include
 # If Yaz is compiled with mosi support uncomment and specify.
diff --git a/include/rsm_or.h b/include/rsm_or.h
new file mode 100644
index 0000000..74647b8
--- /dev/null
+++ b/include/rsm_or.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 1994-1996, Index Data I/S 
+ * All rights reserved.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Log: rsm_or.h,v $
+ * Revision 1.1  1996-12-20 11:06:45  adam
+ * Implemented multi-or result set.
+ *
+ *
+ */
+
+#ifndef RSET_M_OR_H
+#define RSET_M_OR_H
+
+#include <rset.h>
+
+extern const rset_control *rset_kind_m_or;
+
+typedef struct rset_m_or_parms
+{
+    int     key_size;
+    int     (*cmp)(const void *p1, const void *p2);
+
+    ISAMC   isc;
+    ISAM_P  *isam_positions;
+
+    int     no_isam_positions;
+} rset_m_or_parms;
+
+#endif
-- 
1.7.10.4