X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-proxy-config.cpp;h=f7ab3d92e698d602387faac17dc33262f0807c5c;hb=36388cfc9c49bf00dfbb3cc9932504a77af9b6f2;hp=8b98f1139c8b929fcdbfdc0401e21aa347ba204a;hpb=d7f41f16caf965adb1a5ffcdaa937787dfcc030a;p=yazproxy-moved-to-github.git

diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp
index 8b98f11..f7ab3d9 100644
--- a/src/yaz-proxy-config.cpp
+++ b/src/yaz-proxy-config.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy-config.cpp,v 1.22 2005-06-25 15:58:33 adam Exp $
+/* $Id: yaz-proxy-config.cpp,v 1.25 2006-03-25 10:59:14 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -39,14 +39,17 @@ class Yaz_ProxyConfigP {
     xmlNodePtr m_proxyPtr;
     void return_target_info(xmlNodePtr ptr, const char **url,
                             int *limit_bw, int *limit_pdu, int *limit_req,
+                            int *limit_search, int *limit_connect,
                             int *target_idletime, int *client_idletime,
                             int *keepalive_limit_bw, int *keepalive_limit_pdu,
                             int *pre_init, const char **cql2rpn,
                             const char **negotiation_charset,
                             const char **negotiation_lang,
-                            const char **target_charset);
+                            const char **target_charset,
+                            const char **default_client_query_charset);
     void return_limit(xmlNodePtr ptr,
-                      int *limit_bw, int *limit_pdu, int *limit_req);
+                      int *limit_bw, int *limit_pdu, int *limit_req,
+                      int *limit_search, int *limit_connect);
     int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
                      char **addinfo);
     xmlNodePtr find_target_node(const char *name, const char *db);
@@ -99,7 +102,7 @@ void Yaz_ProxyConfigP::load_modules()
     for (ptr = m_proxyPtr->children; ptr; ptr = ptr->next)
     {
         const char *fname;
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "module")
             && (fname = get_text(ptr)))
         {
@@ -166,33 +169,49 @@ const char *Yaz_ProxyConfigP::get_text(xmlNodePtr ptr)
 
 #if HAVE_XSLT
 void Yaz_ProxyConfigP::return_limit(xmlNodePtr ptr,
-                                   int *limit_bw,
-                                   int *limit_pdu,
-                                   int *limit_req)
+                                    int *limit_bw,
+                                    int *limit_pdu,
+                                    int *limit_req,
+                                    int *limit_search,
+                                    int *limit_connect)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "bandwidth"))
         {
             const char *t = get_text(ptr);
             if (t)
                 *limit_bw = atoi(t);
         }
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "retrieve"))
         {
             const char *t = get_text(ptr);
             if (t)
                 *limit_req = atoi(t);
         }
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "pdu"))
         {
             const char *t = get_text(ptr);
             if (t)
                 *limit_pdu = atoi(t);
         }
+        if (ptr->type == XML_ELEMENT_NODE 
+            && !strcmp((const char *) ptr->name, "search"))
+        {
+            const char *t = get_text(ptr);
+            if (t)
+                *limit_search = atoi(t);
+        }
+        if (ptr->type == XML_ELEMENT_NODE 
+            && !strcmp((const char *) ptr->name, "connect"))
+        {
+            const char *t = get_text(ptr);
+            if (t)
+                *limit_connect = atoi(t);
+        }
     }
 }
 #endif
@@ -203,6 +222,8 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
                                           int *limit_bw,
                                           int *limit_pdu,
                                           int *limit_req,
+                                          int *limit_search,
+                                          int *limit_connect,
                                           int *target_idletime,
                                           int *client_idletime,
                                           int *keepalive_limit_bw,
@@ -211,20 +232,21 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
                                           const char **cql2rpn,
                                           const char **negotiation_charset,
                                           const char **negotiation_lang,
-                                          const char **target_charset)
+                                          const char **target_charset,
+                                          const char **default_client_query_charset)
 {
     *pre_init = 0;
     int no_url = 0;
     ptr = ptr->children;
     for (; ptr; ptr = ptr->next)
     {
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "preinit"))
         {
             const char *v = get_text(ptr);
             *pre_init = v ? atoi(v) : 1;
         }
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "url"))
         {
             const char *t = get_text(ptr);
@@ -234,18 +256,19 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
                 url[no_url] = 0;
             }
         }
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "keepalive"))
         {
             int dummy;
             *keepalive_limit_bw = 500000;
             *keepalive_limit_pdu = 1000;
             return_limit(ptr, keepalive_limit_bw, keepalive_limit_pdu,
-                         &dummy);
+                         &dummy, &dummy, &dummy);
         }
         if (ptr->type == XML_ELEMENT_NODE 
             && !strcmp((const char *) ptr->name, "limit"))
-            return_limit(ptr, limit_bw, limit_pdu, limit_req);
+            return_limit(ptr, limit_bw, limit_pdu, limit_req,
+                         limit_search, limit_connect);
         if (ptr->type == XML_ELEMENT_NODE 
             && !strcmp((const char *) ptr->name, "target-timeout"))
         {
@@ -257,7 +280,7 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
                     *target_idletime = 0;
             }
         }
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "client-timeout"))
         {
             const char *t = get_text(ptr);
@@ -268,28 +291,35 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
                     *client_idletime = 0;
             }
         }
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "cql2rpn"))
         {
             const char *t = get_text(ptr);
             if (t)
                 *cql2rpn = t;
         }
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "target-charset"))
         {
             const char *t = get_text(ptr);
             if (t && target_charset)
                 *target_charset = t;
         }
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
+            && !strcmp((const char *) ptr->name, "default-client-charset"))
+        {
+            const char *t = get_text(ptr);
+            if (t && default_client_query_charset)
+                *default_client_query_charset = t;
+        }
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "negotiation-charset"))
         {
             const char *t = get_text(ptr);
             if (t)
                 *negotiation_charset = t;
         }
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "negotiation-lang"))
         {
             const char *t = get_text(ptr);
@@ -343,15 +373,15 @@ int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl,
     for (i = 0; i<attrs->num_attributes; i++)
     {
         Z_AttributeElement *el = attrs->attributes[i];
-        
+
         if (!el->attributeType)
             continue;
         int type = *el->attributeType;
         int *value = 0;
-        
+
         if (el->which == Z_AttributeValue_numeric && el->value.numeric)
             value = el->value.numeric;
-        
+
         xmlNodePtr ptr;
         for(ptr = ptrl->children; ptr; ptr = ptr->next)
         {
@@ -379,7 +409,7 @@ int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl,
                     char addinfo_str[20];
                     if (!match_list(type, match_type))
                         continue;
-                    
+
                     *addinfo_str = '\0';
                     if (!strcmp(match_type, "*"))
                         sprintf (addinfo_str, "%d", type);
@@ -391,7 +421,7 @@ int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl,
                     }
                     else
                         continue;
-                    
+
                     if (match_error)
                     {
                         if (*addinfo_str)
@@ -447,7 +477,7 @@ int Yaz_ProxyConfig::check_query(ODR odr, const char *name, Z_Query *query,
 {
 #if HAVE_XSLT
     xmlNodePtr ptr;
-    
+
     ptr = m_cp->find_target_node(name, 0);
     if (ptr)
     {
@@ -478,7 +508,7 @@ int Yaz_ProxyConfigP::check_schema(xmlNodePtr ptr, Z_RecordComposition *comp,
     // Check each name element
     for (; ptr; ptr = ptr->next)
     {
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "name"))
         {
             xmlNodePtr tptr = ptr->children;
@@ -540,7 +570,7 @@ void Yaz_ProxyConfig::target_authentication(const char *name,
     xmlNodePtr ptr = m_cp->find_target_node(name, 0);
     if (!ptr)
         return ;
-    
+
     for (ptr = ptr->children; ptr; ptr = ptr->next)
         if (ptr->type == XML_ELEMENT_NODE &&
             !strcmp((const char *) ptr->name, "target-authentication"))
@@ -555,7 +585,9 @@ void Yaz_ProxyConfig::target_authentication(const char *name,
             }
             const char *t = m_cp->get_text(ptr);
             if (!t || !strcmp(type, "none"))
+            {
                 req->idAuthentication = 0;
+            }
             else if (!strcmp(type, "anonymous"))
             {
                 req->idAuthentication =
@@ -581,7 +613,7 @@ void Yaz_ProxyConfig::target_authentication(const char *name,
                 *password = '\0';
                 *user = '\0';
                 sscanf(t, "%63[^:]:%63[^:]:%63s", user, group, password);
-                
+
                 req->idAuthentication =
                     (Z_IdAuthentication *)
                     odr_malloc (odr, sizeof(*req->idAuthentication));
@@ -681,7 +713,7 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
 #if HAVE_XSLT
     int syntax_has_matched = 0;
     xmlNodePtr ptr;
-    
+
     ptr = m_cp->find_target_node(name, 0);
     if (!ptr)
         return 0;
@@ -833,7 +865,7 @@ xmlNodePtr Yaz_ProxyConfigP::find_target_db(xmlNodePtr ptr, const char *db)
                 {
                     if (attr->children
                         && attr->children->type==XML_TEXT_NODE
-                        && attr->children->content 
+                        && attr->children->content
                         && (!strcmp((const char *) attr->children->content, db)
                             || !strcmp((const char *) attr->children->content,
                                        "*")))
@@ -842,7 +874,7 @@ xmlNodePtr Yaz_ProxyConfigP::find_target_db(xmlNodePtr ptr, const char *db)
         }
     return ptr;
 }
-    
+
 xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db)
 {
     xmlNodePtr ptr;
@@ -853,7 +885,7 @@ xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db)
         if (ptr->type == XML_ELEMENT_NODE &&
             !strcmp((const char *) ptr->name, "target"))
         {
-            // default one ? 
+            // default one ?
             if (!name)
             {
                 // <target default="1"> ?
@@ -878,7 +910,7 @@ xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db)
                     {
                         if (attr->children
                             && attr->children->type==XML_TEXT_NODE
-                            && attr->children->content 
+                            && attr->children->content
                             && (!strcmp((const char *) attr->children->content,
                                         name)
                                 || !strcmp((const char *) attr->children->content,
@@ -900,6 +932,8 @@ int Yaz_ProxyConfig::get_target_no(int no,
                                    int *limit_bw,
                                    int *limit_pdu,
                                    int *limit_req,
+                                   int *limit_search,
+                                   int *limit_connect,
                                    int *target_idletime,
                                    int *client_idletime,
                                    int *max_clients,
@@ -910,7 +944,8 @@ int Yaz_ProxyConfig::get_target_no(int no,
                                    const char **authentication,
                                    const char **negotiation_charset,
                                    const char **negotiation_lang,
-                                   const char **target_charset)
+                                   const char **target_charset,
+                                   const char **default_client_query_charset)
 {
 #if HAVE_XSLT
     xmlNodePtr ptr;
@@ -935,10 +970,12 @@ int Yaz_ProxyConfig::get_target_no(int no,
                 m_cp->return_target_info(
                     ptr, url,
                     limit_bw, limit_pdu, limit_req,
+                    limit_search, limit_connect,
                     target_idletime, client_idletime,
                     keepalive_limit_bw, keepalive_limit_pdu,
                     pre_init, cql2rpn,
-                    negotiation_charset, negotiation_lang, target_charset);
+                    negotiation_charset, negotiation_lang, target_charset,
+                    default_client_query_charset);
                 return 1;
             }
             i++;
@@ -963,7 +1000,7 @@ void Yaz_ProxyConfig::get_generic_info(int *log_mask,
         return;
     for (ptr = m_cp->m_proxyPtr->children; ptr; ptr = ptr->next)
     {
-        if (ptr->type == XML_ELEMENT_NODE 
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "log"))
         {
             const char *v = m_cp->get_text(ptr);
@@ -1041,7 +1078,7 @@ int Yaz_ProxyConfigP::get_explain_ptr(const char *host, const char *db,
                         if (ptr->type == XML_ELEMENT_NODE &&
                             !strcmp((const char *) ptr->name, "database"))
                             break;
-                    
+
                     if (!ptr)
                         continue;
                     for (ptr = ptr->children; ptr; ptr = ptr->next)
@@ -1070,12 +1107,12 @@ const char *Yaz_ProxyConfig::get_explain_name(const char *db,
     {
         struct _xmlAttr *attr;
         const char *name = 0;
-        
+
         for (attr = ptr_target->properties; attr; attr = attr->next)
             if (!strcmp((const char *) attr->name, "name")
                 && attr->children
                 && attr->children->type==XML_TEXT_NODE
-                && attr->children->content 
+                && attr->children->content
                 && attr->children->content[0])
             {
                 name = (const char *)attr->children->content;
@@ -1106,16 +1143,16 @@ char *Yaz_ProxyConfig::get_explain_doc(ODR odr, const char *name,
     if (m_cp->get_explain_ptr(0 /* host */, db, &ptr_target, &ptr_explain))
     {
         xmlNodePtr ptr2 = xmlCopyNode(ptr_explain, 1);
-        
+
         xmlDocPtr doc = xmlNewDoc((const xmlChar *) "1.0");
-        
+
         xmlDocSetRootElement(doc, ptr2);
-        
+
         xmlChar *buf_out;
         xmlDocDumpMemory(doc, &buf_out, len);
         char *content = (char*) odr_malloc(odr, *len);
         memcpy(content, buf_out, *len);
-        
+
         xmlFree(buf_out);
         xmlFreeDoc(doc);
         return content;
@@ -1129,6 +1166,8 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
                                       int *limit_bw,
                                       int *limit_pdu,
                                       int *limit_req,
+                                      int *limit_search,
+                                      int *limit_connect,
                                       int *target_idletime,
                                       int *client_idletime,
                                       int *max_clients,
@@ -1138,7 +1177,8 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
                                       const char **cql2rpn,
                                       const char **negotiation_charset,
                                       const char **negotiation_lang,
-                                      const char **target_charset)
+                                      const char **target_charset,
+                                      const char **default_client_query_charset)
 {
 #if HAVE_XSLT
     xmlNodePtr ptr;
@@ -1172,11 +1212,13 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
             url[1] = 0;
         }
         m_cp->return_target_info(ptr, url, limit_bw, limit_pdu, limit_req,
+                                 limit_search, limit_connect,
                                  target_idletime, client_idletime,
                                  keepalive_limit_bw, keepalive_limit_pdu,
                                  pre_init, cql2rpn,
                                  negotiation_charset, negotiation_lang,
-                                 target_charset);
+                                 target_charset,
+                                 default_client_query_charset);
     }
 #else
     *url = name;