X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy-config.cpp;h=18a49dd4bae55834e81b0b32008c0fa716957162;hp=7fe6204d2950f97b4064da647cebd45b00aca824;hb=4f79f9b5b0095b2f81b1ce583f0f82462f9ee36a;hpb=2cf9ce96410e7430b86ed8cabd1d20caca1b44c3 diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp index 7fe6204..18a49dd 100644 --- a/src/yaz-proxy-config.cpp +++ b/src/yaz-proxy-config.cpp @@ -1,7 +1,5 @@ -/* $Id: yaz-proxy-config.cpp,v 1.37 2007-05-08 12:05:09 adam Exp $ - Copyright (c) 1998-2007, Index Data. - -This file is part of the yazproxy. +/* This file is part of YAZ proxy + Copyright (C) 1998-2011 Index Data YAZ proxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -14,10 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with YAZ proxy; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include @@ -54,8 +51,7 @@ class Yaz_ProxyConfigP { int *limit_search); int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query, char **addinfo); - xmlNodePtr find_target_node(const char *name, const char *db); - xmlNodePtr find_target_db(xmlNodePtr ptr, const char *db); + xmlNodePtr find_target_node(const char *name); const char *get_text(xmlNodePtr ptr); void get_period(xmlNodePtr ptr, int *period); int check_type_1_attributes(ODR odr, xmlNodePtr ptr, @@ -63,7 +59,7 @@ class Yaz_ProxyConfigP { char **addinfo); int check_type_1_structure(ODR odr, xmlNodePtr ptr, Z_RPNStructure *q, char **addinfo); - int get_explain_ptr(const char *host, const char *db, + int get_explain_ptr(const char *db, xmlNodePtr *ptr_target, xmlNodePtr *ptr_explain); #endif Yaz_ProxyConfigP(); @@ -212,7 +208,7 @@ void Yaz_ProxyConfigP::return_limit(xmlNodePtr ptr, if (t) *limit_pdu = atoi(t); } - if (ptr->type == XML_ELEMENT_NODE + if (ptr->type == XML_ELEMENT_NODE && !strcmp((const char *) ptr->name, "search")) { const char *t = get_text(ptr); @@ -272,11 +268,11 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr, return_limit(ptr, keepalive_limit_bw, keepalive_limit_pdu, &dummy, &dummy); } - if (ptr->type == XML_ELEMENT_NODE + if (ptr->type == XML_ELEMENT_NODE && !strcmp((const char *) ptr->name, "limit")) return_limit(ptr, limit_bw, limit_pdu, limit_req, limit_search); - if (ptr->type == XML_ELEMENT_NODE + if (ptr->type == XML_ELEMENT_NODE && !strcmp((const char *) ptr->name, "target-timeout")) { const char *t = get_text(ptr); @@ -393,7 +389,7 @@ int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl, if (!el->attributeType) continue; int type = *el->attributeType; - int *value = 0; + Odr_int *value = 0; if (el->which == Z_AttributeValue_numeric && el->value.numeric) value = el->value.numeric; @@ -433,7 +429,7 @@ int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl, { if (!match_list(*value, match_value)) continue; - sprintf (addinfo_str, "%d", *value); + sprintf (addinfo_str, ODR_INT_PRINTF, *value); } else continue; @@ -494,7 +490,7 @@ int Yaz_ProxyConfig::check_query(ODR odr, const char *name, Z_Query *query, #if YAZ_HAVE_XSLT xmlNodePtr ptr; - ptr = m_cp->find_target_node(name, 0); + ptr = m_cp->find_target_node(name); if (ptr) { if (query->which == Z_Query_type_1 || query->which == Z_Query_type_101) @@ -585,7 +581,7 @@ void Yaz_ProxyConfig::target_authentication(const char *name, ODR odr, Z_InitRequest *req) { #if YAZ_HAVE_XSLT - xmlNodePtr ptr = m_cp->find_target_node(name, 0); + xmlNodePtr ptr = m_cp->find_target_node(name); if (!ptr) return ; @@ -659,7 +655,7 @@ int Yaz_ProxyConfig::client_authentication(const char *name, int ret = YAZPROXY_RET_NOT_ME; #if YAZ_HAVE_XSLT xmlNodePtr ptr; - ptr = m_cp->find_target_node(name, 0); + ptr = m_cp->find_target_node(name); if (!ptr) return 1; for (ptr = ptr->children; ptr; ptr = ptr->next) @@ -770,7 +766,7 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name, int syntax_has_matched = 0; xmlNodePtr ptr; - ptr = m_cp->find_target_node(name, 0); + ptr = m_cp->find_target_node(name); if (!ptr) return 0; for(ptr = ptr->children; ptr; ptr = ptr->next) @@ -834,7 +830,7 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name, } else if (syntax) { - Odr_oid *match_oid + Odr_oid *match_oid = yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, match_type, odr); @@ -905,36 +901,12 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name, return 0; } + #if YAZ_HAVE_XSLT -xmlNodePtr Yaz_ProxyConfigP::find_target_db(xmlNodePtr ptr, const char *db) -{ - xmlNodePtr dptr; - if (!db) - return ptr; - if (!ptr) - return 0; - for (dptr = ptr->children; dptr; dptr = dptr->next) - if (dptr->type == XML_ELEMENT_NODE && - !strcmp((const char *) dptr->name, "database")) - { - struct _xmlAttr *attr; - for (attr = dptr->properties; attr; attr = attr->next) - if (!strcmp((const char *) attr->name, "name")) - { - if (attr->children - && attr->children->type==XML_TEXT_NODE - && attr->children->content - && (!strcmp((const char *) attr->children->content, db) - || !strcmp((const char *) attr->children->content, - "*"))) - return dptr; - } - } - return ptr; -} -xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db) +xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name) { + /* db seems always to be passed as NULL */ xmlNodePtr ptr; if (!m_proxyPtr) return 0; @@ -954,9 +926,7 @@ xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db) { xmlChar *t = attr->children->content; if (!t || *t == '1') - { - return find_target_db(ptr, db); - } + return ptr; } } else @@ -974,7 +944,7 @@ xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db) || !strcmp((const char *) attr->children->content, "*"))) { - return find_target_db(ptr, db); + return ptr; } } } @@ -1185,7 +1155,7 @@ void Yaz_ProxyConfig::get_generic_info(int *log_mask, } #if YAZ_HAVE_XSLT -int Yaz_ProxyConfigP::get_explain_ptr(const char *host, const char *db, +int Yaz_ProxyConfigP::get_explain_ptr(const char *db, xmlNodePtr *ptr_target, xmlNodePtr *ptr_explain) { @@ -1199,6 +1169,19 @@ int Yaz_ProxyConfigP::get_explain_ptr(const char *host, const char *db, if (ptr->type == XML_ELEMENT_NODE && !strcmp((const char *) ptr->name, "target")) { + int db_match_on_name = 0; + struct _xmlAttr *attr; + + for (attr = ptr->properties; attr; attr = attr->next) + if (!strcmp((const char *) attr->name, "name")) + { + if (attr->children + && attr->children->type==XML_TEXT_NODE + && attr->children->content + && (!strcmp((const char *) attr->children->content, + db))) + db_match_on_name = 1; + } *ptr_target = ptr; xmlNodePtr ptr = (*ptr_target)->children; for (; ptr; ptr = ptr->next) @@ -1232,6 +1215,8 @@ int Yaz_ProxyConfigP::get_explain_ptr(const char *host, const char *db, return 1; } } + if (db_match_on_name) + return 1; } } return 0; @@ -1243,7 +1228,7 @@ const char *Yaz_ProxyConfig::get_explain_name(const char *db, { #if YAZ_HAVE_XSLT xmlNodePtr ptr_target, ptr_explain; - if (m_cp->get_explain_ptr(0, db, &ptr_target, &ptr_explain) + if (m_cp->get_explain_ptr(db, &ptr_target, &ptr_explain) && ptr_target) { struct _xmlAttr *attr; @@ -1277,28 +1262,38 @@ const char *Yaz_ProxyConfig::get_explain_name(const char *db, } char *Yaz_ProxyConfig::get_explain_doc(ODR odr, const char *name, - const char *db, int *len) + const char *db, int *len, + int *http_status) { #if YAZ_HAVE_XSLT xmlNodePtr ptr_target, ptr_explain; - if (m_cp->get_explain_ptr(0 /* host */, db, &ptr_target, &ptr_explain)) + if (m_cp->get_explain_ptr(db, &ptr_target, &ptr_explain)) { - xmlNodePtr ptr2 = xmlCopyNode(ptr_explain, 1); + if (!ptr_explain) + { + *http_status = 500; + return 0; + } + else + { + xmlNodePtr ptr2 = xmlCopyNode(ptr_explain, 1); - xmlDocPtr doc = xmlNewDoc((const xmlChar *) "1.0"); + xmlDocPtr doc = xmlNewDoc((const xmlChar *) "1.0"); - xmlDocSetRootElement(doc, ptr2); + xmlDocSetRootElement(doc, ptr2); - xmlChar *buf_out; - xmlDocDumpMemory(doc, &buf_out, len); - char *content = (char*) odr_malloc(odr, *len); - memcpy(content, buf_out, *len); + 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; + xmlFree(buf_out); + xmlFreeDoc(doc); + return content; + } } #endif + *http_status = 404; return 0; } @@ -1344,7 +1339,7 @@ void Yaz_ProxyConfig::get_target_info(const char *name, } } } - ptr = m_cp->find_target_node(name, 0); + ptr = m_cp->find_target_node(name); if (ptr) { if (name) @@ -1372,6 +1367,7 @@ void Yaz_ProxyConfig::get_target_info(const char *name, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab