#include "config.hpp"
#include "filter_zoom.hpp"
#include <yaz/zoom.h>
+#include <yaz/yaz-version.h>
#include <yaz/srw.h>
#include <metaproxy/package.hpp>
#include <metaproxy/util.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
+#include <yaz/ccl_xml.h>
#include <yaz/ccl.h>
#include <yaz/rpn2cql.h>
+#include <yaz/rpn2solr.h>
#include <yaz/pquery.h>
#include <yaz/cql.h>
#include <yaz/oid_db.h>
std::string cfAuth;
std::string cfProxy;
std::string cfSubDb;
- std::string database;
+ std::string udb;
std::string target;
std::string query_encoding;
std::string sru;
bool use_turbomarc;
bool piggyback;
CCL_bibset ccl_bibset;
- Searchable();
+ Searchable(CCL_bibset base);
~Searchable();
};
class Zoom::Backend : boost::noncopyable {
int *error, const char **addinfo);
void set_option(const char *name, const char *value);
const char *get_option(const char *name);
- int get_error(const char **addinfo);
+ void get_zoom_error(int *error, const char **addinfo);
};
class Zoom::Frontend : boost::noncopyable {
friend class Impl;
void process(metaproxy_1::Package & package);
void configure(const xmlNode * ptr, bool test_only);
private:
+ void configure_local_records(const xmlNode * ptr, bool test_only);
FrontendPtr get_frontend(mp::Package &package);
void release_frontend(mp::Package &package);
- SearchablePtr parse_torus(const xmlNode *ptr);
+ SearchablePtr parse_torus_record(const xmlNode *ptr);
struct cql_node *convert_cql_fields(struct cql_node *cn, ODR odr);
std::map<mp::Session, FrontendPtr> m_clients;
boost::mutex m_mutex;
std::string torus_url;
std::map<std::string,std::string> fieldmap;
std::string xsldir;
+ CCL_bibset bibset;
+ std::string element_transform;
+ std::string element_raw;
+ std::map<std::string,SearchablePtr> s_map;
};
}
}
ZOOM_resultset_destroy(m_resultset);
}
+
+void yf::Zoom::Backend::get_zoom_error(int *error, const char **addinfo)
+{
+ const char *msg = 0;
+ *error = ZOOM_connection_error(m_connection, &msg, 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;
+ }
+ }
+}
+
void yf::Zoom::Backend::connect(std::string zurl,
int *error, const char **addinfo)
{
ZOOM_connection_connect(m_connection, zurl.c_str(), 0);
- *error = ZOOM_connection_error(m_connection, 0, addinfo);
+ get_zoom_error(error, addinfo);
}
void yf::Zoom::Backend::search_pqf(const char *pqf, Odr_int *hits,
int *error, const char **addinfo)
{
m_resultset = ZOOM_connection_search_pqf(m_connection, pqf);
- *error = ZOOM_connection_error(m_connection, 0, addinfo);
+ get_zoom_error(error, addinfo);
if (*error == 0)
*hits = ZOOM_resultset_size(m_resultset);
else
m_resultset = ZOOM_connection_search(m_connection, q);
ZOOM_query_destroy(q);
- *error = ZOOM_connection_error(m_connection, 0, addinfo);
+ get_zoom_error(error, addinfo);
if (*error == 0)
*hits = ZOOM_resultset_size(m_resultset);
else
int *error, const char **addinfo)
{
ZOOM_resultset_records(m_resultset, recs, start, number);
- *error = ZOOM_connection_error(m_connection, 0, addinfo);
+ get_zoom_error(error, addinfo);
}
void yf::Zoom::Backend::set_option(const char *name, const char *value)
return ZOOM_connection_option_get(m_connection, name);
}
-int yf::Zoom::Backend::get_error(const char **addinfo)
-{
- return ZOOM_connection_error(m_connection, 0, addinfo);
-}
-
-yf::Zoom::Searchable::Searchable()
+yf::Zoom::Searchable::Searchable(CCL_bibset base)
{
piggyback = true;
use_turbomarc = true;
- ccl_bibset = ccl_qual_mk();
+ ccl_bibset = ccl_qual_dup(base);
}
yf::Zoom::Searchable::~Searchable()
}
}
-yf::Zoom::Impl::Impl()
+yf::Zoom::Impl::Impl() : element_transform("pz2") , element_raw("raw")
{
+ bibset = ccl_qual_mk();
}
yf::Zoom::Impl::~Impl()
{
+ ccl_qual_rm(&bibset);
}
-yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus(const xmlNode *ptr1)
+yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr)
{
- SearchablePtr notfound;
- if (!ptr1)
- return notfound;
- for (ptr1 = ptr1->children; ptr1; ptr1 = ptr1->next)
+ Zoom::SearchablePtr s(new Searchable(bibset));
+
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
{
- if (ptr1->type != XML_ELEMENT_NODE)
+ if (ptr->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp((const char *) ptr1->name, "record"))
+ if (!strcmp((const char *) ptr->name, "layer"))
+ ptr = ptr->children;
+ else if (!strcmp((const char *) ptr->name,
+ "authentication"))
+ {
+ s->authentication = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "cfAuth"))
+ {
+ s->cfAuth = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "cfProxy"))
+ {
+ s->cfProxy = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "cfSubDb"))
+ {
+ s->cfSubDb = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name, "udb"))
+ {
+ s->udb = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name, "zurl"))
+ {
+ s->target = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name, "sru"))
+ {
+ s->sru = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "queryEncoding"))
+ {
+ s->query_encoding = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "piggyback"))
+ {
+ s->piggyback = mp::xml::get_bool(ptr, true);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "requestSyntax"))
+ {
+ s->request_syntax = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "elementSet"))
{
- const xmlNode *ptr2 = ptr1;
- for (ptr2 = ptr2->children; ptr2; ptr2 = ptr2->next)
+ s->element_set = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "recordEncoding"))
+ {
+ s->record_encoding = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "transform"))
+ {
+ s->transform_xsl_fname = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "useTurboMarc"))
+ {
+ ; // useTurboMarc is ignored
+ }
+ else if (!strncmp((const char *) ptr->name,
+ "cclmap_", 7))
+ {
+ std::string value = mp::xml::get_text(ptr);
+ ccl_qual_fitem(s->ccl_bibset, value.c_str(),
+ (const char *) ptr->name + 7);
+ }
+ }
+ return s;
+}
+
+void yf::Zoom::Impl::configure_local_records(const xmlNode *ptr, bool test_only)
+{
+ while (ptr && ptr->type != XML_ELEMENT_NODE)
+ ptr = ptr->next;
+
+ if (ptr)
+ {
+ if (!strcmp((const char *) ptr->name, "records"))
+ {
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
{
- if (ptr2->type != XML_ELEMENT_NODE)
+ if (ptr->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp((const char *) ptr2->name, "layer"))
+ if (!strcmp((const char *) ptr->name, "record"))
{
- Zoom::SearchablePtr s(new Searchable);
-
- const xmlNode *ptr3 = ptr2;
- for (ptr3 = ptr3->children; ptr3; ptr3 = ptr3->next)
+ SearchablePtr s = parse_torus_record(ptr);
+ if (s)
{
- if (ptr3->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) ptr3->name,
- "authentication"))
- {
- 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);
- }
- else if (!strcmp((const char *) ptr3->name, "zurl"))
- {
- s->target = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name, "sru"))
- {
- s->sru = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name,
- "queryEncoding"))
- {
- s->query_encoding = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name,
- "piggyback"))
- {
- s->piggyback = mp::xml::get_bool(ptr3, true);
- }
- else if (!strcmp((const char *) ptr3->name,
- "requestSyntax"))
- {
- s->request_syntax = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name,
- "elementSet"))
- {
- s->element_set = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name,
- "recordEncoding"))
- {
- s->record_encoding = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name,
- "transform"))
- {
- s->transform_xsl_fname = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name,
- "useTurboMarc"))
- {
- ; // useTurboMarc is ignored
- }
- else if (!strncmp((const char *) ptr3->name,
- "cclmap_", 7))
+ std::string udb = s->udb;
+ if (udb.length())
+ s_map[s->udb] = s;
+ else
{
- std::string value = mp::xml::get_text(ptr3);
- ccl_qual_fitem(s->ccl_bibset, value.c_str(),
- (const char *) ptr3->name + 7);
+ throw mp::filter::FilterException
+ ("No udb for local torus record");
}
}
- return s;
+ }
+ else
+ {
+ throw mp::filter::FilterException
+ ("Bad element "
+ + std::string((const char *) ptr->name)
+ + " in zoom filter inside element "
+ "<torus><records>");
}
}
}
+ else
+ {
+ throw mp::filter::FilterException
+ ("Bad element "
+ + std::string((const char *) ptr->name)
+ + " in zoom filter inside element <torus>");
+ }
}
- return notfound;
}
void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only)
torus_url = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "xsldir"))
xsldir = mp::xml::get_text(attr->children);
+ else if (!strcmp((const char *) attr->name, "element_transform"))
+ element_transform = mp::xml::get_text(attr->children);
+ else if (!strcmp((const char *) attr->name, "element_raw"))
+ element_raw = mp::xml::get_text(attr->children);
else
throw mp::filter::FilterException(
"Bad attribute " + std::string((const char *)
attr->name));
}
+ configure_local_records(ptr->children, test_only);
+ }
+ else if (!strcmp((const char *) ptr->name, "cclmap"))
+ {
+ const char *addinfo = 0;
+ ccl_xml_config(bibset, ptr, &addinfo);
}
else if (!strcmp((const char *) ptr->name, "fieldmap"))
{
if (cql_field.length())
fieldmap[cql_field] = ccl_field;
}
- else if (!strcmp((const char *) ptr->name, "records"))
- {
- yaz_log(YLOG_WARN, "records ignored!");
- }
else
{
throw mp::filter::FilterException
else
torus_db = database;
- xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db);
- if (!doc)
+ SearchablePtr sptr;
+
+ std::map<std::string,SearchablePtr>::iterator it;
+ it = m_p->s_map.find(torus_db);
+ if (it != m_p->s_map.end())
+ sptr = it->second;
+ else
{
- *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
- *addinfo = database.c_str();
- BackendPtr b;
- return b;
+ xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db);
+ if (!doc)
+ {
+ *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
+ *addinfo = database.c_str();
+ BackendPtr b;
+ return b;
+ }
+ const xmlNode *ptr = xmlDocGetRootElement(doc);
+ if (ptr)
+ { // presumably ptr is a records element node
+ // parse first record in document
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
+ {
+ if (ptr->type == XML_ELEMENT_NODE
+ && !strcmp((const char *) ptr->name, "record"))
+ {
+ sptr = m_p->parse_torus_record(ptr);
+ break;
+ }
+ }
+ }
+ xmlFreeDoc(doc);
}
- SearchablePtr sptr = m_p->parse_torus(xmlDocGetRootElement(doc));
- xmlFreeDoc(doc);
+
if (!sptr)
{
*error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
b->xsp = xsp;
b->m_frontend_database = database;
std::string authentication = sptr->authentication;
+
+ b->set_option("timeout", "40");
if (sptr->query_encoding.length())
b->set_option("rpnCharset", sptr->query_encoding.c_str());
{
*number_of_records_returned = 0;
Z_Records *records = 0;
- bool enable_pz2_transform = false;
+ bool enable_pz2_retrieval = false; // whether target profile is used
+ bool enable_pz2_transform = false; // whether XSLT is used as well
if (start < 0 || number_to_present <= 0)
return records;
char oid_name_str[OID_STR_MAX];
const char *syntax_name = 0;
-
- if (preferredRecordSyntax)
+
+ if (preferredRecordSyntax &&
+ !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)
+ && element_set_name)
{
- if (!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)
- && element_set_name &&
- !strcmp(element_set_name, "pz2"))
+ if (!strcmp(element_set_name, m_p->element_transform.c_str()))
{
- if (b->sptr->request_syntax.length())
- {
- syntax_name = b->sptr->request_syntax.c_str();
- enable_pz2_transform = true;
- }
+ enable_pz2_retrieval = true;
+ enable_pz2_transform = true;
}
- else
+ else if (!strcmp(element_set_name, m_p->element_raw.c_str()))
{
- syntax_name =
- yaz_oid_to_string_buf(preferredRecordSyntax, 0, oid_name_str);
+ enable_pz2_retrieval = true;
}
}
+
+ if (enable_pz2_retrieval)
+ {
+ if (b->sptr->request_syntax.length())
+ syntax_name = b->sptr->request_syntax.c_str();
+ }
+ else if (preferredRecordSyntax)
+ syntax_name =
+ yaz_oid_to_string_buf(preferredRecordSyntax, 0, oid_name_str);
b->set_option("preferredRecordSyntax", syntax_name);
- if (enable_pz2_transform)
+ if (enable_pz2_retrieval)
{
- element_set_name = "F";
+ element_set_name = 0;
if (b->sptr->element_set.length())
element_set_name = b->sptr->element_set.c_str();
}
npr = zget_surrogateDiagRec(odr, odr_database, sur_error,
addinfo);
}
- else if (enable_pz2_transform)
+ else if (enable_pz2_retrieval)
{
char rec_type_str[100];
strcpy(rec_type_str, b->sptr->use_turbomarc ?
"txml" : "xml");
-
// prevent buffer overflow ...
if (b->sptr->record_encoding.length() > 0 &&
b->sptr->record_encoding.length() <
int rec_len;
const char *rec_buf = ZOOM_record_get(recs[i], rec_type_str,
&rec_len);
- if (rec_buf && b->xsp)
+ if (rec_buf && b->xsp && enable_pz2_transform)
{
xmlDoc *rec_doc = xmlParseMemory(rec_buf, rec_len);
if (rec_doc)
assert(pqf_wrbuf);
if (b->get_option("sru"))
{
- cql_transform_t cqlt = cql_transform_create();
+ int status = 0;
Z_RPNQuery *zquery;
- WRBUF wrb = wrbuf_alloc();
- int status;
-
zquery = p_query_rpn(odr, wrbuf_cstr(pqf_wrbuf));
- status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery);
-
- cql_transform_close(cqlt);
-
+ WRBUF wrb = wrbuf_alloc();
+
+ if (!strcmp(b->get_option("sru"), "solr"))
+ {
+ solr_transform_t cqlt = solr_transform_create();
+
+ status = solr_transform_rpn2solr_wrbuf(cqlt, wrb, zquery);
+
+ solr_transform_close(cqlt);
+ }
+ else
+ {
+ cql_transform_t cqlt = cql_transform_create();
+
+ status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery);
+
+ cql_transform_close(cqlt);
+ }
if (status == 0)
{
yaz_log(YLOG_LOG, "search CQL: %s", wrbuf_cstr(wrb));
b->search_cql(wrbuf_cstr(wrb), &hits, &error, &addinfo);
}
-
+
wrbuf_destroy(wrb);
wrbuf_destroy(pqf_wrbuf);
if (status)
{
apdu_res =
odr.create_searchResponse(apdu_req, YAZ_BIB1_MALFORMED_QUERY,
- "can not convert from RPN to CQL");
+ "can not convert from RPN to CQL/SOLR");
package.response() = apdu_res;
return;
}
projects / metaproxy-moved-to-github.git / blobdiff