From dee29d77163776942488b38eb7691df51bb30bbc Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 14 Jun 2011 14:50:28 +0200 Subject: [PATCH] zoom: Use udb and query only one searchable --- etc/config-zoom.xml | 1 + include/metaproxy/util.hpp | 1 + src/filter_zoom.cpp | 83 ++++++++++++++++++-------------------------- src/torus.cpp | 19 +++++++++- src/torus.hpp | 1 + src/util.cpp | 9 +++++ 6 files changed, 63 insertions(+), 51 deletions(-) diff --git a/etc/config-zoom.xml b/etc/config-zoom.xml index f3b3e2f..bc5bc09 100644 --- a/etc/config-zoom.xml +++ b/etc/config-zoom.xml @@ -10,6 +10,7 @@ @:9000 + diff --git a/include/metaproxy/util.hpp b/include/metaproxy/util.hpp index 3da0caa..7c9f1ee 100644 --- a/include/metaproxy/util.hpp +++ b/include/metaproxy/util.hpp @@ -124,6 +124,7 @@ namespace metaproxy_1 { Odr_int &number_to_present, const char **element_set_name); + std::string uri_encode(std::string s); }; class odr : public boost::noncopyable { diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index c7c882f..129b027 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -116,14 +116,12 @@ namespace metaproxy_1 { private: FrontendPtr get_frontend(mp::Package &package); void release_frontend(mp::Package &package); - void parse_torus(const xmlNode *ptr); - - std::listm_searchables; + SearchablePtr parse_torus(const xmlNode *ptr); std::map m_clients; boost::mutex m_mutex; boost::condition m_cond_session_ready; - mp::Torus torus; + std::string torus_url; }; } } @@ -278,10 +276,11 @@ yf::Zoom::Impl::~Impl() { } -void yf::Zoom::Impl::parse_torus(const xmlNode *ptr1) +yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus(const xmlNode *ptr1) { + SearchablePtr notfound; if (!ptr1) - return ; + return notfound; for (ptr1 = ptr1->children; ptr1; ptr1 = ptr1->next) { if (ptr1->type != XML_ELEMENT_NODE) @@ -379,15 +378,15 @@ void yf::Zoom::Impl::parse_torus(const xmlNode *ptr1) } if (s->database.length() && s->target.length()) { - yaz_log(YLOG_LOG, "add db=%s target=%s turbomarc=%s", - s->database.c_str(), s->target.c_str(), - s->use_turbomarc ? "1" : "0"); - m_searchables.push_back(s); + yaz_log(YLOG_LOG, "add db=%s target=%s", + s->database.c_str(), s->target.c_str()); } + return s; } } } } + return notfound; } void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only) @@ -396,10 +395,6 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only) { if (ptr->type != XML_ELEMENT_NODE) continue; - if (!strcmp((const char *) ptr->name, "records")) - { - parse_torus(ptr); - } else if (!strcmp((const char *) ptr->name, "torus")) { std::string url; @@ -413,13 +408,11 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only) "Bad attribute " + std::string((const char *) attr->name)); } - torus.read_searchables(url); - xmlDoc *doc = torus.get_doc(); - if (doc) - { - xmlNode *ptr = xmlDocGetRootElement(doc); - parse_torus(ptr); - } + torus_url = url; + } + else if (!strcmp((const char *) ptr->name, "records")) + { + yaz_log(YLOG_WARN, "records ignored!"); } else { @@ -431,14 +424,6 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only) } } -static std::string uri_encode(std::string s) -{ - char *x = (char *) xmalloc(1 + s.length() * 3); - yaz_encode_uri_component(x, s.c_str()); - std::string result(x); - return result; -} - yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( std::string &database, int *error, const char **addinfo) { @@ -446,29 +431,28 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( if (m_backend && m_backend->m_frontend_database == database) return m_backend; - std::list::iterator map_s = - m_p->m_searchables.begin(); - - std::string c_db = mp::util::database_name_normalize(database); - - while (map_s != m_p->m_searchables.end()) + xmlDoc *doc = mp::get_searchable(m_p->torus_url, database); + if (!doc) { - if (c_db.compare((*map_s)->database) == 0) - break; - map_s++; + *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; + *addinfo = database.c_str(); + BackendPtr b; + return b; } - if (map_s == m_p->m_searchables.end()) + SearchablePtr sptr = m_p->parse_torus(xmlDocGetRootElement(doc)); + xmlFreeDoc(doc); + if (!sptr) { *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; *addinfo = database.c_str(); BackendPtr b; return b; } - + xsltStylesheetPtr xsp = 0; - if ((*map_s)->transform_xsl_fname.length()) + if (sptr->transform_xsl_fname.length()) { - xmlDoc *xsp_doc = xmlParseFile((*map_s)->transform_xsl_fname.c_str()); + xmlDoc *xsp_doc = xmlParseFile(sptr->transform_xsl_fname.c_str()); if (!xsp_doc) { *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; @@ -487,8 +471,6 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( } } - SearchablePtr sptr = *map_s; - m_backend.reset(); BackendPtr b(new Backend(sptr)); @@ -509,11 +491,11 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( size_t found = authentication.find('/'); if (found != std::string::npos) { - cf_parm += "user=" + uri_encode(authentication.substr(0, found)) - + "&password=" + uri_encode(authentication.substr(found+1)); + cf_parm += "user=" + mp::util::uri_encode(authentication.substr(0, found)) + + "&password=" + mp::util::uri_encode(authentication.substr(found+1)); } else - cf_parm += "user=" + uri_encode(authentication); + cf_parm += "user=" + mp::util::uri_encode(authentication); } } else if (authentication.length()) @@ -523,13 +505,13 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( { if (cf_parm.length()) cf_parm += "&"; - cf_parm += "proxy=" + uri_encode(sptr->cfProxy); + cf_parm += "proxy=" + mp::util::uri_encode(sptr->cfProxy); } if (sptr->cfSubDb.length()) { if (cf_parm.length()) cf_parm += "&"; - cf_parm += "subdatabase=" + uri_encode(sptr->cfSubDb); + cf_parm += "subdatabase=" + mp::util::uri_encode(sptr->cfSubDb); } std::string url; @@ -583,7 +565,8 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, if (preferredRecordSyntax) { if (!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml) - && !strcmp(element_set_name, "pz2")) + && element_set_name && + !strcmp(element_set_name, "pz2")) { if (b->sptr->request_syntax.length()) { diff --git a/src/torus.cpp b/src/torus.cpp index 924781a..51ef8ca 100644 --- a/src/torus.cpp +++ b/src/torus.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include - +#include #include "torus.hpp" namespace mp = metaproxy_1; @@ -185,6 +185,23 @@ xmlDoc *mp::Torus::get_doc() return doc; } +xmlDoc *mp::get_searchable(std::string url_template, const std::string &db) +{ + // http://newmk2.indexdata.com/torus2/searchable.ebsco/records/?query=udb=aberdeenUni + xmlDoc *doc = 0; + size_t found; + + found = url_template.find("%db"); + if (found != std::string::npos) + url_template.replace(found, found+3, mp::util::uri_encode(db)); + int code; + WRBUF w = get_url(url_template.c_str(), 0, 0, &code); + if (code == 200) + doc = xmlParseMemory(wrbuf_buf(w), wrbuf_len(w)); + wrbuf_destroy(w); + return doc; +} + /* * Local variables: * c-basic-offset: 4 diff --git a/src/torus.hpp b/src/torus.hpp index e360b42..87e7c0a 100644 --- a/src/torus.hpp +++ b/src/torus.hpp @@ -33,6 +33,7 @@ namespace metaproxy_1 { private: xmlDocPtr doc; }; + xmlDoc *get_searchable(std::string url_template, const std::string &db); } #endif diff --git a/src/util.cpp b/src/util.cpp index 27916ba..f792e02 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include @@ -684,6 +685,14 @@ Z_ReferenceId **mp_util::get_referenceId(const Z_APDU *apdu) return 0; } +std::string mp_util::uri_encode(std::string s) +{ + char *x = (char *) xmalloc(1 + s.length() * 3); + yaz_encode_uri_component(x, s.c_str()); + std::string result(x); + return result; +} + /* * Local variables: -- 1.7.10.4