X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=b5d6720975df5050d12bcfe63c38a4cad04a05a6;hb=b51e13a9b732fe2ca93044776d5e990dbf2a4c0e;hp=f61547abae8f6dbf654a52851f463846ed2344a0;hpb=e31c7057460f8c707301e00bf12065695b444995;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index f61547a..b5d6720 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.37 2002-10-23 10:15:18 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.41 2003-06-11 21:59:07 adam Exp $
  */
 
 #include <assert.h>
@@ -154,12 +154,41 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    if (c->m_server && c->m_server != this)
 		c->m_server->m_client = 0;
 	    c->m_server = this;
-	    c->m_seqno = parent->m_seqno;
 	    (parent->m_seqno)++;
 	    yaz_log (LOG_DEBUG, "get_client 1 %p %p", this, c);
 	    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;
+
+	    yaz_log (LOG_LOG, "Reuse session %d to %d %s",
+		     c->m_seqno, parent->m_seqno, c->get_hostname());
+
+	    c->m_seqno = parent->m_seqno;
+	    assert(c->m_server == 0);
+	    c->m_server = this;
+	    
+	    (parent->m_seqno)++;
+	    return c;
+	}
+    }
     if (!m_client)
     {
 	if (apdu->which != Z_APDU_initRequest)
@@ -188,7 +217,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	Yaz_ProxyClient *c_min = 0;
 	int min_seq = -1;
 	int no_of_clients = 0;
-	yaz_log (LOG_LOG, "Existing sessions");
+	if (parent->m_clientPool)
+	    yaz_log (LOG_LOG, "Existing sessions");
 	for (c = parent->m_clientPool; c; c = c->m_next)
 	{
 	    yaz_log (LOG_LOG, " Session %-3d wait=%d %s", c->m_seqno,
@@ -213,8 +243,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    }
 	    else
 	    {
-		yaz_log (LOG_LOG, "Reuse session %d to %d",
-		      c->m_seqno, parent->m_seqno);
+		yaz_log (LOG_LOG, "Move session %d to %d %s",
+		      c->m_seqno, parent->m_seqno, c->get_hostname());
 		if (cookie)
 		    strcpy (c->m_cookie, cookie);
 		else
@@ -265,8 +295,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;
@@ -293,7 +323,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 *)
@@ -369,6 +402,24 @@ static const char *apdu_name(Z_APDU *apdu)
 	return "presentRequest";
     case Z_APDU_presentResponse:
 	return "presentResponse";
+    case Z_APDU_deleteResultSetRequest:
+	return "deleteResultSetRequest";
+    case Z_APDU_deleteResultSetResponse:
+	return "deleteResultSetResponse";
+    case Z_APDU_scanRequest:
+	return "scanRequest";
+    case Z_APDU_scanResponse:
+	return "scanResponse";
+    case Z_APDU_sortRequest:
+	return "sortRequest";
+    case Z_APDU_sortResponse:
+	return "sortResponse";
+    case Z_APDU_extendedServicesRequest:
+	return "extendedServicesRequest";
+    case Z_APDU_extendedServicesResponse:
+	return "extendedServicesResponse";
+    case Z_APDU_close:
+	return "close";
     }
     return "other";
 }
@@ -428,15 +479,14 @@ 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 && m_client->m_waiting == 0)
     {
         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;
-
     }
     else if (m_client)
     {