X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=03b8228409e4b75726d732d026dd2b108d739e18;hb=8c594d2cb1d5f9a3042883763fbdf846ba0eef70;hp=b0ac80202d989693a3cdb66d38106788941b6944;hpb=ceb226cb18d96a6b3aa2dd6cff94aa27850362cf;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index b0ac802..03b8228 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.cpp,v 1.36 2002-10-09 12:50:26 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.39 2003-06-09 22:20:39 adam Exp $
  */
 
 #include <assert.h>
@@ -24,6 +24,7 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
     m_proxy_authentication = 0;
     m_max_clients = 50;
     m_seed = time(0);
+    m_idletime = 600;
     m_optimize = xstrdup ("1");
 }
 
@@ -55,7 +56,7 @@ IYaz_PDU_Observer *Yaz_Proxy::sessionNotify(IYaz_PDU_Observable
 {
     Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable);
     new_proxy->m_parent = this;
-    new_proxy->timeout(500);
+    new_proxy->timeout(m_idletime);
     new_proxy->set_proxy_target(m_proxyTarget);
     new_proxy->set_APDU_log(get_APDU_log());
     new_proxy->set_proxy_authentication(m_proxy_authentication);
@@ -147,7 +148,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 		c->m_last_resultCount = 0;
 		c->m_sr_transform = 0;
 		c->m_waiting = 0;
-		c->timeout(600); 
+		c->timeout(m_idletime); 
 	    }
 	    c->m_seqno = parent->m_seqno;
 	    if (c->m_server && c->m_server != this)
@@ -159,6 +160,34 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    return c;
 	}
     }
+    else if (!c)
+    {
+	Yaz_ProxyClient *cc = 0;
+	
+	for (c = parent->m_clientPool; c; c = c->m_next)
+	{
+	    assert (c->m_prev);
+	    assert (*c->m_prev == c);
+	    if (c->m_server == 0 && c->m_cookie[0] == 0 && 
+		!strcmp(m_proxyTarget, c->get_hostname()))
+	    {
+		cc = c;
+	    }
+	}
+	if (cc)
+	{
+	    // found it in cache
+	    c = cc;
+
+	    c->m_seqno = parent->m_seqno;
+	    assert(c->m_server == 0);
+	    c->m_server = this;
+	    c->m_seqno = parent->m_seqno;
+	    (parent->m_seqno)++;
+	    yaz_log (LOG_LOG, "get_client 10 %p %p", this, c);
+	    return c;
+	}
+    }
     if (!m_client)
     {
 	if (apdu->which != Z_APDU_initRequest)
@@ -252,7 +281,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
         c->m_last_ok = 0;
 	c->m_sr_transform = 0;
 	c->m_waiting = 0;
-	c->timeout(10);
+	c->timeout(20);
 
 	(parent->m_seqno)++;
     }
@@ -264,8 +293,8 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 {
     if (apdu->which != Z_APDU_searchRequest)
 	return apdu;
-    if (*m_parent->m_optimize != '1')
-        return apdu;
+    if (*m_parent->m_optimize == '0')
+        return apdu;      // don't optimize result sets..
     Z_SearchRequest *sr = apdu->u.searchRequest;
     Yaz_Z_Query *this_query = new Yaz_Z_Query;
     Yaz_Z_Databases this_databases;
@@ -292,7 +321,10 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 	    pr->referenceId = sr->referenceId;
 	    pr->resultSetId = sr->resultSetName;
 	    pr->preferredRecordSyntax = sr->preferredRecordSyntax;
-	    *pr->numberOfRecordsRequested = *sr->mediumSetPresentNumber;
+            if (*sr->mediumSetPresentNumber < m_client->m_last_resultCount)
+                *pr->numberOfRecordsRequested = *sr->mediumSetPresentNumber;
+            else
+                *pr->numberOfRecordsRequested = m_client->m_last_resultCount;
 	    if (sr->mediumSetElementSetNames)
 	    {
 		pr->recordComposition = (Z_RecordComposition *)
@@ -427,26 +459,26 @@ void Yaz_Proxy::connectNotify()
 
 void Yaz_Proxy::shutdown()
 {
-    // only keep if keep_alive flag and cookie is set...
-    if (m_keepalive && m_client && m_client->m_cookie[0])
+    // only keep if keep_alive flag is set...
+    if (m_keepalive && m_client)
     {
-	if (m_client->m_waiting == 2)
-	    abort();
+        yaz_log (LOG_LOG, "shutdown (client to proxy) keepalive %s",
+                 m_client->get_hostname());
+        assert (m_client->m_waiting != 2);
 	// Tell client (if any) that no server connection is there..
 	m_client->m_server = 0;
-        yaz_log (LOG_LOG, "shutdown (client to proxy) keepalive %s", m_client->get_hostname());
     }
     else if (m_client)
     {
-	if (m_client->m_waiting == 2)
-	    abort();
-        yaz_log (LOG_LOG, "shutdown (client to proxy) close %s", m_client->get_hostname());
+        yaz_log (LOG_LOG, "shutdown (client to proxy) close %s",
+                 m_client->get_hostname());
+        assert (m_client->m_waiting != 2);
 	delete m_client;
     }
     else if (!m_parent)
     {
         yaz_log (LOG_LOG, "shutdown (client to proxy) bad state");
-        abort();
+        assert (m_parent);
     }
     else 
     {