X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_zoom.cpp;h=e9fd0db69e01637b01f6d7e7159ac4d1793a4774;hb=b484b17197842b9f282db212fce12ed44e2a2371;hp=eb9f64bb4916675bc8251a4093cb8214737448eb;hpb=e5329397729e8959a821c6956f75012372fc0a77;p=metaproxy-moved-to-github.git diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index eb9f64b..e9fd0db 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "filter_zoom.hpp" #include #include +#include #include #include #include @@ -80,16 +81,17 @@ namespace metaproxy_1 { public: Backend(SearchablePtr sptr); ~Backend(); - void connect(std::string zurl, int *error, const char **addinfo); + void connect(std::string zurl, int *error, char **addinfo, + ODR odr); void search_pqf(const char *pqf, Odr_int *hits, - int *error, const char **addinfo); + int *error, char **addinfo, ODR odr); void search_cql(const char *cql, Odr_int *hits, - int *error, const char **addinfo); + int *error, char **addinfo, ODR odr); void present(Odr_int start, Odr_int number, ZOOM_record *recs, - int *error, const char **addinfo); + int *error, char **addinfo, ODR odr); void set_option(const char *name, const char *value); const char *get_option(const char *name); - void get_zoom_error(int *error, const char **addinfo); + void get_zoom_error(int *error, char **addinfo, ODR odr); }; class Zoom::Frontend : boost::noncopyable { friend class Impl; @@ -108,7 +110,7 @@ namespace metaproxy_1 { Z_Records *get_records(Odr_int start, Odr_int number_to_present, int *error, - const char **addinfo, + char **addinfo, Odr_int *number_of_records_returned, ODR odr, BackendPtr b, Odr_oid *preferredRecordSyntax, @@ -123,7 +125,8 @@ namespace metaproxy_1 { Impl(); ~Impl(); void process(metaproxy_1::Package & package); - void configure(const xmlNode * ptr, bool test_only); + void configure(const xmlNode * ptr, bool test_only, + const char *path); private: void configure_local_records(const xmlNode * ptr, bool test_only); FrontendPtr get_frontend(mp::Package &package); @@ -136,6 +139,7 @@ namespace metaproxy_1 { std::string torus_url; std::map fieldmap; std::string xsldir; + std::string file_path; CCL_bibset bibset; std::string element_transform; std::string element_raw; @@ -154,9 +158,10 @@ yf::Zoom::~Zoom() { // must have a destructor because of boost::scoped_ptr } -void yf::Zoom::configure(const xmlNode *xmlnode, bool test_only) +void yf::Zoom::configure(const xmlNode *xmlnode, bool test_only, + const char *path) { - m_p->configure(xmlnode, test_only); + m_p->configure(xmlnode, test_only, path); } void yf::Zoom::process(mp::Package &package) const @@ -183,34 +188,57 @@ yf::Zoom::Backend::~Backend() } -void yf::Zoom::Backend::get_zoom_error(int *error, const char **addinfo) +void yf::Zoom::Backend::get_zoom_error(int *error, char **addinfo, + ODR odr) { const char *msg = 0; - *error = ZOOM_connection_error(m_connection, &msg, addinfo); + const char *zoom_addinfo = 0; + *error = ZOOM_connection_error(m_connection, &msg, &zoom_addinfo); if (*error) { if (*error >= ZOOM_ERROR_CONNECT) { // turn ZOOM diagnostic into a Bib-1 2: with addinfo=zoom err msg *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - if (addinfo) - *addinfo = msg; + *addinfo = (char *) odr_malloc( + odr, 20 + strlen(msg) + + (zoom_addinfo ? strlen(zoom_addinfo) : 0)); + strcpy(*addinfo, msg); + if (zoom_addinfo) + { + strcat(*addinfo, ": "); + strcat(*addinfo, zoom_addinfo); + strcat(*addinfo, " "); + } + } + else + { + *addinfo = (char *) odr_malloc( + odr, 20 + (zoom_addinfo ? strlen(zoom_addinfo) : 0)); + **addinfo = '\0'; + if (zoom_addinfo && *zoom_addinfo) + { + strcpy(*addinfo, zoom_addinfo); + strcat(*addinfo, " "); + } + strcat(*addinfo, "(backend)"); } } } void yf::Zoom::Backend::connect(std::string zurl, - int *error, const char **addinfo) + int *error, char **addinfo, + ODR odr) { ZOOM_connection_connect(m_connection, zurl.c_str(), 0); - get_zoom_error(error, addinfo); + get_zoom_error(error, addinfo, odr); } void yf::Zoom::Backend::search_pqf(const char *pqf, Odr_int *hits, - int *error, const char **addinfo) + int *error, char **addinfo, ODR odr) { m_resultset = ZOOM_connection_search_pqf(m_connection, pqf); - get_zoom_error(error, addinfo); + get_zoom_error(error, addinfo, odr); if (*error == 0) *hits = ZOOM_resultset_size(m_resultset); else @@ -218,7 +246,7 @@ void yf::Zoom::Backend::search_pqf(const char *pqf, Odr_int *hits, } void yf::Zoom::Backend::search_cql(const char *cql, Odr_int *hits, - int *error, const char **addinfo) + int *error, char **addinfo, ODR odr) { ZOOM_query q = ZOOM_query_create(); @@ -226,7 +254,7 @@ void yf::Zoom::Backend::search_cql(const char *cql, Odr_int *hits, m_resultset = ZOOM_connection_search(m_connection, q); ZOOM_query_destroy(q); - get_zoom_error(error, addinfo); + get_zoom_error(error, addinfo, odr); if (*error == 0) *hits = ZOOM_resultset_size(m_resultset); else @@ -235,10 +263,10 @@ void yf::Zoom::Backend::search_cql(const char *cql, Odr_int *hits, void yf::Zoom::Backend::present(Odr_int start, Odr_int number, ZOOM_record *recs, - int *error, const char **addinfo) + int *error, char **addinfo, ODR odr) { ZOOM_resultset_records(m_resultset, recs, start, number); - get_zoom_error(error, addinfo); + get_zoom_error(error, addinfo, odr); } void yf::Zoom::Backend::set_option(const char *name, const char *value) @@ -470,8 +498,13 @@ void yf::Zoom::Impl::configure_local_records(const xmlNode *ptr, bool test_only) } } -void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only) +void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only, + const char *path) { + if (path && *path) + { + file_path = path; + } for (ptr = ptr->children; ptr; ptr = ptr->next) { if (ptr->type != XML_ELEMENT_NODE) @@ -537,6 +570,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( if (m_backend && m_backend->m_frontend_database == database) return m_backend; + const char *sru_proxy = 0; std::string db_args; std::string torus_db; size_t db_arg_pos = database.find(','); @@ -592,18 +626,35 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( xsltStylesheetPtr xsp = 0; if (sptr->transform_xsl_fname.length()) { + const char *path = 0; + + if (m_p->xsldir.length()) + path = m_p->xsldir.c_str(); + else + path = m_p->file_path.c_str(); std::string fname; - if (m_p->xsldir.length()) - fname = m_p->xsldir + "/" + sptr->transform_xsl_fname; + char fullpath[1024]; + char *cp = yaz_filepath_resolve(sptr->transform_xsl_fname.c_str(), + path, 0, fullpath); + if (cp) + fname.assign(cp); else - fname = sptr->transform_xsl_fname; + { + *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + *addinfo = (char *) + odr_malloc(odr, 40 + sptr->transform_xsl_fname.length()); + sprintf(*addinfo, "File could not be read: %s", + sptr->transform_xsl_fname.c_str()); + BackendPtr b; + return b; + } xmlDoc *xsp_doc = xmlParseFile(fname.c_str()); if (!xsp_doc) { *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - *addinfo = (char *) odr_malloc(odr, 40 + strlen(fname.c_str())); - sprintf(*addinfo, "xmlParseFile failed. File %s", fname.c_str()); + *addinfo = (char *) odr_malloc(odr, 40 + fname.length()); + sprintf(*addinfo, "xmlParseFile failed. File: %s", fname.c_str()); BackendPtr b; return b; } @@ -635,19 +686,34 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( { // A CF target b->set_option("user", sptr->cfAuth.c_str()); - if (authentication.length() && db_args.length() == 0) + if (db_args.length() == 0) { - // no database (auth) args specified already.. and the - // Torus authentication has it.. Generate the args that CF - // understands.. - size_t found = authentication.find('/'); - if (found != std::string::npos) + if (authentication.length()) + { + // no database (auth) args specified already.. and the + // Torus authentication has it.. Generate the args that CF + // understands.. + size_t found = authentication.find('/'); + if (found != std::string::npos) + { + db_args += "user=" + mp::util::uri_encode(authentication.substr(0, found)) + + "&password=" + mp::util::uri_encode(authentication.substr(found+1)); + } + else + db_args += "user=" + mp::util::uri_encode(authentication); + } + if (sptr->cfProxy.length()) { - db_args += "user=" + mp::util::uri_encode(authentication.substr(0, found)) - + "&password=" + mp::util::uri_encode(authentication.substr(found+1)); + if (db_args.length()) + db_args += "&"; + db_args += "proxy=" + mp::util::uri_encode(sptr->cfProxy); } - else - db_args += "user=" + mp::util::uri_encode(authentication); + } + if (sptr->cfSubDb.length()) + { + if (db_args.length()) + db_args += "&"; + db_args += "subdatabase=" + mp::util::uri_encode(sptr->cfSubDb); } } else @@ -671,6 +737,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( param_user = value; else if (!strcmp(name, "password")) param_password = value; + else if (!strcmp(name, "proxy")) + sru_proxy = value; else { BackendPtr notfound; @@ -699,18 +767,9 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( b->set_option("user", authentication.c_str()); } } - if (sptr->cfProxy.length()) - { - if (db_args.length()) - db_args += "&"; - db_args += "proxy=" + mp::util::uri_encode(sptr->cfProxy); - } - if (sptr->cfSubDb.length()) - { - if (db_args.length()) - db_args += "&"; - db_args += "subdatabase=" + mp::util::uri_encode(sptr->cfSubDb); - } + + if (sru_proxy) + b->set_option("proxy", sru_proxy); std::string url; if (sptr->sru.length()) @@ -725,10 +784,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( if (db_args.length()) url += "," + db_args; yaz_log(YLOG_LOG, "url=%s", url.c_str()); - const char *addinfo_c = 0; - b->connect(url, error, &addinfo_c); - if (addinfo_c) - *addinfo = odr_strdup(odr, addinfo_c); + b->connect(url, error, addinfo, odr); if (*error == 0) { m_backend = b; @@ -739,7 +795,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, Odr_int number_to_present, int *error, - const char **addinfo, + char **addinfo, Odr_int *number_of_records_returned, ODR odr, BackendPtr b, @@ -806,7 +862,7 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, b->set_option("elementSetName", element_set_name); - b->present(start, number_to_present, recs, error, addinfo); + b->present(start, number_to_present, recs, error, addinfo, odr); Odr_int i = 0; if (!*error) @@ -993,19 +1049,17 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) } int error = 0; - char *addinfo_s = 0; + char *addinfo = 0; std::string db(sr->databaseNames[0]); - BackendPtr b = get_backend_from_databases(db, &error, &addinfo_s, odr); + BackendPtr b = get_backend_from_databases(db, &error, &addinfo, odr); if (error) { apdu_res = - odr.create_searchResponse( - apdu_req, error, addinfo_s); + odr.create_searchResponse(apdu_req, error, addinfo); package.response() = apdu_res; return; } - const char *addinfo_c = 0; b->set_option("setname", "default"); Odr_int hits = 0; @@ -1048,14 +1102,14 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) if (cn_error) { // hopefully we are getting a ptr to a index+relation+term node - addinfo_c = 0; + addinfo = 0; if (cn_error->which == CQL_NODE_ST) - addinfo_c = cn_error->u.st.index; + addinfo = cn_error->u.st.index; apdu_res = odr.create_searchResponse(apdu_req, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, - addinfo_c); + addinfo); package.response() = apdu_res; return; } @@ -1149,7 +1203,7 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) if (status == 0) { yaz_log(YLOG_LOG, "search CQL: %s", wrbuf_cstr(wrb)); - b->search_cql(wrbuf_cstr(wrb), &hits, &error, &addinfo_c); + b->search_cql(wrbuf_cstr(wrb), &hits, &error, &addinfo, odr); } wrbuf_destroy(wrb); @@ -1166,7 +1220,7 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) else { yaz_log(YLOG_LOG, "search PQF: %s", wrbuf_cstr(pqf_wrbuf)); - b->search_pqf(wrbuf_cstr(pqf_wrbuf), &hits, &error, &addinfo_c); + b->search_pqf(wrbuf_cstr(pqf_wrbuf), &hits, &error, &addinfo, odr); wrbuf_destroy(pqf_wrbuf); } @@ -1178,10 +1232,10 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) Odr_int number_of_records_returned = 0; Z_Records *records = get_records( - 0, number_to_present, &error, &addinfo_c, + 0, number_to_present, &error, &addinfo, &number_of_records_returned, odr, b, sr->preferredRecordSyntax, element_set_name); - apdu_res = odr.create_searchResponse(apdu_req, error, addinfo_c); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); if (records) { apdu_res->u.searchResponse->records = records; @@ -1219,7 +1273,7 @@ void yf::Zoom::Frontend::handle_present(mp::Package &package) element_set_name = comp->u.simple->u.generic; Odr_int number_of_records_returned = 0; int error = 0; - const char *addinfo = 0; + char *addinfo = 0; Z_Records *records = get_records( *pr->resultSetStartPoint - 1, *pr->numberOfRecordsRequested, &error, &addinfo, &number_of_records_returned, odr, m_backend,