X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=853d5ee2ce66ffa2f1cad7b69c4a57a365b69d3a;hb=f3fd0f268287ca2508f201360cf98623db1e4032;hp=e7c1ad2e505b738c08f0b46bc2f956853e811dbf;hpb=8cd77956b745e79b984bc0c9b74989aeae8dd49d;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index e7c1ad2..853d5ee 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -2,12 +2,14 @@
  * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.cpp,v 1.52 2003-10-08 09:32:49 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.60 2003-10-16 08:28:10 adam Exp $
  */
 
 #include <assert.h>
 #include <time.h>
 
+#include <yaz/marcdisp.h>
+#include <yaz/yaz-iconv.h>
 #include <yaz/log.h>
 #include <yaz/diagbib1.h>
 #include <yaz++/proxy.h>
@@ -50,15 +52,17 @@ static const char *apdu_name(Z_APDU *apdu)
     return "other";
 }
 
-Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
+Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
+		     Yaz_Proxy *parent) :
     Yaz_Z_Assoc(the_PDU_Observable), m_bw_stat(60), m_pdu_stat(60)
 {
     m_PDU_Observable = the_PDU_Observable;
     m_client = 0;
-    m_parent = 0;
+    m_parent = parent;
     m_clientPool = 0;
     m_seqno = 1;
-    m_keepalive = 0;
+    m_keepalive_limit_bw = 500000;
+    m_keepalive_limit_pdu = 1000;
     m_proxyTarget = 0;
     m_default_target = 0;
     m_proxy_authentication = 0;
@@ -74,21 +78,32 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
     m_bw_max = 0;
     m_pdu_max = 0;
     m_max_record_retrieve = 0;
+    m_reconfig_flag = 0;
+    m_config_fname = 0;
+    m_request_no = 0;
+    m_invalid_session = 0;
+    m_config = 0;
+    m_marcxml_flag = 0;
 }
 
 Yaz_Proxy::~Yaz_Proxy()
 {
-    yaz_log(LOG_LOG, "%s Closed %d/%d sent/recv bytes total", m_session_str,
+    yaz_log(LOG_LOG, "%sClosed %d/%d sent/recv bytes total", m_session_str,
 	    m_bytes_sent, m_bytes_recv);
     xfree (m_proxyTarget);
     xfree (m_default_target);
     xfree (m_proxy_authentication);
     xfree (m_optimize);
+    delete m_config;
 }
 
 int Yaz_Proxy::set_config(const char *config)
 {
-    int r = m_config.read_xml(config);
+    delete m_config;
+    m_config = new Yaz_ProxyConfig();
+    xfree(m_config_fname);
+    m_config_fname = xstrdup(config);
+    int r = m_config->read_xml(config);
     return r;
 }
 
@@ -108,20 +123,45 @@ void Yaz_Proxy::set_proxy_authentication (const char *auth)
 	m_proxy_authentication = (char *) xstrdup (auth);
 }
 
+Yaz_ProxyConfig *Yaz_Proxy::check_reconfigure()
+{
+    if (m_parent)
+	return m_parent->check_reconfigure();
+
+    Yaz_ProxyConfig *cfg = m_config;
+    if (m_reconfig_flag)
+    {
+	yaz_log(LOG_LOG, "reconfigure");
+	yaz_log_reopen();
+	if (m_config_fname && cfg)
+	{
+	    yaz_log(LOG_LOG, "reconfigure config %s", m_config_fname);
+	    int r = cfg->read_xml(m_config_fname);
+	    if (r)
+		yaz_log(LOG_WARN, "reconfigure failed");
+	}
+	else
+	    yaz_log(LOG_LOG, "reconfigure");
+	m_reconfig_flag = 0;
+    }
+    return cfg;
+}
+
 IYaz_PDU_Observer *Yaz_Proxy::sessionNotify(IYaz_PDU_Observable
 					    *the_PDU_Observable, int fd)
 {
-    Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable);
-    new_proxy->m_parent = this;
-    new_proxy->m_config = m_config;
+    check_reconfigure();
+    Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable, this);
+    new_proxy->m_config = 0;
+    new_proxy->m_config_fname = 0;
     new_proxy->timeout(m_client_idletime);
     new_proxy->m_target_idletime = m_target_idletime;
     new_proxy->set_default_target(m_default_target);
     new_proxy->set_APDU_log(get_APDU_log());
     new_proxy->set_proxy_authentication(m_proxy_authentication);
-    sprintf(new_proxy->m_session_str, "%ld:%d", (long) time(0), m_session_no);
+    sprintf(new_proxy->m_session_str, "%ld:%d ", (long) time(0), m_session_no);
     m_session_no++;
-    yaz_log (LOG_LOG, "%s New session %s", new_proxy->m_session_str,
+    yaz_log (LOG_LOG, "%sNew session %s", new_proxy->m_session_str,
 	     the_PDU_Observable->getpeername());
     return new_proxy;
 }
@@ -176,7 +216,7 @@ const char *Yaz_Proxy::load_balance(const char **url)
     const char *ret = 0;
     for (i = 0; url[i]; i++)
     {
-	yaz_log(LOG_LOG, "%s zurl=%s use=%d",
+	yaz_log(LOG_DEBUG, "%szurl=%s use=%d",
 		m_session_str, url[i], zurl_in_use[i]);
 	if (min > zurl_in_use[i])
 	{
@@ -201,18 +241,25 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
     {
 	const char *url[MAX_ZURL_PLEX];
 	const char *proxy_host = get_proxy(oi);
+	Yaz_ProxyConfig *cfg = check_reconfigure();
 	if (proxy_host)
 	{
 	    xfree(m_default_target);
 	    m_default_target = xstrdup(proxy_host);
 	    proxy_host = m_default_target;
 	}
-	
 	int client_idletime = -1;
-	m_config.get_target_info(proxy_host, url, &m_keepalive, &m_bw_max,
+	int pre_init = 0;
+	url[0] = m_default_target;
+	url[1] = 0;
+	if (cfg)
+	    cfg->get_target_info(proxy_host, url, &m_bw_max,
 				 &m_pdu_max, &m_max_record_retrieve,
 				 &m_target_idletime, &client_idletime,
-				 &parent->m_max_clients);
+				 &parent->m_max_clients,
+				 &m_keepalive_limit_bw,
+				 &m_keepalive_limit_pdu,
+				 &pre_init);
 	if (client_idletime != -1)
 	{
 	    m_client_idletime = client_idletime;
@@ -220,10 +267,16 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	}
 	if (!url[0])
 	{
-	    yaz_log(LOG_LOG, "%s No default target", m_session_str);
+	    yaz_log(LOG_LOG, "%sNo default target", m_session_str);
 	    return 0;
 	}
-	m_proxyTarget = (char*) xstrdup(load_balance(url));
+	// we don't handle multiplexing for cookie session, so we just
+	// pick the first one in this case (anonymous users will be able
+	// to use any backend)
+	if (cookie && *cookie)
+	    m_proxyTarget = (char*) xstrdup(url[0]);
+	else
+	    m_proxyTarget = (char*) xstrdup(load_balance(url));
     }
     if (cookie && *cookie)
     {
@@ -251,7 +304,6 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 		yaz_log (LOG_LOG, "%s REOPEN target=%s", m_session_str,
 			 c->get_hostname());
 		c->close();
-		c->client(m_proxyTarget);
 		c->m_init_flag = 0;
 
 		c->m_last_ok = 0;
@@ -260,7 +312,13 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 		c->m_sr_transform = 0;
 		c->m_waiting = 0;
 		c->m_resultSetStartPoint = 0;
-		c->timeout(m_target_idletime); 
+		c->m_target_idletime = m_target_idletime;
+		if (c->client(m_proxyTarget))
+		{
+		    delete c;
+		    return 0;
+		}
+		c->timeout(30); 
 	    }
 	    c->m_seqno = parent->m_seqno;
 	    if (c->m_server && c->m_server != this)
@@ -280,6 +338,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    assert (c->m_prev);
 	    assert (*c->m_prev == c);
 	    if (c->m_server == 0 && c->m_cookie == 0 && 
+		c->m_waiting == 0 &&
 		!strcmp(m_proxyTarget, c->get_hostname()))
 	    {
 		cc = c;
@@ -290,7 +349,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    // found it in cache
 	    c = cc;
 
-	    yaz_log (LOG_LOG, "%s REUSE %d %d %s",
+	    yaz_log (LOG_LOG, "%sREUSE %d %d %s",
 		     m_session_str,
 		     c->m_seqno, parent->m_seqno, c->get_hostname());
 
@@ -299,6 +358,9 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    c->m_server = this;
 	    
 	    (parent->m_seqno)++;
+
+	    parent->pre_init();
+
 	    return c;
 	}
     }
@@ -331,10 +393,10 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	int min_seq = -1;
 	int no_of_clients = 0;
 	if (parent->m_clientPool)
-	    yaz_log (LOG_LOG, "Existing sessions");
+	    yaz_log (LOG_DEBUG, "Existing sessions");
 	for (c = parent->m_clientPool; c; c = c->m_next)
 	{
-	    yaz_log (LOG_LOG, " Session %-3d wait=%d %s cookie=%s", c->m_seqno,
+	    yaz_log (LOG_DEBUG, " Session %-3d wait=%d %s cookie=%s", c->m_seqno,
 			       c->m_waiting, c->get_hostname(),
 			       c->m_cookie ? c->m_cookie : "");
 	    no_of_clients++;
@@ -349,7 +411,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    c = c_min;
 	    if (c->m_waiting || strcmp(m_proxyTarget, c->get_hostname()))
 	    {
-		yaz_log (LOG_LOG, "%s MAXCLIENTS Destroy %d",
+		yaz_log (LOG_LOG, "%sMAXCLIENTS Destroy %d",
 			 m_session_str, c->m_seqno);
 		if (c->m_server && c->m_server != this)
 		    delete c->m_server;
@@ -357,7 +419,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    }
 	    else
 	    {
-		yaz_log (LOG_LOG, "%s MAXCLIENTS Reuse %d %d %s",
+		yaz_log (LOG_LOG, "%sMAXCLIENTS Reuse %d %d %s",
 			 m_session_str,
 			 c->m_seqno, parent->m_seqno, c->get_hostname());
 		xfree (c->m_cookie);
@@ -371,14 +433,16 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 		    delete c->m_server;
 		}
 		(parent->m_seqno)++;
+		c->m_target_idletime = m_target_idletime;
+		c->timeout(m_target_idletime);
 		return c;
 	    }
 	}
 	else
 	{
-	    yaz_log (LOG_LOG, "%s NEW %d %s",
+	    yaz_log (LOG_LOG, "%sNEW %d %s",
 		     m_session_str, parent->m_seqno, m_proxyTarget);
-	    c = new Yaz_ProxyClient(m_PDU_Observable->clone());
+	    c = new Yaz_ProxyClient(m_PDU_Observable->clone(), parent);
 	    c->m_next = parent->m_clientPool;
 	    if (c->m_next)
 		c->m_next->m_prev = &c->m_next;
@@ -392,7 +456,6 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    c->m_cookie = xstrdup(cookie);
 
 	c->m_seqno = parent->m_seqno;
-	c->client(m_proxyTarget);
 	c->m_init_flag = 0;
 	c->m_last_resultCount = 0;
         c->m_last_ok = 0;
@@ -400,9 +463,15 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	c->m_sr_transform = 0;
 	c->m_waiting = 0;
 	c->m_resultSetStartPoint = 0;
+	(parent->m_seqno)++;
+	if (c->client(m_proxyTarget))
+ 	{
+	    delete c;
+	    return 0;
+        }
+	c->m_target_idletime = m_target_idletime;
 	c->timeout(30);
 
-	(parent->m_seqno)++;
     }
     yaz_log (LOG_DEBUG, "get_client 3 %p %p", this, c);
     return c;
@@ -418,24 +487,24 @@ void Yaz_Proxy::display_diagrecs(Z_DiagRec **pp, int num)
         Z_DiagRec *p = pp[i];
         if (p->which != Z_DiagRec_defaultFormat)
         {
-	    yaz_log(LOG_LOG, "%s Error no diagnostics", m_session_str);
+	    yaz_log(LOG_LOG, "%sError no diagnostics", m_session_str);
             return;
         }
         else
             r = p->u.defaultFormat;
         if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
             ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1)
-	    yaz_log(LOG_LOG, "%s Error unknown diagnostic set", m_session_str);
+	    yaz_log(LOG_LOG, "%sError unknown diagnostic set", m_session_str);
         switch (r->which)
         {
         case Z_DefaultDiagFormat_v2Addinfo:
-	    yaz_log(LOG_LOG, "%s Error %d %s:%s",
+	    yaz_log(LOG_LOG, "%sError %d %s:%s",
 		    m_session_str,
 		    *r->condition, diagbib1_str(*r->condition),
 		    r->u.v2Addinfo);
             break;
         case Z_DefaultDiagFormat_v3Addinfo:
-	    yaz_log(LOG_LOG, "%s Error %d %s:%s",
+	    yaz_log(LOG_LOG, "%sError %d %s:%s",
 		    m_session_str,
 		    *r->condition, diagbib1_str(*r->condition),
 		    r->u.v3Addinfo);
@@ -444,6 +513,67 @@ void Yaz_Proxy::display_diagrecs(Z_DiagRec **pp, int num)
     }
 }
 
+void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p)
+{
+    int i;
+
+    yaz_marc_t mt = yaz_marc_create();
+    yaz_marc_xml(mt, YAZ_MARC_MARCXML);
+    for (i = 0; i < p->num_records; i++)
+    {
+	Z_NamePlusRecord *npr = p->records[i];
+	if (npr->which == Z_NamePlusRecord_databaseRecord)
+	{
+	    Z_External *r = npr->u.databaseRecord;
+	    if (r->which == Z_External_octet)
+	    {
+		int rlen;
+		char *result;
+		if (yaz_marc_decode_buf(mt, (char*) r->u.octet_aligned->buf,
+					r->u.octet_aligned->len,
+					&result, &rlen))
+		{
+		    yaz_iconv_t cd = yaz_iconv_open("UTF-8", "MARC-8");
+		    WRBUF wrbuf = wrbuf_alloc();
+		    
+		    char outbuf[120];
+		    size_t inbytesleft = rlen;
+		    const char *inp = result;
+		    while (cd && inbytesleft)
+		    {
+			size_t outbytesleft = sizeof(outbuf);
+			char *outp = outbuf;
+			size_t r;
+			
+			r = yaz_iconv (cd, (char**) &inp,
+				       &inbytesleft,
+				       &outp, &outbytesleft);
+			if (r == (size_t) (-1))
+			{
+			    int e = yaz_iconv_error(cd);
+			    if (e != YAZ_ICONV_E2BIG)
+			    {
+				yaz_log(LOG_WARN, "conversion failure");
+				break;
+			    }
+			}
+			wrbuf_write(wrbuf, outbuf, outp - outbuf);
+		    }
+		    if (cd)
+			yaz_iconv_close(cd);
+
+		    npr->u.databaseRecord = z_ext_record(odr_encode(),
+							 VAL_TEXT_XML,
+							 wrbuf_buf(wrbuf),
+							 wrbuf_len(wrbuf));
+		    wrbuf_free(wrbuf, 1);
+		}
+	    }
+	}
+    }
+    yaz_marc_destroy(mt);
+}
+
 int Yaz_Proxy::send_to_client(Z_APDU *apdu)
 {
     int len = 0;
@@ -461,9 +591,15 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu)
 	}
 	else
 	{
+	    if (m_marcxml_flag && p && p->which == Z_Records_DBOSD)
+		convert_to_marcxml(p->u.databaseOrSurDiagnostics);
 	    if (sr->resultCount)
-		yaz_log(LOG_LOG, "%s %d hits", m_session_str,
+	    {
+		yaz_log(LOG_LOG, "%s%d hits", m_session_str,
 			*sr->resultCount);
+		if (*sr->resultCount < 0)
+		    m_invalid_session = 1;
+	    }
 	}
     }
     else if (apdu->which == Z_APDU_presentResponse)
@@ -478,9 +614,11 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu)
 
 	    display_diagrecs(&dr_p, 1);
 	}
+	if (m_marcxml_flag && p && p->which == Z_Records_DBOSD)
+	    convert_to_marcxml(p->u.databaseOrSurDiagnostics);
     }
     int r = send_Z_PDU(apdu, &len);
-    yaz_log (LOG_LOG, "%s Sending %s to client %d bytes", m_session_str,
+    yaz_log (LOG_DEBUG, "%sSending %s to client %d bytes", m_session_str,
 	     apdu_name(apdu), len);
     m_bytes_sent += len;
     m_bw_stat.add_bytes(len);
@@ -491,7 +629,7 @@ int Yaz_ProxyClient::send_to_target(Z_APDU *apdu)
 {
     int len = 0;
     int r = send_Z_PDU(apdu, &len);
-    yaz_log (LOG_LOG, "%s Sending %s to %s %d bytes",
+    yaz_log (LOG_LOG, "%sSending %s to %s %d bytes",
 	     get_session_str(),
 	     apdu_name(apdu), get_hostname(), len);
     m_bytes_sent += len;
@@ -500,8 +638,6 @@ int Yaz_ProxyClient::send_to_target(Z_APDU *apdu)
 
 Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 {
-    if (*m_parent->m_optimize == '0')
-        return apdu;      // don't optimize result sets..
     if (apdu->which == Z_APDU_presentRequest)
     {
 	Z_PresentRequest *pr = apdu->u.presentRequest;
@@ -509,14 +645,36 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 	int toget = *pr->numberOfRecordsRequested;
 	int start = *pr->resultSetStartPoint;
 
-	if (m_client->m_last_resultSetId &&
-	    !strcmp(m_client->m_last_resultSetId, pr->resultSetId))
+	yaz_log(LOG_LOG, "%sPresent %s %d+%d", m_session_str,
+		pr->resultSetId, start, toget);
+
+	if (*m_parent->m_optimize == '0')
+	    return apdu;
+
+	if (!m_client->m_last_resultSetId)
 	{
+	    Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse);
+	    new_apdu->u.presentResponse->records =
+		create_nonSurrogateDiagnostics(odr_encode(), 30,
+					       pr->resultSetId);
+	    send_to_client(new_apdu);
+	    return 0;
+	}
+	if (!strcmp(m_client->m_last_resultSetId, pr->resultSetId))
+	{
+	    if (start+toget-1 > m_client->m_last_resultCount)
+	    {
+		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse);
+		new_apdu->u.presentResponse->records =
+		    create_nonSurrogateDiagnostics(odr_encode(), 13, 0);
+		send_to_client(new_apdu);
+		return 0;
+	    }
 	    if (m_client->m_cache.lookup (odr_encode(), &npr, start, toget,
 					  pr->preferredRecordSyntax,
 					  pr->recordComposition))
 	    {
-		yaz_log (LOG_LOG, "%s Returned cache records for present request", 
+		yaz_log (LOG_LOG, "%sReturned cached records for present request", 
 			 m_session_str);
 		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse);
 		new_apdu->u.presentResponse->referenceId = pr->referenceId;
@@ -548,11 +706,12 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
     
     this_query->set_Z_Query(sr->query);
 
-    char query_str[80];
+    char query_str[120];
     this_query->print(query_str, sizeof(query_str)-1);
-    yaz_log(LOG_LOG, "%s Query %s", m_session_str, query_str);
+    yaz_log(LOG_LOG, "%sSearch %s", m_session_str, query_str);
 
-    if (m_client->m_last_ok && m_client->m_last_query &&
+    if (*m_parent->m_optimize != '0' &&
+	m_client->m_last_ok && m_client->m_last_query &&
 	m_client->m_last_query->match(this_query) &&
         !strcmp(m_client->m_last_resultSetId, sr->resultSetName) &&
         m_client->m_last_databases.match(this_databases))
@@ -579,7 +738,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 	    if (m_client->m_cache.lookup (odr_encode(), &npr, 1, toget,
 					  sr->preferredRecordSyntax, comp))
 	    {
-		yaz_log (LOG_LOG, "%s Returned cache records for medium set",
+		yaz_log (LOG_LOG, "%sReturned cached records for medium set",
 			 m_session_str);
 		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
 		new_apdu->u.searchResponse->referenceId = sr->referenceId;
@@ -604,7 +763,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 	    {
 		// medium Set
 		// send present request (medium size)
-		yaz_log (LOG_LOG, "%s Optimizing search for medium set",
+		yaz_log (LOG_LOG, "%sOptimizing search for medium set",
 			 m_session_str);
 
 		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
@@ -622,7 +781,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 	    m_client->m_last_resultCount <= 0)
 	{
             // large set. Return pseudo-search response immediately
-	    yaz_log (LOG_LOG, "%s Optimizing search for large set",
+	    yaz_log (LOG_LOG, "%sOptimizing search for large set",
 		     m_session_str);
 	    Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
 	    new_apdu->u.searchResponse->referenceId = sr->referenceId;
@@ -650,7 +809,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 	    if (m_client->m_cache.lookup (odr_encode(), &npr, 1, toget,
 					  sr->preferredRecordSyntax, comp))
 	    {
-		yaz_log (LOG_LOG, "%s Returned cache records for small set",
+		yaz_log (LOG_LOG, "%sReturned cached records for small set",
 			 m_session_str);
 		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
 		new_apdu->u.searchResponse->referenceId = sr->referenceId;
@@ -673,7 +832,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 	    }
 	    else
 	    {
-		yaz_log (LOG_LOG, "%s Optimizing search for small set",
+		yaz_log (LOG_LOG, "%sOptimizing search for small set",
 			 m_session_str);
 		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
 		Z_PresentRequest *pr = new_apdu->u.presentRequest;
@@ -707,10 +866,15 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 
 void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len)
 {
+    char *cp = strchr(m_session_str, ' ');
+    m_request_no++;
+    if (cp)
+	sprintf(cp+1, "%d ", m_request_no);
+
     int reduce = 0;
     m_bytes_recv += len;
     
-    yaz_log (LOG_LOG, "%s Receiving %s from client %d bytes", m_session_str,
+    yaz_log (LOG_DEBUG, "%sReceiving %s from client %d bytes", m_session_str,
 	     apdu_name(apdu), len);
 
     if (m_bw_hold_PDU)     // double incoming PDU. shutdown now.
@@ -722,7 +886,7 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len)
     int bw_total = m_bw_stat.get_total();
     int pdu_total = m_pdu_stat.get_total();
 
-    yaz_log(LOG_LOG, "%s stat bw=%d pdu=%d limit-bw=%d limit-pdu=%d",
+    yaz_log(LOG_LOG, "%sstat bw=%d pdu=%d limit-bw=%d limit-pdu=%d",
 	    m_session_str, bw_total, pdu_total, m_bw_max, m_pdu_max);
     if (m_bw_max)
     {
@@ -741,7 +905,7 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len)
     }
     if (reduce)  
     {
-	yaz_log(LOG_LOG, "%s Limit delay=%d", m_session_str, reduce);
+	yaz_log(LOG_LOG, "%sLimit delay=%d", m_session_str, reduce);
 	m_bw_hold_PDU = apdu;  // save PDU and signal "on hold"
 	timeout(reduce);       // call us reduce seconds later
     }
@@ -791,10 +955,13 @@ Z_APDU *Yaz_Proxy::handle_query_validation(Z_APDU *apdu)
     if (apdu->which == Z_APDU_searchRequest)
     {
 	Z_SearchRequest *sr = apdu->u.searchRequest;
-	int err;
+	int err = 0;
 	char *addinfo = 0;
-	err = m_config.check_query(odr_encode(), m_default_target, sr->query,
-				   &addinfo);
+
+	Yaz_ProxyConfig *cfg = check_reconfigure();
+	if (cfg)
+	    err = cfg->check_query(odr_encode(), m_default_target,
+				   sr->query, &addinfo);
 	if (err)
 	{
 	    Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
@@ -814,17 +981,29 @@ Z_APDU *Yaz_Proxy::handle_query_validation(Z_APDU *apdu)
 
 Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
 {
+    m_marcxml_flag = 0;
     if (apdu->which == Z_APDU_searchRequest)
     {
 	Z_SearchRequest *sr = apdu->u.searchRequest;
-	if (*sr->smallSetUpperBound > 0 || *sr->largeSetLowerBound > 1)
+	if (*sr->smallSetUpperBound > 0 || *sr->mediumSetPresentNumber > 0)
 	{
-	    int err;
+	    int err = 0;
 	    char *addinfo = 0;
-	    err = m_config.check_syntax(odr_encode(), m_default_target,
+	    Yaz_ProxyConfig *cfg = check_reconfigure();
+
+	    if (cfg)
+		err = cfg->check_syntax(odr_encode(),
+					m_default_target,
 					sr->preferredRecordSyntax,
 					&addinfo);
-	    if (err)
+	    if (err == -1)
+	    {
+		sr->preferredRecordSyntax =
+		    yaz_oidval_to_z3950oid(odr_decode(), CLASS_RECSYN,
+					   VAL_USMARC);
+		m_marcxml_flag = 1;
+	    }
+	    else if (err)
 	    {
 		Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
 		
@@ -842,12 +1021,22 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
     else if (apdu->which == Z_APDU_presentRequest)
     {
 	Z_PresentRequest *pr = apdu->u.presentRequest;
-	int err;
+	int err = 0;
 	char *addinfo = 0;
-	err = m_config.check_syntax(odr_encode(), m_default_target,
+	Yaz_ProxyConfig *cfg = check_reconfigure();
+
+	if (cfg)
+	    err = cfg->check_syntax(odr_encode(), m_default_target,
 				    pr->preferredRecordSyntax,
 				    &addinfo);
-	if (err)
+	if (err == -1)
+	{
+	    pr->preferredRecordSyntax =
+		yaz_oidval_to_z3950oid(odr_decode(), CLASS_RECSYN,
+				       VAL_USMARC);
+	    m_marcxml_flag = 1;
+	}
+	else if (err)
 	{
 	    Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse);
 	    
@@ -879,13 +1068,13 @@ void Yaz_Proxy::recv_Z_PDU_0(Z_APDU *apdu)
     if (apdu->which == Z_APDU_initRequest)
     {
 	if (apdu->u.initRequest->implementationId)
-	    yaz_log(LOG_LOG, "%s implementationId: %s",
+	    yaz_log(LOG_LOG, "%simplementationId: %s",
 		    m_session_str, apdu->u.initRequest->implementationId);
 	if (apdu->u.initRequest->implementationName)
-	    yaz_log(LOG_LOG, "%s implementationName: %s",
+	    yaz_log(LOG_LOG, "%simplementationName: %s",
 		    m_session_str, apdu->u.initRequest->implementationName);
 	if (apdu->u.initRequest->implementationVersion)
-	    yaz_log(LOG_LOG, "%s implementationVersion: %s",
+	    yaz_log(LOG_LOG, "%simplementationVersion: %s",
 		    m_session_str, apdu->u.initRequest->implementationVersion);
 	if (m_client->m_init_flag)
 	{
@@ -948,18 +1137,26 @@ void Yaz_Proxy::connectNotify()
 void Yaz_Proxy::shutdown()
 {
     // only keep if keep_alive flag is set...
-    if (m_keepalive && m_client && m_client->m_waiting == 0)
+    if (m_client && 
+	!m_invalid_session &&
+	m_client->m_pdu_recv < m_keepalive_limit_pdu &&
+	m_client->m_bytes_recv+m_client->m_bytes_sent < m_keepalive_limit_bw &&
+	m_client->m_waiting == 0)
     {
-        yaz_log (LOG_LOG, "%s Shutdown (client to proxy) keepalive %s",
+        yaz_log(LOG_LOG, "%sShutdown (client to proxy) keepalive %s",
 		 m_session_str,
                  m_client->get_hostname());
+	yaz_log(LOG_LOG, "%sbw=%d pdu=%d limit-bw=%d limit-pdu=%d",
+		m_session_str, m_client->m_pdu_recv,
+		m_client->m_bytes_sent + m_client->m_bytes_recv,
+		m_keepalive_limit_bw, m_keepalive_limit_pdu);
         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)
     {
-        yaz_log (LOG_LOG, "%s Shutdown (client to proxy) close %s",
+        yaz_log (LOG_LOG, "%sShutdown (client to proxy) close %s",
 		 m_session_str,
                  m_client->get_hostname());
         assert (m_client->m_waiting != 2);
@@ -967,28 +1164,30 @@ void Yaz_Proxy::shutdown()
     }
     else if (!m_parent)
     {
-        yaz_log (LOG_LOG, "%s shutdown (client to proxy) bad state",
+        yaz_log (LOG_LOG, "%sshutdown (client to proxy) bad state",
 		 m_session_str);
         assert (m_parent);
     }
     else 
     {
-        yaz_log (LOG_LOG, "%s Shutdown (client to proxy)",
+        yaz_log (LOG_LOG, "%sShutdown (client to proxy)",
 		 m_session_str);
     }
+    if (m_parent)
+	m_parent->pre_init();
     delete this;
 }
 
 const char *Yaz_ProxyClient::get_session_str() 
 {
     if (!m_server)
-	return "0";
+	return "0 ";
     return m_server->get_session_str();
 }
 
 void Yaz_ProxyClient::shutdown()
 {
-    yaz_log (LOG_LOG, "%s Shutdown (proxy to target) %s", get_session_str(),
+    yaz_log (LOG_LOG, "%sShutdown (proxy to target) %s", get_session_str(),
 	     get_hostname());
     delete m_server;
     delete this;
@@ -996,34 +1195,33 @@ void Yaz_ProxyClient::shutdown()
 
 void Yaz_Proxy::failNotify()
 {
-    yaz_log (LOG_LOG, "%s Connection closed by client",
+    yaz_log (LOG_LOG, "%sConnection closed by client",
 	     get_session_str());
     shutdown();
 }
 
 void Yaz_ProxyClient::failNotify()
 {
-    yaz_log (LOG_LOG, "%s Connection closed by target %s", 
+    yaz_log (LOG_LOG, "%sConnection closed by target %s", 
 	     get_session_str(), get_hostname());
     shutdown();
 }
 
 void Yaz_ProxyClient::connectNotify()
 {
-    yaz_log (LOG_LOG, "%s Connection accepted by %s", get_session_str(),
-	     get_hostname());
-    int to;
-    if (m_server)
-	to = m_server->get_target_idletime();
-    else
-	to = 600;
-    timeout(to);
+    const char *s = get_session_str();
+    const char *h = get_hostname();
+    yaz_log (LOG_LOG, "%sConnection accepted by %s timeout=%d", s, h,
+	     m_target_idletime);
+    timeout(m_target_idletime);
+    if (!m_server)
+	pre_init_client();
 }
 
 IYaz_PDU_Observer *Yaz_ProxyClient::sessionNotify(IYaz_PDU_Observable
 						  *the_PDU_Observable, int fd)
 {
-    return new Yaz_ProxyClient(the_PDU_Observable);
+    return new Yaz_ProxyClient(the_PDU_Observable, 0);
 }
 
 Yaz_ProxyClient::~Yaz_ProxyClient()
@@ -1039,30 +1237,135 @@ Yaz_ProxyClient::~Yaz_ProxyClient()
     xfree (m_cookie);
 }
 
+void Yaz_ProxyClient::pre_init_client()
+{
+    Z_APDU *apdu = create_Z_PDU(Z_APDU_initRequest);
+    Z_InitRequest *req = apdu->u.initRequest;
+    
+    ODR_MASK_SET(req->options, Z_Options_search);
+    ODR_MASK_SET(req->options, Z_Options_present);
+    ODR_MASK_SET(req->options, Z_Options_namedResultSets);
+    ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl);
+    ODR_MASK_SET(req->options, Z_Options_scan);
+    ODR_MASK_SET(req->options, Z_Options_sort);
+    ODR_MASK_SET(req->options, Z_Options_extendedServices);
+    ODR_MASK_SET(req->options, Z_Options_delSet);
+    
+    ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1);
+    ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2);
+    ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3);
+    
+    if (send_to_target(apdu) < 0)
+    {
+	delete this;
+    }
+    else
+    {
+	m_waiting = 1;
+	m_init_flag = 1;
+    }
+}
+
+void Yaz_Proxy::pre_init()
+{
+    int i;
+    const char *name = 0;
+    const char *zurl_in_use[MAX_ZURL_PLEX];
+    int limit_bw, limit_pdu, limit_req;
+    int target_idletime, client_idletime;
+    int max_clients;
+    int keepalive_limit_bw, keepalive_limit_pdu;
+    int pre_init;
+
+    Yaz_ProxyConfig *cfg = check_reconfigure();
+
+    yaz_log(LOG_LOG, "pre_init");
+    zurl_in_use[0] = 0;
+    for (i = 0; cfg && cfg->get_target_no(i, &name, zurl_in_use,
+					  &limit_bw, &limit_pdu, &limit_req,
+					  &target_idletime, &client_idletime,
+					  &max_clients, 
+					  &keepalive_limit_bw,
+					  &keepalive_limit_pdu,
+					  &pre_init) ; i++)
+    {
+	if (pre_init)
+	{
+	    int j;
+	    for (j = 0; zurl_in_use[j]; j++)
+	    {
+		Yaz_ProxyClient *c;
+		int spare = 0;
+		for (c = m_clientPool; c; c = c->m_next)
+		{
+		    if (!strcmp(zurl_in_use[j], c->get_hostname())
+			&& c->m_server == 0 && c->m_cookie == 0)
+			spare++;
+		}
+		yaz_log(LOG_LOG, "pre_init %s %s spare=%d pre_init=%d",
+			name, zurl_in_use[j], spare, pre_init);
+		if (spare < pre_init)
+		{
+		    c = new Yaz_ProxyClient(m_PDU_Observable->clone(), this);
+		    c->m_next = m_clientPool;
+		    if (c->m_next)
+			c->m_next->m_prev = &c->m_next;
+		    m_clientPool = c;
+		    c->m_prev = &m_clientPool;
+		    
+		    if (c->client(zurl_in_use[j]))
+		    {
+			timeout(60);
+			delete c;
+			return;
+		    }
+		    c->timeout(30);
+		    c->m_waiting = 1;
+		    c->m_target_idletime = target_idletime;
+		    yaz_log(LOG_LOG, "pre_init name=%s zurl=%s timeout=%d", name,
+			    zurl_in_use[j], target_idletime);
+		    c->m_seqno = m_seqno++;
+		}
+	    }
+	}
+    }
+}
+
 void Yaz_Proxy::timeoutNotify()
 {
-    if (m_bw_hold_PDU)
+    if (m_parent)
     {
-	timeout(m_client_idletime);
-	Z_APDU *apdu = m_bw_hold_PDU;
-	m_bw_hold_PDU = 0;
-	recv_Z_PDU_0(apdu);
+	if (m_bw_hold_PDU)
+	{
+	    timeout(m_client_idletime);
+	    Z_APDU *apdu = m_bw_hold_PDU;
+	    m_bw_hold_PDU = 0;
+	    recv_Z_PDU_0(apdu);
+	}
+	else
+	{
+	    yaz_log (LOG_LOG, "%sTimeout (client to proxy)", m_session_str);
+	    shutdown();
+	}
     }
     else
     {
-	yaz_log (LOG_LOG, "%s Timeout (client to proxy)", m_session_str);
-	shutdown();
+	timeout(600);
+	pre_init();
     }
 }
 
 void Yaz_ProxyClient::timeoutNotify()
 {
-    yaz_log (LOG_LOG, "%s Timeout (proxy to target) %s", get_session_str(),
+    yaz_log (LOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(),
 	     get_hostname());
+    m_waiting = 1;
+    m_root->pre_init();
     shutdown();
 }
 
-Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) :
+Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable,
+				 Yaz_Proxy *parent) :
     Yaz_Z_Assoc (the_PDU_Observable)
 {
     m_cookie = 0;
@@ -1079,6 +1382,11 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) :
     m_initResponse = 0;
     m_resultSetStartPoint = 0;
     m_bytes_sent = m_bytes_recv = 0;
+    m_pdu_recv = 0;
+    m_server = 0;
+    m_seqno = 0;
+    m_target_idletime = 600;
+    m_root = parent;
 }
 
 const char *Yaz_Proxy::option(const char *name, const char *value)
@@ -1096,11 +1404,14 @@ const char *Yaz_Proxy::option(const char *name, const char *value)
 void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len)
 {
     m_bytes_recv += len;
+    m_pdu_recv++;
     m_waiting = 0;
-    yaz_log (LOG_LOG, "%s Receiving %s from %s %d bytes", get_session_str(),
+    yaz_log (LOG_LOG, "%sReceiving %s from %s %d bytes", get_session_str(),
 	     apdu_name(apdu), get_hostname(), len);
     if (apdu->which == Z_APDU_initResponse)
     {
+	if (!m_server)  // if this is a pre init session , check for more
+	    m_root->pre_init();
         NMEM nmem = odr_extract_mem (odr_decode());
 	odr_reset (m_init_odr);
         nmem_transfer (m_init_odr->mem, nmem);
@@ -1174,3 +1485,11 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len)
 	shutdown();
     }
 }
+
+void Yaz_Proxy::server(const char *addr)
+{
+    Yaz_Z_Assoc::server(addr);
+
+    timeout(1);
+}
+