/* This file is part of Metaproxy.
- Copyright (C) 2005-2010 Index Data
+ Copyright (C) 2005-2011 Index Data
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
ActiveUrlMap m_active_urls;
private:
void sru(metaproxy_1::Package &package, Z_GDU *zgdu_req);
- bool z3950_build_query(
+ int z3950_build_query(
mp::odr &odr_en, Z_Query *z_query,
const Z_SRW_searchRetrieveRequest *req
) const;
-
+
bool z3950_init_request(
mp::Package &package,
mp::odr &odr_en,
{ // must have a destructor because of boost::scoped_ptr
}
-void yf::SRUtoZ3950::configure(const xmlNode *xmlnode, bool test_only)
+void yf::SRUtoZ3950::configure(const xmlNode *xmlnode, bool test_only,
+ const char *path)
{
m_p->configure(xmlnode);
}
}
// assigning explain node to database name - no check yet
m_database_explain.insert(std::make_pair(database, explainnode));
- }
+ }
}
}
{
package.origin().set_max_sockets(atoi(arg->value));
}
+ else if (!strcmp(arg->name, "x-session-id"))
+ {
+ package.origin().set_custom_session(arg->value);
+ }
assert(sru_pdu_req);
if (ok
&& sru_pdu_res->u.response->numberOfRecords
&& *(sru_pdu_res->u.response->numberOfRecords))
-
+
ok = z3950_present_request(package, odr_en,
sru_pdu_res,
sr_req);
YAZ_SRW_UNSUPP_OPERATION, "unknown");
}
+
+ std::string l;
+ package.reset_log(l);
+ if (l.length())
+ {
+ WRBUF w = wrbuf_alloc();
+
+ wrbuf_puts(w, "<log>\n");
+ wrbuf_xmlputs(w, l.c_str());
+ wrbuf_puts(w, "</log>");
+
+ sru_pdu_res->extraResponseData_len = wrbuf_len(w);
+ sru_pdu_res->extraResponseData_buf = odr_strdup(odr_en, wrbuf_cstr(w));
+ wrbuf_destroy(w);
+ }
+
// build and send SRU response
mp_util::build_sru_response(package, odr_en, soap,
sru_pdu_res, charset, stylesheet);
}
init_req->idAuthentication = auth;
+
+ *init_req->preferredMessageSize = 10*1024*1024;
+ *init_req->maximumRecordSize = 10*1024*1024;
ODR_MASK_SET(init_req->options, Z_Options_search);
ODR_MASK_SET(init_req->options, Z_Options_present);
if (z3950_gdu && z3950_gdu->which == Z_GDU_Z3950
&& z3950_gdu->u.z3950->which == Z_APDU_initResponse
&& *z3950_gdu->u.z3950->u.initResponse->result)
- return true;
+ return true;
yaz_add_srw_diagnostic(odr_en,
&(sru_pdu_res->u.response->diagnostics),
Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_searchRequest);
Z_SearchRequest *z_searchRequest = apdu->u.searchRequest;
+ // RecordSyntax will always be XML
+ z_searchRequest->preferredRecordSyntax
+ = odr_oiddup(odr_en, yaz_oid_recsyn_xml);
if (!mp_util::set_databases_from_zurl(odr_en, zurl,
- &z_searchRequest->num_databaseNames,
- &z_searchRequest->databaseNames))
+ &z_searchRequest->num_databaseNames,
+ &z_searchRequest->databaseNames))
{
z_searchRequest->num_databaseNames = 1;
z_searchRequest->databaseNames = (char**)
= odr_strdup(odr_en, const_cast<char *>(sr_req->database));
else
z_searchRequest->databaseNames[0]
- = odr_strdup(odr_en, "Default");
+ = odr_strdup(odr_en, "Default");
}
// z3950'fy query
Z_Query *z_query = (Z_Query *) odr_malloc(odr_en, sizeof(Z_Query));
z_searchRequest->query = z_query;
- if (!z3950_build_query(odr_en, z_query, sr_req))
+ int sru_diagnostic = z3950_build_query(odr_en, z_query, sr_req);
+ if (sru_diagnostic)
{
yaz_add_srw_diagnostic(odr_en,
&(sru_pdu_res->u.response->diagnostics),
&(sru_pdu_res->u.response->num_diagnostics),
- 7, "query");
+ sru_diagnostic,
+ "query");
return false;
}
yaz_add_srw_diagnostic(odr_en,
&(sru_pdu_res->u.response->diagnostics),
&(sru_pdu_res->u.response->num_diagnostics),
- 2, 0);
+ YAZ_SRW_SYSTEM_TEMPORARILY_UNAVAILABLE, 0);
return false;
}
max_recs = *sru_pdu_res->u.response->numberOfRecords - start + 1;
Z_SRW_searchRetrieveResponse *sru_res = sru_pdu_res->u.response;
- // srw'fy number of returned records
- sru_res->num_records = max_recs;
- sru_res->records = (Z_SRW_record *) odr_malloc(odr_en,
- sru_res->num_records
- * sizeof(Z_SRW_record));
+ sru_res->records = (Z_SRW_record *)
+ odr_malloc(odr_en, max_recs * sizeof(Z_SRW_record));
int num = 0;
while (num < max_recs)
{
return true;
}
-bool yf::SRUtoZ3950::Impl::z3950_build_query(mp::odr &odr_en, Z_Query *z_query,
- const Z_SRW_searchRetrieveRequest *req
+int yf::SRUtoZ3950::Impl::z3950_build_query(mp::odr &odr_en, Z_Query *z_query,
+ const Z_SRW_searchRetrieveRequest *req
) const
{
if (req->query_type == Z_SRW_query_type_cql)
z_query->which = Z_Query_type_104;
z_query->u.type_104 = ext;
- return true;
+ return 0;
}
if (req->query_type == Z_SRW_query_type_pqf)
pqf_parser = yaz_pqf_create ();
RPNquery = yaz_pqf_parse (pqf_parser, odr_en, req->query.pqf);
+
+ yaz_pqf_destroy(pqf_parser);
+
if (!RPNquery)
- {
- std::cout << "TODO: Handeling of bad PQF\n";
- std::cout << "TODO: Diagnostic to be send\n";
- }
+ return YAZ_SRW_QUERY_SYNTAX_ERROR;
+
z_query->which = Z_Query_type_1;
z_query->u.type_1 = RPNquery;
- yaz_pqf_destroy(pqf_parser);
- return true;
+ return 0;
}
- return false;
+ return YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED;
}
int
yf::SRUtoZ3950::Impl::z3950_to_srw_diag(mp::odr &odr_en,
- Z_SRW_searchRetrieveResponse *sru_res,
- Z_DefaultDiagFormat *ddf) const
+ Z_SRW_searchRetrieveResponse *sru_res,
+ Z_DefaultDiagFormat *ddf) const
{
int bib1_code = *ddf->condition;
sru_res->num_diagnostics = 1;