X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=66d7da9fab673ecbc0a67eb04041f67594edf92e;hp=f319d5d0711b18d4bab976f079c7c47af7d37be6;hb=676640cef321916c94661bd53749130d86555bb9;hpb=a2d288bc0361884aa6e2fa953ef2766e3e1a90e7

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index f319d5d..66d7da9 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy.cpp,v 1.5 2004-08-10 09:02:16 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.10 2004-10-23 23:12:24 adam Exp $
    Copyright (c) 1998-2004, Index Data.
 
 This file is part of the yaz-proxy.
@@ -40,6 +40,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/diagbib1.h>
 #include <yazproxy/proxy.h>
 #include <yaz/pquery.h>
+#include <yaz/otherinfo.h>
 
 #if HAVE_XSLT
 #include <libxml/parser.h>
@@ -142,6 +143,7 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
     m_s2z_database = 0;
     m_schema = 0;
     m_backend_type = 0;
+    m_backend_charset = 0;
     m_frontend_type = 0;
     m_initRequest_apdu = 0;
     m_initRequest_mem = 0;
@@ -180,10 +182,10 @@ Yaz_Proxy::~Yaz_Proxy()
     nmem_destroy(m_mem_invalid_session);
     nmem_destroy(m_referenceId_mem);
 
-    xfree (m_proxyTarget);
-    xfree (m_default_target);
-    xfree (m_proxy_authentication);
-    xfree (m_optimize);
+    xfree(m_proxyTarget);
+    xfree(m_default_target);
+    xfree(m_proxy_authentication);
+    xfree(m_optimize);
 
 #if HAVE_XSLT
     if (m_stylesheet_xsp)
@@ -193,6 +195,7 @@ Yaz_Proxy::~Yaz_Proxy()
 
     xfree (m_schema);
     xfree (m_backend_type);
+    xfree (m_backend_charset);
     if (m_s2z_odr_init)
 	odr_destroy(m_s2z_odr_init);
     if (m_s2z_odr_search)
@@ -388,10 +391,11 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
 #endif
 	    xfree(m_default_target);
 	    m_default_target = xstrdup(proxy_host);
-	    proxy_host = m_default_target;
 	}
+	proxy_host = m_default_target;
 	int client_idletime = -1;
 	const char *cql2rpn_fname = 0;
+	const char *authentication = 0;
 	url[0] = m_default_target;
 	url[1] = 0;
 	if (cfg)
@@ -404,7 +408,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
 				 &m_keepalive_limit_bw,
 				 &m_keepalive_limit_pdu,
 				 &pre_init,
-				 &cql2rpn_fname);
+				 &cql2rpn_fname,
+				 &authentication);
 	}
 	if (client_idletime != -1)
 	{
@@ -413,6 +418,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
 	}
 	if (cql2rpn_fname)
 	    m_cql2rpn.set_pqf_file(cql2rpn_fname);
+	if (authentication)
+	    set_proxy_authentication(authentication);
 	if (!url[0])
 	{
 	    yaz_log(LOG_LOG, "%sNo default target", m_session_str);
@@ -470,15 +477,17 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
 	    }
 	}
     }
-    else if (!c)
+    else if (!c && apdu->which == Z_APDU_initRequest
+	     && apdu->u.initRequest->idAuthentication == 0)
     {
-	// don't have a client session yet. Search in session w/o cookie
+	// anonymous sessions without cookie.
+	// if authentication is set it is NOT anonymous se we can't share them.
 	for (c = parent->m_clientPool; c; c = c->m_next)
 	{
-	    assert (c->m_prev);
-	    assert (*c->m_prev == c);
+	    assert(c->m_prev);
+	    assert(*c->m_prev == c);
 	    if (c->m_server == 0 && c->m_cookie == 0 && 
-		c->m_waiting == 0 &&
+		c->m_waiting == 0 && 
 		!strcmp(m_proxyTarget, c->get_hostname()))
 	    {
 		// found it in cache
@@ -525,6 +534,12 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
                     odr_strdup (odr_encode(), m_proxy_authentication);
             }
         }
+	else
+	{
+	    // the client use authentication. We set the keepalive PDU
+	    // to 0 so we don't cache it in releaseClient
+	    m_keepalive_limit_pdu = 0;
+	}
 	// go through list of clients - and find the lowest/oldest one.
 	Yaz_ProxyClient *c_min = 0;
 	int min_seq = -1;
@@ -752,11 +767,14 @@ void Yaz_Proxy::convert_to_frontend_type(Z_NamePlusRecordList *p)
     }
 }
 
-void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p)
+void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p,
+				   const char *backend_charset)
 {
     int i;
 
-    yaz_iconv_t cd = yaz_iconv_open("UTF-8", "MARC-8");
+    if (!backend_charset)
+	backend_charset = "MARC-8";
+    yaz_iconv_t cd = yaz_iconv_open("UTF-8", backend_charset);
     yaz_marc_t mt = yaz_marc_create();
     yaz_marc_xml(mt, YAZ_MARC_MARCXML);
     yaz_marc_iconv(mt, cd);
@@ -970,8 +988,8 @@ int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics,
     if (cfg)
     {
 	int len;
-	char *b = cfg->get_explain(odr_encode(), 0 /* target */,
-				   m_s2z_database, &len);
+	char *b = cfg->get_explain_doc(odr_encode(), 0 /* target */,
+				       m_s2z_database, &len);
 	if (b)
 	{
 	    Z_SRW_PDU *res = yaz_srw_get(odr_encode(), Z_SRW_explain_response);
@@ -1092,7 +1110,8 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu)
 		if (m_backend_type)
 		    convert_to_frontend_type(p->u.databaseOrSurDiagnostics);
 		if (m_marcxml_flag)
-		    convert_to_marcxml(p->u.databaseOrSurDiagnostics);
+		    convert_to_marcxml(p->u.databaseOrSurDiagnostics,
+				       m_backend_charset);
 		if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu))
 		    return 0;
 		    
@@ -1132,7 +1151,8 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu)
 	    if (m_backend_type)
 		convert_to_frontend_type(p->u.databaseOrSurDiagnostics);
 	    if (m_marcxml_flag)
-		convert_to_marcxml(p->u.databaseOrSurDiagnostics);
+		convert_to_marcxml(p->u.databaseOrSurDiagnostics,
+				   m_backend_charset);
 	    if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu))
 		return 0;
 	}
@@ -1239,7 +1259,6 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
 		return 0;
 	    }
 	    Z_NamePlusRecordList *npr;
-	    int oclass = 0;
 #if 0
 	    yaz_log(LOG_LOG, "%sCache lookup %d+%d syntax=%s",
 		    m_session_str, start, toget, yaz_z3950oid_to_str(
@@ -1645,7 +1664,7 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
 				    m_default_target,
 				    sr->preferredRecordSyntax, rc,
 				    &addinfo, &stylesheet_name, &m_schema,
-				    &m_backend_type);
+				    &m_backend_type, &m_backend_charset);
 	if (stylesheet_name)
 	{
 	    m_parent->low_socket_close();
@@ -1719,7 +1738,7 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
 				    pr->preferredRecordSyntax,
 				    pr->recordComposition,
 				    &addinfo, &stylesheet_name, &m_schema,
-				    &m_backend_type);
+				    &m_backend_type, &m_backend_charset);
 	if (stylesheet_name)
 	{
 	    m_parent->low_socket_close();
@@ -1785,6 +1804,25 @@ Z_ElementSetNames *Yaz_Proxy::mk_esn_from_schema(ODR o, const char *schema)
     return esn;
 }
 
+void Yaz_Proxy::srw_get_client(const char *db, const char **backend_db)
+{
+    const char *t = 0;
+    Yaz_ProxyConfig *cfg = check_reconfigure();
+    if (cfg)
+	t = cfg->get_explain_name(db, backend_db);
+
+    if (m_client && m_default_target && t && strcmp(m_default_target, t))
+    {
+	releaseClient();
+    }
+    
+    if (t)
+    {
+	xfree(m_default_target);
+	m_default_target = xstrdup(t);
+    }
+}
+	
 void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq)
 {
     if (m_s2z_odr_init)
@@ -1842,6 +1880,9 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq)
 	{
 	    Z_SRW_searchRetrieveRequest *srw_req = srw_pdu->u.request;
 
+	    const char *backend_db = srw_req->database;
+	    srw_get_client(srw_req->database, &backend_db);
+
 	    m_s2z_database = odr_strdup(m_s2z_odr_init, srw_req->database);
 	    // recordXPath unsupported.
 	    if (srw_req->recordXPath)
@@ -1892,7 +1933,7 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq)
 	    z_searchRequest->databaseNames = (char**)
 		odr_malloc(m_s2z_odr_search, sizeof(char *));
 	    z_searchRequest->databaseNames[0] = odr_strdup(m_s2z_odr_search,
-							   srw_req->database);
+							   backend_db);
 	    
 	    // query transformation
 	    Z_Query *query = (Z_Query *)
@@ -2019,6 +2060,9 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq)
 	{
 	    Z_SRW_explainRequest *srw_req = srw_pdu->u.explain_request;
 
+	    const char *backend_db = srw_req->database;
+	    srw_get_client(srw_req->database, &backend_db);
+
 	    m_s2z_database = odr_strdup(m_s2z_odr_init, srw_req->database);
 
 	    // save stylesheet
@@ -2238,8 +2282,10 @@ void Yaz_Proxy::connectNotify()
 {
 }
 
-void Yaz_Proxy::shutdown()
+void Yaz_Proxy::releaseClient()
 {
+    xfree(m_proxyTarget);
+    m_proxyTarget = 0;
     m_invalid_session = 0;
     // only keep if keep_alive flag is set...
     if (m_client && 
@@ -2257,7 +2303,7 @@ void Yaz_Proxy::shutdown()
         assert (m_client->m_waiting != 2);
 	// Tell client (if any) that no server connection is there..
 	m_client->m_server = 0;
-	m_invalid_session = 0;
+	m_client = 0;
     }
     else if (m_client)
     {
@@ -2266,6 +2312,7 @@ void Yaz_Proxy::shutdown()
                  m_client->get_hostname());
         assert (m_client->m_waiting != 2);
 	delete m_client;
+	m_client = 0;
     }
     else if (!m_parent)
     {
@@ -2280,6 +2327,11 @@ void Yaz_Proxy::shutdown()
     }
     if (m_parent)
 	m_parent->pre_init();
+}
+
+void Yaz_Proxy::shutdown()
+{
+    releaseClient();
     delete this;
 }
 
@@ -2382,6 +2434,7 @@ void Yaz_Proxy::pre_init()
     int keepalive_limit_bw, keepalive_limit_pdu;
     int pre_init;
     const char *cql2rpn = 0;
+    const char *authentication = 0;
 
     Yaz_ProxyConfig *cfg = check_reconfigure();
 
@@ -2399,7 +2452,8 @@ void Yaz_Proxy::pre_init()
 					  &keepalive_limit_bw,
 					  &keepalive_limit_pdu,
 					  &pre_init,
-					  &cql2rpn) ; i++)
+					  &cql2rpn,
+					  &authentication) ; i++)
     {
 	if (pre_init)
 	{