X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_zoom.cpp;h=129b027f0d7c0b4e8292e78963804116654c58ed;hb=1c5bd4df344337551fc712d00fb9d4e9f80a48ad;hp=68252b2aa6486b7db09b2b94d86dd3bcfe8430fc;hpb=f769e0395476e212ad2757538e546503edfda838;p=metaproxy-moved-to-github.git diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index 68252b2..129b027 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "config.hpp" #include "filter_zoom.hpp" #include +#include #include #include #include "torus.hpp" @@ -43,6 +44,9 @@ namespace metaproxy_1 { namespace filter { struct Zoom::Searchable : boost::noncopyable { std::string authentication; + std::string cfAuth; + std::string cfProxy; + std::string cfSubDb; std::string database; std::string target; std::string query_encoding; @@ -112,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; }; } } @@ -274,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) @@ -303,6 +306,21 @@ void yf::Zoom::Impl::parse_torus(const xmlNode *ptr1) { s->authentication = mp::xml::get_text(ptr3); } + else if (!strcmp((const char *) ptr3->name, + "cfAuth")) + { + s->cfAuth = mp::xml::get_text(ptr3); + } + else if (!strcmp((const char *) ptr3->name, + "cfProxy")) + { + s->cfProxy = mp::xml::get_text(ptr3); + } + else if (!strcmp((const char *) ptr3->name, + "cfSubDb")) + { + s->cfSubDb = mp::xml::get_text(ptr3); + } else if (!strcmp((const char *) ptr3->name, "id")) { s->database = mp::xml::get_text(ptr3); @@ -360,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) @@ -377,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; @@ -394,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 { @@ -419,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; @@ -460,20 +471,48 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( } } - SearchablePtr sptr = *map_s; - m_backend.reset(); BackendPtr b(new Backend(sptr)); + std::string cf_parm; b->xsp = xsp; b->m_frontend_database = database; + std::string authentication = sptr->authentication; if (sptr->query_encoding.length()) b->set_option("rpnCharset", sptr->query_encoding.c_str()); - if (sptr->authentication.length()) - b->set_option("user", sptr->authentication.c_str()); + if (sptr->cfAuth.length()) + { + b->set_option("user", sptr->cfAuth.c_str()); + if (authentication.length()) + { + size_t found = authentication.find('/'); + if (found != std::string::npos) + { + cf_parm += "user=" + mp::util::uri_encode(authentication.substr(0, found)) + + "&password=" + mp::util::uri_encode(authentication.substr(found+1)); + } + else + cf_parm += "user=" + mp::util::uri_encode(authentication); + } + } + else if (authentication.length()) + b->set_option("user", authentication.c_str()); + + if (sptr->cfProxy.length()) + { + if (cf_parm.length()) + cf_parm += "&"; + cf_parm += "proxy=" + mp::util::uri_encode(sptr->cfProxy); + } + if (sptr->cfSubDb.length()) + { + if (cf_parm.length()) + cf_parm += "&"; + cf_parm += "subdatabase=" + mp::util::uri_encode(sptr->cfSubDb); + } std::string url; if (sptr->sru.length()) @@ -482,8 +521,13 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( b->set_option("sru", sptr->sru.c_str()); } else + { url = sptr->target; - + } + if (cf_parm.length()) + { + url += "," + cf_parm; + } b->connect(url, error, addinfo); if (*error == 0) { @@ -521,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()) {