From 1c5bd4df344337551fc712d00fb9d4e9f80a48ad Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 14 Jun 2011 15:02:08 +0200 Subject: [PATCH] No torus class anymore --- src/filter_virt_db.cpp | 82 ------------------------------------------------ src/torus.cpp | 37 ---------------------- src/torus.hpp | 9 ------ 3 files changed, 128 deletions(-) diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index 71ab2c3..1805219 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -122,7 +122,6 @@ namespace metaproxy_1 { boost::condition m_cond_session_ready; std::map m_clients; bool pass_vhosts; - mp::Torus torus; }; } } @@ -467,71 +466,6 @@ void yf::VirtualDB::Rep::release_frontend(mp::Package &package) } } -void yf::VirtualDB::Rep::refresh_torus(void) -{ - xmlDoc *doc = torus.get_doc(); - if (!doc) - return; - - xmlNode *ptr1 = xmlDocGetRootElement(doc); - if (!ptr1) - return ; - - for (ptr1 = ptr1->children; ptr1; ptr1 = ptr1->next) - { - if (ptr1->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) ptr1->name, "record")) - { - xmlNode *ptr2 = ptr1; - for (ptr2 = ptr2->children; ptr2; ptr2 = ptr2->next) - { - if (ptr2->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) ptr2->name, "layer")) - { - std::string database; - std::string target; - std::string route; - std::string solr; - std::string query_encoding; - xmlNode *ptr3 = ptr2; - for (ptr3 = ptr3->children; ptr3; ptr3 = ptr3->next) - { - if (ptr3->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) ptr3->name, "id")) - { - database = mp::xml::get_text(ptr3); - } - else if (!strcmp((const char *) ptr3->name, "zurl")) - { - target = mp::xml::get_text(ptr3); - } - else if (!strcmp((const char *) ptr3->name, "sru")) - { - solr = mp::xml::get_text(ptr3); - } - else if (!strcmp((const char *) ptr3->name, - "queryEncoding")) - { - query_encoding = mp::xml::get_text(ptr3); - } - } - if (solr.length() == 0 && - database.length() && target.length()) - { - VirtualDB::Map vmap( - mp::util::database_name_normalize(database), - target, route); - vmap.query_encoding = query_encoding; - m_maps.push_back(vmap); - } - } - } - } - } -} yf::VirtualDB::Set::Set(BackendPtr b, std::string setname) : m_backend(b), m_setname(setname) @@ -976,22 +910,6 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only) vmap.query_encoding = query_encoding; m_p->m_maps.push_back(vmap); } - else if (!strcmp((const char *) ptr->name, "torus")) - { - std::string url; - const struct _xmlAttr *attr; - for (attr = ptr->properties; attr; attr = attr->next) - { - if (!strcmp((const char *) attr->name, "url")) - url = mp::xml::get_text(attr->children); - else - throw mp::filter::FilterException( - "Bad attribute " + std::string((const char *) - attr->name)); - } - m_p->torus.read_searchables(url); - m_p->refresh_torus(); - } else { throw mp::filter::FilterException diff --git a/src/torus.cpp b/src/torus.cpp index 51ef8ca..d603621 100644 --- a/src/torus.cpp +++ b/src/torus.cpp @@ -148,43 +148,6 @@ static WRBUF get_url(const char *uri, WRBUF username, WRBUF password, } -mp::Torus::Torus() -{ - doc = 0; -} - -mp::Torus::~Torus() -{ - if (doc) - xmlFreeDoc(doc); -} - -void mp::Torus::read_searchables(std::string url) -{ - if (doc) - { - xmlFreeDoc(doc); - doc = 0; - } - if (url.length() == 0) - return; - - int code; - WRBUF w = get_url(url.c_str(), 0, 0, &code); - if (code == 200) - { - doc = xmlParseMemory(wrbuf_buf(w), wrbuf_len(w)); - if (doc) - yaz_log(YLOG_LOG, "xmlParseMemory OK"); - } - wrbuf_destroy(w); -} - -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 diff --git a/src/torus.hpp b/src/torus.hpp index 87e7c0a..e81e918 100644 --- a/src/torus.hpp +++ b/src/torus.hpp @@ -24,15 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include namespace metaproxy_1 { - class Torus { - public: - Torus(); - ~Torus(); - void read_searchables(std::string url); - xmlDoc *get_doc(); - private: - xmlDocPtr doc; - }; xmlDoc *get_searchable(std::string url_template, const std::string &db); } -- 1.7.10.4