#include <yaz/log.h>
#include <yaz/zgdu.h>
#include <yaz/querytowrbuf.h>
+#include <yaz/sortspec.h>
+#include <yaz/tokenizer.h>
namespace mp = metaproxy_1;
namespace yf = mp::filter;
namespace metaproxy_1 {
namespace filter {
- struct Zoom::Searchable : boost::noncopyable {
+ class Zoom::Searchable : boost::noncopyable {
+ public:
std::string authentication;
std::string cfAuth;
std::string cfProxy;
std::string element_set;
std::string record_encoding;
std::string transform_xsl_fname;
+ std::string transform_xsl_content;
std::string urlRecipe;
std::string contentConnector;
+ std::string sortStrategy;
bool use_turbomarc;
bool piggyback;
CCL_bibset ccl_bibset;
+ std::map<std::string, std::string> sortmap;
Searchable(CCL_bibset base);
~Searchable();
};
~Backend();
void connect(std::string zurl, int *error, char **addinfo,
ODR odr);
- void search_pqf(const char *pqf, Odr_int *hits,
- int *error, char **addinfo, ODR odr);
- void search_cql(const char *cql, Odr_int *hits,
- int *error, char **addinfo, ODR odr);
+ void search(ZOOM_query q, Odr_int *hits,
+ int *error, char **addinfo, ODR odr);
void present(Odr_int start, Odr_int number, ZOOM_record *recs,
int *error, char **addinfo, ODR odr);
void set_option(const char *name, const char *value);
void handle_package(mp::Package &package);
void handle_search(mp::Package &package);
void handle_present(mp::Package &package);
- BackendPtr get_backend_from_databases(std::string &database,
+ BackendPtr get_backend_from_databases(const mp::Package &package,
+ std::string &database,
int *error,
char **addinfo,
ODR odr);
+
+
+ void prepare_elements(BackendPtr b,
+ Odr_oid *preferredRecordSyntax,
+ const char *element_set_name,
+ bool &enable_pz2_retrieval,
+ bool &enable_pz2_transform,
+ bool &assume_marc8_charset);
+
Z_Records *get_records(Odr_int start,
Odr_int number_to_present,
int *error,
CCL_bibset bibset;
std::string element_transform;
std::string element_raw;
+ std::string proxy;
std::map<std::string,SearchablePtr> s_map;
};
}
get_zoom_error(error, addinfo, odr);
}
-void yf::Zoom::Backend::search_pqf(const char *pqf, Odr_int *hits,
- int *error, char **addinfo, ODR odr)
-{
- m_resultset = ZOOM_connection_search_pqf(m_connection, pqf);
- get_zoom_error(error, addinfo, odr);
- if (*error == 0)
- *hits = ZOOM_resultset_size(m_resultset);
- else
- *hits = 0;
-}
-
-void yf::Zoom::Backend::search_cql(const char *cql, Odr_int *hits,
- int *error, char **addinfo, ODR odr)
+void yf::Zoom::Backend::search(ZOOM_query q, Odr_int *hits,
+ int *error, char **addinfo, ODR odr)
{
- ZOOM_query q = ZOOM_query_create();
-
- ZOOM_query_cql(q, cql);
-
m_resultset = ZOOM_connection_search(m_connection, q);
- ZOOM_query_destroy(q);
get_zoom_error(error, addinfo, odr);
if (*error == 0)
*hits = ZOOM_resultset_size(m_resultset);
{
piggyback = true;
use_turbomarc = true;
+ sortStrategy = "embed";
ccl_bibset = ccl_qual_dup(base);
}
{
bibset = ccl_qual_mk();
- srand(time(0));
+ srand((unsigned int) time(0));
}
yf::Zoom::Impl::~Impl()
s->transform_xsl_fname = mp::xml::get_text(ptr);
}
else if (!strcmp((const char *) ptr->name,
+ "literalTransform"))
+ {
+ s->transform_xsl_content = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
"urlRecipe"))
{
s->urlRecipe = mp::xml::get_text(ptr);
ccl_qual_fitem(s->ccl_bibset, value.c_str(),
(const char *) ptr->name + 7);
}
+ else if (!strncmp((const char *) ptr->name,
+ "sortmap_", 8))
+ {
+ std::string value = mp::xml::get_text(ptr);
+ s->sortmap[(const char *) ptr->name + 8] = value;
+ }
+ else if (!strcmp((const char *) ptr->name,
+ "sortStrategy"))
+ {
+ s->sortStrategy = mp::xml::get_text(ptr);
+ }
}
return s;
}
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 if (!strcmp((const char *) attr->name, "proxy"))
+ proxy = mp::xml::get_text(attr->children);
else
throw mp::filter::FilterException(
"Bad attribute " + std::string((const char *)
}
yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
+ const mp::Package &package,
std::string &database, int *error, char **addinfo, ODR odr)
{
std::list<BackendPtr>::const_iterator map_it;
it = m_p->s_map.find(torus_db);
if (it != m_p->s_map.end())
sptr = it->second;
- else
+ else if (m_p->torus_url.length() > 0)
{
- xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db);
+ xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db, m_p->proxy);
if (!doc)
{
*error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "record"))
{
+ if (sptr)
+ {
+ *error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ *addinfo = (char*) odr_malloc(odr, 40 + database.length()),
+ sprintf(*addinfo, "multiple records for udb=%s",
+ database.c_str());
+ xmlFreeDoc(doc);
+ BackendPtr b;
+ return b;
+ }
sptr = m_p->parse_torus_record(ptr);
- break;
}
}
}
}
xsltStylesheetPtr xsp = 0;
- if (sptr->transform_xsl_fname.length())
+ if (sptr->transform_xsl_content.length())
+ {
+ xmlDoc *xsp_doc = xmlParseMemory(sptr->transform_xsl_content.c_str(),
+ sptr->transform_xsl_content.length());
+ if (!xsp_doc)
+ {
+ *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+ *addinfo = (char *) odr_malloc(odr, 40);
+ sprintf(*addinfo, "xmlParseMemory failed");
+ BackendPtr b;
+ return b;
+ }
+ xsp = xsltParseStylesheetDoc(xsp_doc);
+ if (!xsp)
+ {
+ *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
+ *addinfo = odr_strdup(odr, "xsltParseStylesheetDoc failed");
+ BackendPtr b;
+ xmlFreeDoc(xsp_doc);
+ return b;
+ }
+ }
+ else if (sptr->transform_xsl_fname.length())
{
const char *path = 0;
b->set_option("apdulog", "1");
if (sptr->piggyback)
- b->set_option("count", "10");
+ b->set_option("count", "1"); /* some SRU servers INSIST on getting
+ maximumRecords > 0 */
b->set_option("piggyback", sptr->piggyback ? "1" : "0");
std::string authentication = sptr->authentication;
FILE *file = fopen(fname, "w");
if (!file)
{
- yaz_log(YLOG_WARN|YLOG_ERRNO, "create %s", fname);
+ package.log("zoom", YLOG_WARN|YLOG_ERRNO, "create %s", fname);
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
*addinfo = (char *) odr_malloc(odr, 40 + strlen(fname));
sprintf(*addinfo, "Could not create %s", fname);
wrbuf_puts(w, "#content_proxy\n");
wrbuf_printf(w, "connector: %s\n", b->sptr->contentConnector.c_str());
if (authentication.length())
- wrbuf_printf(w, "authentication: %s\n", authentication.c_str());
+ wrbuf_printf(w, "auth: %s\n", authentication.c_str());
if (proxy.length())
wrbuf_printf(w, "proxy: %s\n", proxy.c_str());
if (sptr->cfProxy.length())
fwrite(wrbuf_buf(w), 1, wrbuf_len(w), file);
fclose(file);
- yaz_log(YLOG_LOG, "file %s created\n", fname);
+ package.log("zoom", YLOG_LOG, "file %s created\n", fname);
xfree(fname);
}
}
if (db_args.length())
url += "," + db_args;
- yaz_log(YLOG_LOG, "url=%s", url.c_str());
+ package.log("zoom", YLOG_LOG, "url=%s", url.c_str());
b->connect(url, error, addinfo, odr);
if (*error == 0)
{
return b;
}
-Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
- Odr_int number_to_present,
- int *error,
- char **addinfo,
- Odr_int *number_of_records_returned,
- ODR odr,
- BackendPtr b,
- Odr_oid *preferredRecordSyntax,
- const char *element_set_name)
-{
- *number_of_records_returned = 0;
- Z_Records *records = 0;
- bool enable_pz2_retrieval = false; // whether target profile is used
- bool enable_pz2_transform = false; // whether XSLT is used as well
- bool assume_marc8_charset = false;
-
- if (start < 0 || number_to_present <= 0)
- return records;
-
- if (number_to_present > 10000)
- number_to_present = 10000;
-
- ZOOM_record *recs = (ZOOM_record *)
- odr_malloc(odr, number_to_present * sizeof(*recs));
+void yf::Zoom::Frontend::prepare_elements(BackendPtr b,
+ Odr_oid *preferredRecordSyntax,
+ const char *element_set_name,
+ bool &enable_pz2_retrieval,
+ bool &enable_pz2_transform,
+ bool &assume_marc8_charset)
+{
char oid_name_str[OID_STR_MAX];
const char *syntax_name = 0;
if (enable_pz2_retrieval)
{
- if (b->sptr->request_syntax.length())
+ std::string configured_request_syntax = b->sptr->request_syntax;
+ if (configured_request_syntax.length())
{
- syntax_name = b->sptr->request_syntax.c_str();
+ syntax_name = configured_request_syntax.c_str();
const Odr_oid *syntax_oid =
yaz_string_to_oid(yaz_oid_std(), CLASS_RECSYN, syntax_name);
if (!oid_oidcmp(syntax_oid, yaz_oid_recsyn_usmarc)
syntax_name =
yaz_oid_to_string_buf(preferredRecordSyntax, 0, oid_name_str);
+ if (b->sptr->sru.length())
+ syntax_name = "XML";
+
b->set_option("preferredRecordSyntax", syntax_name);
if (enable_pz2_retrieval)
}
b->set_option("elementSetName", element_set_name);
+ if (b->sptr->sru.length() && element_set_name)
+ b->set_option("schema", element_set_name);
+}
+
+Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
+ Odr_int number_to_present,
+ int *error,
+ char **addinfo,
+ Odr_int *number_of_records_returned,
+ ODR odr,
+ BackendPtr b,
+ Odr_oid *preferredRecordSyntax,
+ const char *element_set_name)
+{
+ *number_of_records_returned = 0;
+ Z_Records *records = 0;
+ bool enable_pz2_retrieval = false; // whether target profile is used
+ bool enable_pz2_transform = false; // whether XSLT is used as well
+ bool assume_marc8_charset = false;
+
+ prepare_elements(b, preferredRecordSyntax,
+ element_set_name,
+ enable_pz2_retrieval,
+ enable_pz2_transform,
+ assume_marc8_charset);
+
+ if (start < 0 || number_to_present <=0)
+ return records;
+
+ if (number_to_present > 10000)
+ number_to_present = 10000;
+
+ ZOOM_record *recs = (ZOOM_record *)
+ odr_malloc(odr, (size_t) number_to_present * sizeof(*recs));
b->present(start, number_to_present, recs, error, addinfo, odr);
- Odr_int i = 0;
+ int i = 0;
if (!*error)
{
for (i = 0; i < number_to_present; i++)
while (ptr && ptr->type != XML_ELEMENT_NODE)
ptr = ptr->next;
xmlNode *c =
- xmlNewChild(ptr, 0, BAD_CAST "generated-url", 0);
+ xmlNewChild(ptr, 0, BAD_CAST "metadata", 0);
+ xmlNewProp(c, BAD_CAST "type", BAD_CAST
+ "generated-url");
xmlNode * t = xmlNewText(BAD_CAST res.c_str());
xmlAddChild(c, t);
}
return records;
}
-
+
struct cql_node *yf::Zoom::Impl::convert_cql_fields(struct cql_node *cn,
ODR odr)
{
return r;
}
-static void sort_pqf_type_7(WRBUF pqf_wrbuf, const char *sru_sortkeys)
-{
- /* sortkey layour: path,schema,ascending,caseSensitive,missingValue */
- /* see cql_sortby_to_sortkeys of YAZ. */
- char **sortspec;
- int num_sortspec = 0;
- int i;
- NMEM nmem = nmem_create();
-
- if (sru_sortkeys)
- nmem_strsplit_blank(nmem, sru_sortkeys, &sortspec, &num_sortspec);
- if (num_sortspec > 0)
- {
- WRBUF w = wrbuf_alloc();
- for (i = 0; i < num_sortspec; i++)
- {
- char **arg;
- int num_arg;
- int ascending = 1;
- nmem_strsplitx(nmem, ",", sortspec[i], &arg, &num_arg, 0);
-
- if (num_arg > 2 && arg[2][0])
- ascending = atoi(arg[2]);
-
- wrbuf_puts(w, "@or @attr 1=");
- yaz_encode_pqf_term(w, arg[0], strlen(arg[0]));
- wrbuf_printf(w, "@attr 7=%d %d ", ascending ? 1 : 2, i);
- }
- if (wrbuf_len(w))
- {
- wrbuf_puts(w, wrbuf_cstr(pqf_wrbuf));
- wrbuf_rewind(pqf_wrbuf);
- wrbuf_puts(pqf_wrbuf, wrbuf_cstr(w));
- }
- wrbuf_destroy(w);
- }
- nmem_destroy(nmem);
-}
-
-static void sort_via_cql(WRBUF cql_sortby, const char *sru_sortkeys)
-{
- /* sortkey layour: path,schema,ascending,caseSensitive,missingValue */
- /* see cql_sortby_to_sortkeys of YAZ. */
- char **sortspec;
- int num_sortspec = 0;
- int i;
- NMEM nmem = nmem_create();
-
- if (sru_sortkeys)
- nmem_strsplit_blank(nmem, sru_sortkeys, &sortspec, &num_sortspec);
- if (num_sortspec > 0)
- {
- WRBUF w = wrbuf_alloc();
- for (i = 0; i < num_sortspec; i++)
- {
- char **arg;
- int num_arg;
- int ascending = 1;
- int case_sensitive = 0;
- const char *missing = 0;
- nmem_strsplitx(nmem, ",", sortspec[i], &arg, &num_arg, 0);
-
- if (num_arg > 2 && arg[2][0])
- ascending = atoi(arg[2]);
- if (num_arg > 3 && arg[3][0])
- case_sensitive = atoi(arg[3]);
- if (num_arg > 4 && arg[4][0])
- missing = arg[4];
- if (i > 0)
- wrbuf_puts(w, " ");
- else
- wrbuf_puts(w, " sortby ");
- wrbuf_puts(w, arg[0]); /* field */
- wrbuf_puts(w, "/");
- wrbuf_puts(w, ascending ? "ascending" : "descending");
- if (case_sensitive)
- wrbuf_puts(w, "/respectCase");
- if (missing)
- {
- if (!strcmp(missing, "omit"))
- wrbuf_puts(w, "/missingOmit");
- else if (!strcmp(missing, "abort"))
- wrbuf_puts(w, "/missingFail");
- else if (!strcmp(missing, "lowValue"))
- wrbuf_puts(w, "/missingLow");
- else if (!strcmp(missing, "highValue"))
- wrbuf_puts(w, "/missingHigh");
- }
- }
- if (wrbuf_len(w))
- wrbuf_puts(cql_sortby, wrbuf_cstr(w));
- wrbuf_destroy(w);
- }
- nmem_destroy(nmem);
-}
-
-#if YAZ_VERSIONL < 0x40206
-static void wrbuf_vp_puts(const char *buf, void *client_data)
-{
- WRBUF b = (WRBUF) client_data;
- wrbuf_puts(b, buf);
-}
-#endif
-
void yf::Zoom::Frontend::handle_search(mp::Package &package)
{
Z_GDU *gdu = package.request().get();
int error = 0;
char *addinfo = 0;
std::string db(sr->databaseNames[0]);
- BackendPtr b = get_backend_from_databases(db, &error, &addinfo, odr);
+ BackendPtr b = get_backend_from_databases(package, db, &error,
+ &addinfo, odr);
if (error)
{
apdu_res =
b->set_option("setname", "default");
+ bool enable_pz2_retrieval = false;
+ bool enable_pz2_transform = false;
+ bool assume_marc8_charset = false;
+ prepare_elements(b, sr->preferredRecordSyntax, 0 /*element_set_name */,
+ enable_pz2_retrieval,
+ enable_pz2_transform,
+ assume_marc8_charset);
+
Odr_int hits = 0;
Z_Query *query = sr->query;
WRBUF ccl_wrbuf = 0;
WRBUF pqf_wrbuf = 0;
- std::string sru_sortkeys;
+ std::string sortkeys;
if (query->which == Z_Query_type_1 || query->which == Z_Query_type_101)
{
WRBUF sru_sortkeys_wrbuf = wrbuf_alloc();
cql_sortby_to_sortkeys(cn, wrbuf_vp_puts, sru_sortkeys_wrbuf);
-
- sru_sortkeys.assign(wrbuf_cstr(sru_sortkeys_wrbuf));
+ WRBUF sort_spec_wrbuf = wrbuf_alloc();
+ yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sru_sortkeys_wrbuf),
+ sort_spec_wrbuf);
wrbuf_destroy(sru_sortkeys_wrbuf);
+
+ yaz_tok_cfg_t tc = yaz_tok_cfg_create();
+ yaz_tok_parse_t tp =
+ yaz_tok_parse_buf(tc, wrbuf_cstr(sort_spec_wrbuf));
+ yaz_tok_cfg_destroy(tc);
+
+ /* go through sortspec and map fields */
+ int token = yaz_tok_move(tp);
+ while (token != YAZ_TOK_EOF)
+ {
+ if (token == YAZ_TOK_STRING)
+ {
+ const char *field = yaz_tok_parse_string(tp);
+ std::map<std::string,std::string>::iterator it;
+ it = b->sptr->sortmap.find(field);
+ if (it != b->sptr->sortmap.end())
+ sortkeys += it->second;
+ else
+ sortkeys += field;
+ }
+ sortkeys += " ";
+ token = yaz_tok_move(tp);
+ if (token == YAZ_TOK_STRING)
+ {
+ sortkeys += yaz_tok_parse_string(tp);
+ }
+ if (token != YAZ_TOK_EOF)
+ {
+ sortkeys += " ";
+ token = yaz_tok_move(tp);
+ }
+ }
+ yaz_tok_parse_destroy(tp);
+ wrbuf_destroy(sort_spec_wrbuf);
}
cql_parser_destroy(cp);
if (r)
assert(pqf_wrbuf == 0);
int cerror, cpos;
struct ccl_rpn_node *cn;
- yaz_log(YLOG_LOG, "CCL: %s", wrbuf_cstr(ccl_wrbuf));
+ package.log("zoom", YLOG_LOG, "CCL: %s", wrbuf_cstr(ccl_wrbuf));
cn = ccl_find_str(b->sptr->ccl_bibset, wrbuf_cstr(ccl_wrbuf),
&cerror, &cpos);
wrbuf_destroy(ccl_wrbuf);
}
pqf_wrbuf = wrbuf_alloc();
ccl_pquery(pqf_wrbuf, cn);
+ package.log("zoom", YLOG_LOG, "RPN: %s", wrbuf_cstr(pqf_wrbuf));
ccl_rpn_delete(cn);
}
assert(pqf_wrbuf);
+
+ ZOOM_query q = ZOOM_query_create();
+ ZOOM_query_sortby2(q, b->sptr->sortStrategy.c_str(), sortkeys.c_str());
+
if (b->get_option("sru"))
{
int status = 0;
status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery);
cql_transform_close(cqlt);
-
- if (status == 0)
- sort_via_cql(wrb, sru_sortkeys.c_str());
}
if (status == 0)
{
- yaz_log(YLOG_LOG, "search CQL: %s", wrbuf_cstr(wrb));
- b->search_cql(wrbuf_cstr(wrb), &hits, &error, &addinfo, odr);
+ ZOOM_query_cql(q, wrbuf_cstr(wrb));
+ package.log("zoom", YLOG_LOG, "CQL: %s", wrbuf_cstr(wrb));
+ b->search(q, &hits, &error, &addinfo, odr);
}
+ ZOOM_query_destroy(q);
wrbuf_destroy(wrb);
wrbuf_destroy(pqf_wrbuf);
}
else
{
- sort_pqf_type_7(pqf_wrbuf, sru_sortkeys.c_str());
-
- yaz_log(YLOG_LOG, "search PQF: %s", wrbuf_cstr(pqf_wrbuf));
- b->search_pqf(wrbuf_cstr(pqf_wrbuf), &hits, &error, &addinfo, odr);
+ ZOOM_query_prefix(q, wrbuf_cstr(pqf_wrbuf));
+ package.log("zoom", YLOG_LOG, "search PQF: %s", wrbuf_cstr(pqf_wrbuf));
+ b->search(q, &hits, &error, &addinfo, odr);
+ ZOOM_query_destroy(q);
wrbuf_destroy(pqf_wrbuf);
}
projects / metaproxy-moved-to-github.git / blobdiff