Added decode stream in bend search structures.

diff --git a/Makefile.in b/Makefile.in
index fcda7e6..893461d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1998, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.2 1998-08-25 16:19:37 adam Exp $
+# $Id: Makefile.in,v 1.3 1998-09-02 12:41:48 adam Exp $
 
 # Uncomment the lines below to enable mOSI communcation.
 #ODEFS=-DUSE_XTIMOSI
@@ -29,7 +29,7 @@ CC=@CC@
 CPP=@CPP@
 SHELL=/bin/sh
 MAKE=make
-SUBDIR=$(MOD) util odr $(RFC1006) ccl comstack retrieval client server ztest makelib
+SUBDIR=$(MOD) util odr $(RFC1006) ccl comstack retrieval client server ztest lib
 # Add external libraries to the LIBS macro
 LIBS=@LIBS@
 

diff --git a/configure b/configure
index 06ec092..a05f6d7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1464,7 +1464,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile util/Makefile asn/Makefile odr/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile makelib/Makefile rfc1006/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile util/Makefile asn/Makefile odr/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile lib/Makefile rfc1006/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1541,7 +1541,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile util/Makefile asn/Makefile odr/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile makelib/Makefile rfc1006/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile util/Makefile asn/Makefile odr/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile lib/Makefile rfc1006/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/configure.in b/configure.in
index 747e032..a4447da 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl YAZ Toolkit
 dnl (c) Index Data 1994-1998
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.1 1998-08-21 14:13:24 adam Exp $
+dnl $Id: configure.in,v 1.2 1998-09-02 12:41:50 adam Exp $
 AC_INIT(include/yaz-version.h)
 dnl ------ Substitutions
 AC_SUBST(ODEFS)
@@ -51,4 +51,4 @@ if test "$ac_cv_header_stdc" = "no"; then
 fi
 dnl
 dnl ------ Makefiles
-AC_OUTPUT(Makefile util/Makefile asn/Makefile odr/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile makelib/Makefile rfc1006/Makefile)
+AC_OUTPUT(Makefile util/Makefile asn/Makefile odr/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile lib/Makefile rfc1006/Makefile)

diff --git a/include/backend.h b/include/backend.h
index 2eb7be4..d31fc72 100644 (file)
--- a/include/backend.h
+++ b/include/backend.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: backend.h,v $
- * Revision 1.21  1998-07-20 12:38:41  adam
+ * Revision 1.22  1998-09-02 12:41:51  adam
+ * Added decode stream in bend search structures.
+ *
+ * Revision 1.21  1998/07/20 12:38:41  adam
  * Implemented delete result set service to server API.
  *
  * Revision 1.20  1998/05/27 16:57:06  adam
@@ -68,6 +71,7 @@ typedef struct
     char **basenames;          /* databases to search */
     Z_Query *query;            /* query structure */
     ODR stream;                /* encoding stream */
+    ODR decode;                /* decoding stream */
 } bend_searchrequest;
 
 /* old search request output */
@@ -86,6 +90,7 @@ typedef struct {
     char **basenames;          /* databases to search */
     Z_Query *query;            /* query structure */
     ODR stream;                /* encode stream */
+    ODR decode;                /* decode stream */
 
     bend_request request;
     bend_association association;

diff --git a/lib/Makefile.in b/lib/Makefile.in
new file mode 100644 (file)
index 0000000..20a23e2
--- /dev/null
+++ b/lib/Makefile.in
@@ -0,0 +1,27 @@
+# Copyright (C) 1994-1998, Index Data 
+# All rights reserved.
+# Sebastian Hammer, Adam Dickmeiss
+# $Id: Makefile.in,v 1.1 1998-09-02 12:41:52 adam Exp $
+
+SHELL=/bin/sh
+
+RANLIB=@RANLIB@
+
+MAKE=make
+YAZLIBS=libodr.a libasn.a libcomstack.a \
+       libserver.a libutil.a libret.a
+LIB=libyaz.a
+
+all: $(LIB)
+
+$(LIB): $(LIBS)
+       rm -f $(LIB)
+       for i in $(YAZLIBS); do echo $$i; ar x $$i; rm -f __*; done
+       ar qc $(LIB) *.o
+       rm -f *.o
+       $(RANLIB) $(LIB)
+
+clean:
+       -rm -f *.o $(LIB)
+
+depend:

diff --git a/makelib/Makefile.in b/makelib/Makefile.in
deleted file mode 100644 (file)
index 44314cd..0000000
--- a/makelib/Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 1994, Index Data I/S 
-# All rights reserved.
-# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.2 1998-08-25 16:19:42 adam Exp $
-
-SHELL=/bin/sh
-
-RANLIB=@RANLIB@
-
-MAKE=make
-LIBDIR=../lib
-YAZLIBS=$(LIBDIR)/libodr.a $(LIBDIR)/libasn.a $(LIBDIR)/libcomstack.a \
-       $(LIBDIR)/libserver.a $(LIBDIR)/libutil.a $(LIBDIR)/libret.a
-LIB=$(LIBDIR)/libyaz.a
-
-all: $(LIB)
-
-$(LIB): $(LIBS)
-       rm -f $(LIB)
-       for i in $(YAZLIBS); do echo $$i; ar x $$i; rm -f __*; done
-       ar qc $(LIB) *.o
-       rm -f *.o
-       $(RANLIB) $(LIB)
-
-clean:
-       -rm -f *.o
-
-depend:

diff --git a/server/seshigh.c b/server/seshigh.c
index 3d808ac..5421432 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.79  1998-08-19 16:10:08  adam
+ * Revision 1.80  1998-09-02 12:41:53  adam
+ * Added decode stream in bend search structures.
+ *
+ * Revision 1.79  1998/08/19 16:10:08  adam
  * Changed som member names of DeleteResultSetRequest/Response.
  *
  * Revision 1.78  1998/08/03 10:23:55  adam
@@ -1189,6 +1192,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb,
        bsrr->basenames = req->databaseNames;
        bsrr->query = req->query;
        bsrr->stream = assoc->encode;
+       bsrr->decode = assoc->decode;
        bsrr->errcode = 0;
        bsrr->hits = 0;
        bsrr->errstring = NULL;
@@ -1207,6 +1211,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb,
        bsrq.basenames = req->databaseNames;
        bsrq.query = req->query;
        bsrq.stream = assoc->encode;
+       bsrq.decode = assoc->decode;
        if (!(bsrt = bend_search(assoc->backend, &bsrq, fd)))
            return 0;
        bsrr->hits = bsrt->hits;