std::string &database,
int *error,
char **addinfo,
- ODR odr,
+ mp::odr &odr,
std::string &torus_db,
std::string &realm);
void handle_present(mp::Package &package);
std::string &database,
int *error,
char **addinfo,
- ODR odr,
+ mp::odr &odr,
int *proxy_step);
bool create_content_session(mp::Package &package,
ODR odr, BackendPtr b,
Odr_oid *preferredRecordSyntax,
const char *element_set_name);
+ Z_Records *get_explain_records(Package &package,
+ 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);
void log_diagnostic(mp::Package &package,
int error, const char *addinfo);
}
}
+
+static xmlNode *xml_node_search(xmlNode *ptr, int *num, int m)
+{
+ while (ptr)
+ {
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "recordData"))
+ {
+ (*num)++;
+ if (m == *num)
+ return ptr;
+ }
+ else // else: we don't want to find nested nodes
+ {
+ xmlNode *ret_node = xml_node_search(ptr->children, num, m);
+ if (ret_node)
+ return ret_node;
+ }
+ ptr = ptr->next;
+ }
+ return 0;
+}
+
// define Pimpl wrapper forwarding to Impl
yf::Zoom::Zoom() : m_p(new Impl)
"cclmap_", 7))
{
std::string value = mp::xml::get_text(ptr);
- ccl_qual_fitem(s->ccl_bibset, value.c_str(),
- (const char *) ptr->name + 7);
+ if (value.length() > 0)
+ {
+ ccl_qual_fitem(s->ccl_bibset, value.c_str(),
+ (const char *) ptr->name + 7);
+ }
}
else if (!strncmp((const char *) ptr->name,
"sortmap_", 8))
yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
mp::Package &package,
- std::string &database, int *error, char **addinfo, ODR odr,
+ std::string &database, int *error, char **addinfo, mp::odr &odr,
int *proxy_step)
{
std::list<BackendPtr>::const_iterator map_it;
{
char **dstr;
int dnum = 0;
- nmem_strsplit(odr->mem, ",", value, &dstr, &dnum);
+ nmem_strsplit(((ODR) odr)->mem, ",", value, &dstr, &dnum);
if (*proxy_step >= dnum)
*proxy_step = 0;
else
sptr = it->second;
else if (torus_url.length() > 0)
{
- std::string torus_query = "udb=" + torus_db;
+ std::string torus_query = "udb==" + torus_db;
xmlDoc *doc = mp::get_searchable(package,torus_url, torus_db,
torus_query,
realm, m_p->proxy);
b->set_option("schema", element_set_name);
}
+Z_Records *yf::Zoom::Frontend::get_explain_records(
+ Package &package,
+ 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)
+{
+ Odr_int i;
+ Z_Records *records = 0;
+
+ if (!b->explain_doc)
+ {
+ return records;
+ }
+ if (number_to_present > 10000)
+ number_to_present = 10000;
+
+ xmlNode *ptr = xmlDocGetRootElement(b->explain_doc);
+
+ Z_NamePlusRecordList *npl = (Z_NamePlusRecordList *)
+ odr_malloc(odr, sizeof(*npl));
+ npl->records = (Z_NamePlusRecord **)
+ odr_malloc(odr, number_to_present * sizeof(*npl->records));
+
+ for (i = 0; i < number_to_present; i++)
+ {
+ int num = 0;
+ xmlNode *res = xml_node_search(ptr, &num, start + i + 1);
+ if (!res)
+ break;
+ xmlBufferPtr xml_buf = xmlBufferCreate();
+ xmlNode *tmp_node = xmlCopyNode(res->children, 1);
+ xmlNodeDump(xml_buf, tmp_node->doc, tmp_node, 0, 0);
+
+ Z_NamePlusRecord *npr =
+ (Z_NamePlusRecord *) odr_malloc(odr, sizeof(*npr));
+ npr->databaseName = odr_strdup(odr, b->m_frontend_database.c_str());
+ npr->which = Z_NamePlusRecord_databaseRecord;
+ npr->u.databaseRecord =
+ z_ext_record_xml(odr,
+ (const char *) xml_buf->content, xml_buf->use);
+ npl->records[i] = npr;
+ xmlFreeNode(tmp_node);
+ xmlBufferFree(xml_buf);
+ }
+ records = (Z_Records*) odr_malloc(odr, sizeof(*records));
+ records->which = Z_Records_DBOSD;
+ records->u.databaseOrSurDiagnostics = npl;
+
+ npl->num_records = i;
+ *number_of_records_returned = i;
+ return records;
+}
+
+
Z_Records *yf::Zoom::Frontend::get_records(Package &package,
Odr_int start,
Odr_int number_to_present,
std::string &database,
int *error,
char **addinfo,
- ODR odr,
+ mp::odr &odr,
std::string &torus_db,
std::string &realm)
{
Z_GDU *gdu = package.request().get();
Z_APDU *apdu_req = gdu->u.z3950;
- Z_APDU *apdu_res = 0;
Z_SearchRequest *sr = apdu_req->u.searchRequest;
Z_Query *query = sr->query;
- if (query->which == Z_Query_type_104 &&
+ if (!m_p->explain_xsp)
+ {
+ *error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ *addinfo =
+ odr_strdup(odr, "IR-Explain---1 unsupported. torus explain_xsl not defined");
+ return m_backend;
+ }
+ else if (query->which == Z_Query_type_104 &&
query->u.type_104->which == Z_External_CQL)
{
std::string torus_url = m_p->torus_searchable_url;
xmlFreeDoc(doc);
doc = rec_res;
}
- *error = YAZ_BIB1_QUERY_TYPE_UNSUPP;
- *addinfo = odr_strdup(odr, "CQL, IR-Explain---1");
-
- xmlChar *buf_out = 0;
- int len_out;
- xmlDocDumpMemory(doc, &buf_out, &len_out);
+ if (!doc)
+ {
+ *error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ *addinfo = odr_strdup(odr, "IR-Explain--1 problem. "
+ "Could not obtain Torus records for Explain");
+ }
+ else
+ {
+ xmlNode *ptr = xmlDocGetRootElement(doc);
+ int hits = 0;
+
+ xml_node_search(ptr, &hits, 0);
- fwrite(buf_out, 1, len_out, yaz_log_file());
-
- xmlFree(buf_out);
+ Z_APDU *apdu_res = odr.create_searchResponse(apdu_req, 0, 0);
+ apdu_res->u.searchResponse->resultCount = odr_intdup(odr, hits);
+ package.response() = apdu_res;
+ m_backend = b;
+ }
if (b->explain_doc)
xmlFreeDoc(b->explain_doc);
b->explain_doc = doc;
else
{
*error = YAZ_BIB1_QUERY_TYPE_UNSUPP;
- *addinfo = odr_strdup(odr, "RPN/CCL, IR-Explain---1");
+ *addinfo = odr_strdup(odr, "IR-Explain---1 only supports CQL");
return m_backend;
}
}
package.response() = apdu_res;
return;
}
- if (b->enable_explain)
+ if (!b || b->enable_explain)
return;
b->set_option("setname", "default");
if (m_backend->enable_explain)
{
- package.response() = odr.create_presentResponse(
- apdu_req, YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
- "IR-Explain---1 fetch not implemented");
- return;
+ Z_Records *records =
+ get_explain_records(
+ package,
+ *pr->resultSetStartPoint - 1, *pr->numberOfRecordsRequested,
+ &error, &addinfo, &number_of_records_returned, odr, m_backend,
+ pr->preferredRecordSyntax, element_set_name);
+
+ apdu_res = odr.create_presentResponse(apdu_req, error, addinfo);
+ if (records)
+ {
+ apdu_res->u.presentResponse->records = records;
+ apdu_res->u.presentResponse->numberOfRecordsReturned =
+ odr_intdup(odr, number_of_records_returned);
+ }
+ package.response() = apdu_res;
}
else
{
projects / metaproxy-moved-to-github.git / blobdiff