/* This file is part of Metaproxy.
- Copyright (C) 2005-2011 Index Data
+ Copyright (C) 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
#include <boost/shared_ptr.hpp>
#include <metaproxy/util.hpp>
-#include "torus.hpp"
#include <yaz/zgdu.h>
#include <yaz/otherinfo.h>
#include <yaz/diagbib1.h>
#include <yaz/match_glob.h>
#include <yaz/log.h>
+#include <yaz/oid_db.h>
#include <map>
#include <iostream>
std::string m_dbpattern;
std::list<std::string> m_targets;
std::string m_route;
- public:
- std::string m_query_encoding;
};
struct VirtualDB::Backend {
mp::Session m_backend_session;
BackendPtr b);
void fixup_npr_records(ODR odr, Z_Records *records,
BackendPtr b);
-
+
BackendPtr lookup_backend_from_databases(
std::list<std::string> databases);
BackendPtr create_backend_from_databases(
std::list<std::string> databases,
int &error_code,
std::string &failing_database);
-
+
BackendPtr init_backend(std::list<std::string> database,
Package &package,
int &error_code, std::string &addinfo);
Rep *m_p;
- };
+ };
class VirtualDB::Rep {
friend class VirtualDB;
friend struct Frontend;
-
+
FrontendPtr get_frontend(Package &package);
void release_frontend(Package &package);
void refresh_torus();
boost::condition m_cond_session_ready;
std::map<mp::Session, FrontendPtr> m_clients;
bool pass_vhosts;
- mp::Torus torus;
};
}
}
// see if we have a route conflict.
if (!first_route && b->m_route != map_it->m_route)
{
- // we have a conflict..
+ // we have a conflict.. routing must be same for all
error_code = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
BackendPtr ptr;
return ptr;
Z_GDU *org_gdu = m_init_gdu.get();
Z_InitRequest *org_init = org_gdu->u.z3950->u.initRequest;
+
+ const char *peer_name = yaz_oi_get_string_oid(
+ &org_init->otherInfo, yaz_oid_userinfo_client_ip, 1, 0);
+ if (peer_name)
+ yaz_oi_set_string_oid(&init_apdu->u.initRequest->otherInfo, odr,
+ yaz_oid_userinfo_client_ip, 1, peer_name);
+
req->idAuthentication = org_init->idAuthentication;
req->implementationId = org_init->implementationId;
req->implementationName = org_init->implementationName;
ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3);
init_package.request() = init_apdu;
-
- init_package.move(b->m_route); // sending init
+
+ init_package.move(b->m_route); // sending init
Z_GDU *gdu = init_package.response().get();
// we hope to get an init response
- error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
+ error_code = 0;
if (gdu && gdu->which == Z_GDU_Z3950
- && gdu->u.z3950->which == Z_APDU_initResponse
- && *gdu->u.z3950->u.initResponse->result)
+ && gdu->u.z3950->which == Z_APDU_initResponse)
{
Z_InitResponse *res = gdu->u.z3950->u.initResponse;
if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
}
mp::util::get_init_diagnostics(res, error_code, addinfo);
}
+ if (error_code == 0)
+ {
+ std::list<std::string>::const_iterator db_it = databases.begin();
+ error_code = YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED;
+ if (db_it != databases.end())
+ addinfo = *db_it;
+ }
if (!init_package.session().is_closed())
{
Package close_package(b->m_backend_session, package.origin());
close_package.move(b->m_route); // closing it
}
BackendPtr null;
- return null;
+ return null;
}
void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
{
- Z_SearchRequest *req = apdu_req->u.searchRequest;
+ yazpp_1::GDU ngdu(apdu_req);
+ Z_SearchRequest *req = ngdu.get()->u.z3950->u.searchRequest;
std::string vhost;
std::string resultSetId = req->resultSetName;
mp::odr odr;
Sets_it sets_it = m_sets.find(req->resultSetName);
if (sets_it != m_sets.end())
{
- // result set already exist
+ // result set already exist
// if replace indicator is off: we return diagnostic if
// result set already exist.
if (*req->replaceIndicator == 0)
{
- Z_APDU *apdu =
+ Z_APDU *apdu =
odr.create_searchResponse(
apdu_req,
YAZ_BIB1_RESULT_SET_EXISTS_AND_REPLACE_INDICATOR_OFF,
0);
package.response() = apdu;
-
+
return;
- }
+ }
sets_it->second.m_backend->m_number_of_sets--;
}
// pick up any existing database with named result sets ..
if (!b)
{
// did not get a backend (unavailable somehow?)
-
- Z_APDU *apdu =
+
+ Z_APDU *apdu =
odr.create_searchResponse(
apdu_req, error_code, addinfo.c_str());
package.response() = apdu;
*req->replaceIndicator = 1;
- search_package.request() = yazpp_1::GDU(apdu_req);
-
+ search_package.request() = ngdu;
+
search_package.move(b->m_route);
if (search_package.session().is_closed())
void yf::VirtualDB::Frontend::close(mp::Package &package)
{
std::list<BackendPtr>::const_iterator b_it;
-
+
for (b_it = m_backend_list.begin(); b_it != m_backend_list.end(); b_it++)
{
(*b_it)->m_backend_session.close();
boost::mutex::scoped_lock lock(m_mutex);
std::map<mp::Session,yf::VirtualDB::FrontendPtr>::iterator it;
-
+
while(true)
{
it = m_clients.find(package.session());
if (it == m_clients.end())
break;
-
+
if (!it->second->m_in_use)
{
it->second->m_in_use = true;
{
boost::mutex::scoped_lock lock(m_mutex);
std::map<mp::Session,yf::VirtualDB::FrontendPtr>::iterator it;
-
+
it = m_clients.find(package.session());
if (it != m_clients.end())
{
}
}
-void yf::VirtualDB::Rep::refresh_torus(void)
-{
- xmlDoc *doc = torus.get_doc();
- if (!doc)
- return;
-
- xmlNode *ptr1 = xmlDocGetRootElement(doc);
- if (!ptr1)
- return ;
-
- for (ptr1 = ptr1->children; ptr1; ptr1 = ptr1->next)
- {
- if (ptr1->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) ptr1->name, "record"))
- {
- xmlNode *ptr2 = ptr1;
- for (ptr2 = ptr2->children; ptr2; ptr2 = ptr2->next)
- {
- if (ptr2->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) ptr2->name, "layer"))
- {
- std::string database;
- std::string target;
- std::string route;
- std::string solr;
- std::string query_encoding;
- xmlNode *ptr3 = ptr2;
- for (ptr3 = ptr3->children; ptr3; ptr3 = ptr3->next)
- {
- if (ptr3->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) ptr3->name, "id"))
- {
- database = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name, "zurl"))
- {
- target = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name, "sru"))
- {
- solr = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name,
- "queryEncoding"))
- {
- query_encoding = mp::xml::get_text(ptr3);
- }
- }
- if (solr.length() == 0 &&
- database.length() && target.length())
- {
- VirtualDB::Map vmap(
- mp::util::database_name_normalize(database),
- target, route);
- vmap.m_query_encoding = query_encoding;
- m_maps.push_back(vmap);
- }
- }
- }
- }
- }
-}
yf::VirtualDB::Set::Set(BackendPtr b, std::string setname)
: m_backend(b), m_setname(setname)
{
}
-yf::VirtualDB::Map::Map(std::string database,
+yf::VirtualDB::Map::Map(std::string database,
std::list<std::string> targets, std::string route)
- : m_dbpattern(database), m_targets(targets), m_route(route)
+ : m_dbpattern(database), m_targets(targets), m_route(route)
{
}
-yf::VirtualDB::Map::Map(std::string database,
+yf::VirtualDB::Map::Map(std::string database,
std::string target, std::string route)
- : m_dbpattern(database), m_route(route)
+ : m_dbpattern(database), m_route(route)
{
m_targets.push_back(target);
}
// consider each of the frontend databases..
std::list<std::string>::const_iterator db_it;
- for (db_it = b->m_frontend_databases.begin();
+ for (db_it = b->m_frontend_databases.begin();
db_it != b->m_frontend_databases.end(); db_it++)
{
// see which target it corresponds to.. (if any)
map_it++;
}
if (map_it != m_p->m_maps.end())
- {
+ {
std::list<std::string>::const_iterator t
= map_it->m_targets.begin();
while (t != map_it->m_targets.end())
t++;
}
}
-
+
}
db_it = b->m_frontend_databases.begin();
if (db_it != b->m_frontend_databases.end())
void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
{
- Z_PresentRequest *req = apdu_req->u.presentRequest;
+ yazpp_1::GDU ngdu(apdu_req);
+ Z_PresentRequest *req = ngdu.get()->u.z3950->u.presentRequest;
std::string resultSetId = req->resultSetId;
mp::odr odr;
Sets_it sets_it = m_sets.find(resultSetId);
if (sets_it == m_sets.end())
{
- Z_APDU *apdu =
+ Z_APDU *apdu =
odr.create_presentResponse(
apdu_req,
YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
}
Session *id =
new mp::Session(sets_it->second.m_backend->m_backend_session);
-
+
// sending present to backend
Package present_package(*id, package.origin());
present_package.copy_filter(package);
req->resultSetId = odr_strdup(odr, sets_it->second.m_setname.c_str());
-
- present_package.request() = yazpp_1::GDU(apdu_req);
+
+ present_package.request() = ngdu;
present_package.move(sets_it->second.m_backend->m_route);
{
package.response() = present_package.response();
package.session().close();
- return;
}
else
{
for (; map_it != m_backend_list.end(); map_it++)
{
BackendPtr b = *map_it;
-
+
Package relay_package(b->m_backend_session, package.origin());
relay_package.copy_filter(package);
void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
{
- Z_ScanRequest *req = apdu_req->u.scanRequest;
+ yazpp_1::GDU ngdu(apdu_req);
+ Z_ScanRequest *req = ngdu.get()->u.z3950->u.scanRequest;
std::string vhost;
mp::odr odr;
if (tmp->m_frontend_databases == databases)
break;
}
- if (map_it != m_backend_list.end())
+ if (map_it != m_backend_list.end())
b = *map_it;
if (!b) // no backend yet. Must create a new one
{
odr.create_scanResponse(
apdu_req, error_code, addinfo.c_str());
package.response() = apdu;
-
+
return;
}
}
&req->num_databaseNames,
&req->databaseNames);
}
- scan_package.request() = yazpp_1::GDU(apdu_req);
-
+
+ scan_package.request() = ngdu;
+
scan_package.move(b->m_route);
if (scan_package.session().is_closed())
}
-void yf::VirtualDB::add_map_db2targets(std::string db,
+void yf::VirtualDB::add_map_db2targets(std::string db,
std::list<std::string> targets,
std::string route)
{
}
-void yf::VirtualDB::add_map_db2target(std::string db,
+void yf::VirtualDB::add_map_db2target(std::string db,
std::string target,
std::string route)
FrontendPtr f = m_p->get_frontend(package);
Z_GDU *gdu = package.request().get();
-
+
if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
Z_APDU_initRequest && !f->m_is_virtual)
{
Z_InitRequest *req = gdu->u.z3950->u.initRequest;
-
+
std::list<std::string> vhosts;
mp::util::get_vhost_otherinfo(req->otherInfo, vhosts);
else
{
f->m_init_gdu = gdu;
-
+
mp::odr odr;
Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
Z_InitResponse *resp = apdu->u.initResponse;
-
+
int i;
static const int masks[] = {
Z_Options_search,
Z_Options_present,
Z_Options_namedResultSets,
Z_Options_scan,
- -1
+ -1
};
for (i = 0; masks[i] != -1; i++)
if (ODR_MASK_GET(req->options, masks[i]))
ODR_MASK_SET(resp->options, masks[i]);
-
+
static const int versions[] = {
Z_ProtocolVersion_1,
Z_ProtocolVersion_2,
ODR_MASK_SET(resp->protocolVersion, versions[i]);
else
break;
-
+
*resp->preferredMessageSize = *req->preferredMessageSize;
*resp->maximumRecordSize = *req->maximumRecordSize;
if (apdu->which == Z_APDU_initRequest)
{
mp::odr odr;
-
+
package.response() = odr.create_close(
apdu,
Z_Close_protocolError,
"double init");
-
+
package.session().close();
}
else if (apdu->which == Z_APDU_searchRequest)
if (f->relay_apdu(package, apdu) == 0)
{
mp::odr odr;
-
+
package.response() = odr.create_close(
apdu, Z_Close_finished, "virt_db");
-
+
package.session().close();
}
}
else
{
mp::odr odr;
-
+
package.response() = odr.create_close(
apdu, Z_Close_protocolError,
"unsupported APDU in filter_virt_db");
-
+
package.session().close();
}
}
m_p->release_frontend(package);
}
-void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only)
+void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only,
+ const char *path)
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
continue;
if (!strcmp((const char *) ptr->name, "pass-vhosts"))
{
- m_p->pass_vhosts = mp::xml::get_bool(ptr->children, false);
+ m_p->pass_vhosts = mp::xml::get_bool(ptr, false);
}
else if (!strcmp((const char *) ptr->name, "virtual"))
{
- std::string query_encoding;
std::string database;
std::list<std::string> targets;
xmlNode *v_node = ptr->children;
{
if (v_node->type != XML_ELEMENT_NODE)
continue;
-
+
if (mp::xml::is_element_mp(v_node, "database"))
database = mp::xml::get_text(v_node);
else if (mp::xml::is_element_mp(v_node, "target"))
targets.push_back(mp::xml::get_text(v_node));
- else if (mp::xml::is_element_mp(v_node, "query-encoding"))
- targets.push_back(mp::xml::get_text(v_node));
else
throw mp::filter::FilterException
- ("Bad element "
+ ("Bad element "
+ std::string((const char *) v_node->name)
+ " in virtual section"
);
VirtualDB::Map vmap(mp::util::database_name_normalize(database),
targets, route);
- vmap.m_query_encoding = query_encoding;
m_p->m_maps.push_back(vmap);
}
- else if (!strcmp((const char *) ptr->name, "torus"))
- {
- std::string url;
- const struct _xmlAttr *attr;
- for (attr = ptr->properties; attr; attr = attr->next)
- {
- if (!strcmp((const char *) attr->name, "url"))
- url = mp::xml::get_text(attr->children);
- else
- throw mp::filter::FilterException(
- "Bad attribute " + std::string((const char *)
- attr->name));
- }
- m_p->torus.read_searchables(url);
- m_p->refresh_torus();
- }
else
{
throw mp::filter::FilterException
- ("Bad element "
+ ("Bad element "
+ std::string((const char *) ptr->name)
+ " in virt_db filter");
}
projects / metaproxy-moved-to-github.git / blobdiff