From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 10 Sep 2002 11:58:13 +0000 (+0000)
Subject: Fix init response so it is equivalent to that returned by the target
X-Git-Tag: YAZPP.0.3~3
X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=commitdiff_plain;h=911c48d1500fb1fe8d43da7507c4fd46bc95e2ec

Fix init response so it is equivalent to that returned by the target
---

diff --git a/buildconf.sh b/buildconf.sh
index 02252f6..9848019 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.7 2002-04-15 09:43:30 adam Exp $
+# $Id: buildconf.sh,v 1.8 2002-09-10 11:58:13 adam Exp $
 dir=`aclocal --print-ac-dir`
 if [ -f $dir/yaz.m4 ]; then
 	aclocal
@@ -8,7 +8,7 @@ else
 fi
 libtoolize --force 
 automake -a 
-autoconf || exit 4
+autoconf
 if [ -f config.cache ]; then
 	rm config.cache
 fi
diff --git a/include/yaz++/yaz-proxy.h b/include/yaz++/yaz-proxy.h
index f05f2fe..4ef900c 100644
--- a/include/yaz++/yaz-proxy.h
+++ b/include/yaz++/yaz-proxy.h
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.h,v 1.5 2002-01-14 12:01:27 adam Exp $
+ * $Id: yaz-proxy.h,v 1.6 2002-09-10 11:58:13 adam Exp $
  */
 
 #include <yaz++/yaz-z-assoc.h>
@@ -35,6 +35,8 @@ class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc {
     int m_sr_transform;
     int m_seqno;
     int m_waiting;
+    ODR m_init_odr;
+    Z_APDU *m_initResponse;
 };
 
 /// Information Retrieval Proxy Server.
diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 61fc748..6705d92 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.cpp,v 1.33 2002-09-10 11:30:54 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.34 2002-09-10 11:58:13 adam Exp $
  */
 
 #include <assert.h>
@@ -383,7 +383,8 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
     {
 	if (m_client->m_init_flag)
 	{
-	    Z_APDU *apdu = create_Z_PDU(Z_APDU_initResponse);
+	    Z_APDU *apdu = m_client->m_initResponse;
+	    apdu->u.initResponse->otherInfo = 0;
 	    if (m_client->m_cookie)
 		set_otherInformationString(apdu, VAL_COOKIE, 1,
 					   m_client->m_cookie);
@@ -487,6 +488,7 @@ Yaz_ProxyClient::~Yaz_ProxyClient()
     if (m_next)
 	m_next->m_prev = m_prev;
     m_waiting = 2;     // for debugging purposes only.
+    odr_destroy(m_init_odr);
     delete m_last_query;
 }
 
@@ -514,6 +516,8 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) :
     m_last_ok = 0;
     m_sr_transform = 0;
     m_waiting = 0;
+    m_init_odr = odr_createmem (ODR_DECODE);
+    m_initResponse = 0;
 }
 
 const char *Yaz_Proxy::option(const char *name, const char *value)
@@ -533,6 +537,14 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu)
     m_waiting = 0;
     yaz_log (LOG_LOG, "Receiving %s from %s", apdu_name(apdu),
 		     get_hostname());
+    if (apdu->which == Z_APDU_initResponse)
+    {
+        NMEM nmem = odr_extract_mem (odr_decode());
+	odr_reset (m_init_odr);
+        nmem_transfer (m_init_odr->mem, nmem);
+        m_initResponse = apdu;
+        nmem_destroy (nmem);
+    }
     if (apdu->which == Z_APDU_searchResponse)
     {
 	m_last_resultCount = *apdu->u.searchResponse->resultCount;