#include <yaz/pquery.h>
#include <yaz/oid_db.h>
#include <yaz/log.h>
+#include <yaz/otherinfo.h>
#if YAZ_VERSIONL >= 0x50000
#include <yaz/facet.h>
#endif
FrontendPtr get_frontend(mp::Package &package);
void release_frontend(mp::Package &package);
std::map<std::string, const xmlNode *> m_database_explain;
+ std::string default_stylesheet;
typedef std::map<std::string, int> ActiveUrlMap;
- boost::mutex m_url_mutex;
- boost::condition m_cond_url_ready;
- ActiveUrlMap m_active_urls;
-
-
boost::mutex m_mutex_session;
boost::condition m_cond_session_ready;
std::map<mp::Session, FrontendPtr> m_clients;
bool z3950_search_request(
mp::Package &package,
+ mp::Package &z3950_package,
mp::odr &odr_en,
Z_SRW_PDU *sru_pdu_res,
Z_SRW_searchRetrieveRequest const *sr_req,
if (dbnode->type != XML_ELEMENT_NODE)
continue;
- std::string database;
- mp::xml::check_element_mp(dbnode, "database");
-
- for (struct _xmlAttr *attr = dbnode->properties;
- attr; attr = attr->next)
+ if (!strcmp((const char *) dbnode->name, "database"))
{
+ std::string database;
- mp::xml::check_attribute(attr, "", "name");
- database = mp::xml::get_text(attr);
-
- const xmlNode *explainnode;
- for (explainnode = dbnode->children;
- explainnode; explainnode = explainnode->next)
+ for (struct _xmlAttr *attr = dbnode->properties;
+ attr; attr = attr->next)
{
- if (explainnode->type != XML_ELEMENT_NODE)
- continue;
- if (explainnode)
- break;
+ mp::xml::check_attribute(attr, "", "name");
+ database = mp::xml::get_text(attr);
+
+ const xmlNode *explainnode;
+ for (explainnode = dbnode->children;
+ explainnode; explainnode = explainnode->next)
+ {
+ if (explainnode->type == XML_ELEMENT_NODE)
+ {
+ m_database_explain.insert(
+ std::make_pair(database, explainnode));
+ break;
+ }
+ }
}
- // assigning explain node to database name - no check yet
- m_database_explain.insert(std::make_pair(database, explainnode));
+ }
+ else if (!strcmp((const char *) dbnode->name, "stylesheet"))
+ {
+ default_stylesheet = mp::xml::get_text(dbnode);
+ }
+ else
+ {
+ throw mp::filter::FilterException
+ ("Bad element "
+ + std::string((const char *) dbnode->name)
+ + " in sru_z3950"
+ );
}
}
}
Z_SRW_PDU *sru_pdu_req = 0;
mp::odr odr_en(ODR_ENCODE);
- Z_SRW_PDU *sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response);
// determine database with the HTTP header information only
mp_util::SRUServerInfo sruinfo = mp_util::get_sru_server_info(package);
// decode SRU request
Z_SOAP *soap = 0;
char *charset = 0;
- char *stylesheet = 0;
+ const char *stylesheet = 0;
+ Z_SRW_diagnostic *diagnostic = 0;
+ int num_diagnostic = 0;
// filter acts as sink for non-valid SRU requests
if (! (sru_pdu_req = mp_util::decode_sru_request(package, odr_de, odr_en,
- sru_pdu_res, &soap,
- charset, stylesheet)))
+ &diagnostic,
+ &num_diagnostic, &soap,
+ charset)))
{
if (soap)
{
+ Z_SRW_PDU *sru_pdu_res = yaz_srw_get(odr_en,
+ Z_SRW_explain_response);
+ sru_pdu_res->u.explain_response->diagnostics = diagnostic;
+ sru_pdu_res->u.explain_response->num_diagnostics = num_diagnostic;
mp_util::build_sru_explain(package, odr_en, sru_pdu_res,
sruinfo, explainnode);
mp_util::build_sru_response(package, odr_en, soap,
assert(sru_pdu_req);
- // filter acts as sink for SRU explain requests
+ Package z3950_package(package.session(), package.origin());
+ z3950_package.copy_filter(package);
+
+ Z_SRW_PDU *sru_pdu_res = 0;
if (sru_pdu_req->which == Z_SRW_explain_request)
{
Z_SRW_explainRequest *er_req = sru_pdu_req->u.explain_request;
+ stylesheet = er_req->stylesheet;
+ sru_pdu_res = yaz_srw_get_pdu_e(odr_en, Z_SRW_explain_response,
+ sru_pdu_req);
+ sru_pdu_res->u.explain_response->diagnostics = diagnostic;
+ sru_pdu_res->u.explain_response->num_diagnostics = num_diagnostic;
mp_util::build_sru_explain(package, odr_en, sru_pdu_res,
sruinfo, explainnode, er_req);
}
- else if (sru_pdu_req->which == Z_SRW_searchRetrieve_request
- && sru_pdu_req->u.request)
- { // searchRetrieve
+ else if (sru_pdu_req->which == Z_SRW_searchRetrieve_request)
+ {
Z_SRW_searchRetrieveRequest *sr_req = sru_pdu_req->u.request;
-
- sru_pdu_res = yaz_srw_get_pdu(odr_en, Z_SRW_searchRetrieve_response,
- sru_pdu_req->srw_version);
+ stylesheet = sr_req->stylesheet;
+ sru_pdu_res = yaz_srw_get_pdu_e(odr_en, Z_SRW_searchRetrieve_response,
+ sru_pdu_req);
+ sru_pdu_res->u.response->diagnostics = diagnostic;
+ sru_pdu_res->u.response->num_diagnostics = num_diagnostic;
// checking that we have a query
ok = mp_util::check_sru_query_exists(package, odr_en,
if (ok && z3950_init_request(package, odr_en,
zurl, sru_pdu_res, sru_pdu_req))
{
- ok = z3950_search_request(package, odr_en,
+ ok = z3950_search_request(package, z3950_package, odr_en,
sru_pdu_res, sr_req, zurl, dbargs);
if (ok
z3950_close_request(package);
}
}
-
- // scan
- else if (sru_pdu_req->which == Z_SRW_scan_request
- && sru_pdu_req->u.scan_request)
+ else if (sru_pdu_req->which == Z_SRW_scan_request)
{
- sru_pdu_res = yaz_srw_get_pdu(odr_en, Z_SRW_scan_response,
- sru_pdu_req->srw_version);
+ stylesheet = sru_pdu_req->u.scan_request->stylesheet;
+ sru_pdu_res = yaz_srw_get_pdu_e(odr_en, Z_SRW_scan_response,
+ sru_pdu_req);
+ sru_pdu_res->u.scan_response->diagnostics = diagnostic;
+ sru_pdu_res->u.scan_response->num_diagnostics = num_diagnostic;
// we do not do scan at the moment, therefore issuing a diagnostic
- yaz_add_srw_diagnostic(odr_en,
- &(sru_pdu_res->u.scan_response->diagnostics),
- &(sru_pdu_res->u.scan_response->num_diagnostics),
+ yaz_add_srw_diagnostic(odr_en,
+ &sru_pdu_res->u.scan_response->diagnostics,
+ &sru_pdu_res->u.scan_response->num_diagnostics,
YAZ_SRW_UNSUPP_OPERATION, "scan");
}
else
{
- sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response);
-
- yaz_add_srw_diagnostic(odr_en,
- &(sru_pdu_res->u.explain_response->diagnostics),
- &(sru_pdu_res->u.explain_response->num_diagnostics),
+ sru_pdu_res =
+ yaz_srw_get_pdu_e(odr_en, Z_SRW_explain_response, sru_pdu_req);
+ sru_pdu_res->u.explain_response->diagnostics = diagnostic;
+ sru_pdu_res->u.explain_response->num_diagnostics = num_diagnostic;
+ yaz_add_srw_diagnostic(odr_en, &diagnostic, &num_diagnostic,
YAZ_SRW_UNSUPP_OPERATION, "unknown");
}
-
if (enable_package_log)
{
std::string l;
odr_strdup(odr_en, wrbuf_cstr(w));
}
}
+ if (!stylesheet && default_stylesheet.length())
+ stylesheet = default_stylesheet.c_str();
// build and send SRU response
mp_util::build_sru_response(package, odr_en, soap,
if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request)
{
- if (zgdu_req->u.HTTP_Request->content_len == 0)
- {
- const char *path = zgdu_req->u.HTTP_Request->path;
- boost::mutex::scoped_lock lock(m_url_mutex);
- while (1)
- {
- ActiveUrlMap::iterator it = m_active_urls.find(path);
- if (it == m_active_urls.end())
- {
- m_active_urls[path] = 1;
- break;
- }
- yaz_log(YLOG_LOG, "Waiting for %s to complete", path);
- m_cond_url_ready.wait(lock);
- }
- }
sru(package, zgdu_req);
- if (zgdu_req && zgdu_req->u.HTTP_Request->content_len == 0)
- {
- const char *path = zgdu_req->u.HTTP_Request->path;
- boost::mutex::scoped_lock lock(m_url_mutex);
-
- ActiveUrlMap::iterator it = m_active_urls.find(path);
-
- m_active_urls.erase(it);
- m_cond_url_ready.notify_all();
- }
}
else
{
mp_util::set_vhost_otherinfo(&init_req->otherInfo, odr_en, host, 1);
}
+ Z_GDU *zgdu_req = package.request().get();
+ if (zgdu_req->which == Z_GDU_HTTP_Request)
+ {
+ Z_HTTP_Request *hreq = zgdu_req->u.HTTP_Request;
+ const char *peer_name =
+ z_HTTP_header_lookup(hreq->headers, "X-Forwarded-For");
+ if (peer_name)
+ {
+ yaz_oi_set_string_oid(&init_req->otherInfo, odr_en,
+ yaz_oid_userinfo_client_ip, 1, peer_name);
+ }
+ }
+
z3950_package.request() = apdu;
// send Z3950 package
}
bool yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package,
+ mp::Package &z3950_package,
mp::odr &odr_en,
Z_SRW_PDU *sru_pdu_res,
Z_SRW_searchRetrieveRequest
assert(sru_pdu_res->u.response);
- Package z3950_package(package.session(), package.origin());
- z3950_package.copy_filter(package);
-
Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_searchRequest);
Z_SearchRequest *z_searchRequest = apdu->u.searchRequest;
// yaz_oi_set_facetlist not public in YAZ 4.2.66
if (sr_req->facetList)
{
- Z_OtherInformation **oi = &z_searchRequest->otherInfo;
+ Z_OtherInformation **oi = &z_searchRequest->additionalSearchInfo;
yaz_oi_set_facetlist(oi, odr_en, sr_req->facetList);
}
#endif
projects / metaproxy-moved-to-github.git / blobdiff