-/* $Id: filter_virt_db.cpp,v 1.42 2006-06-28 22:46:58 adam Exp $
- Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+ Copyright (C) Index Data
- See the LICENSE file for details
- */
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
#include "config.hpp"
-#include "filter.hpp"
-#include "package.hpp"
+#include "filter_virt_db.hpp"
+#include <metaproxy/package.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/shared_ptr.hpp>
-#include "util.hpp"
-#include "filter_virt_db.hpp"
+#include <metaproxy/util.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>
namespace metaproxy_1 {
namespace filter {
- struct Virt_db::Set {
+ struct VirtualDB::Set {
Set(BackendPtr b, std::string setname);
Set();
~Set();
BackendPtr m_backend;
std::string m_setname;
};
- struct Virt_db::Map {
- Map(std::list<std::string> targets, std::string route);
+ struct VirtualDB::Map {
+ Map(std::string database, std::list<std::string> targets, std::string route);
+ Map(std::string database, std::string target, std::string route);
Map();
+ bool match(const std::string db) const;
+ std::string m_dbpattern;
std::list<std::string> m_targets;
std::string m_route;
};
- struct Virt_db::Backend {
+ struct VirtualDB::Backend {
mp::Session m_backend_session;
std::list<std::string> m_frontend_databases;
std::list<std::string> m_targets;
bool m_named_result_sets;
int m_number_of_sets;
};
- struct Virt_db::Frontend {
+ struct VirtualDB::Frontend {
Frontend(Rep *rep);
~Frontend();
mp::Session m_session;
bool m_in_use;
yazpp_1::GDU m_init_gdu;
std::list<BackendPtr> m_backend_list;
- std::map<std::string,Virt_db::Set> m_sets;
+ std::map<std::string,VirtualDB::Set> m_sets;
void search(Package &package, Z_APDU *apdu);
void present(Package &package, Z_APDU *apdu);
void scan(Package &package, Z_APDU *apdu);
+ int relay_apdu(Package &package, Z_APDU *apdu);
void close(Package &package);
- typedef std::map<std::string,Virt_db::Set>::iterator Sets_it;
+ typedef std::map<std::string,VirtualDB::Set>::iterator Sets_it;
- void fixup_npr(Package &p, BackendPtr b);
-
- void fixup_npr(Z_Records *records, std::string database,
- ODR odr);
+ void fixup_package(Package &p, BackendPtr b);
+ void fixup_npr_record(ODR odr, Z_NamePlusRecord *npr,
+ BackendPtr b);
+ void fixup_npr_records(ODR odr, Z_Records *records,
+ BackendPtr b);
BackendPtr lookup_backend_from_databases(
std::list<std::string> 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 Virt_db::Rep {
- friend class Virt_db;
+ };
+ class VirtualDB::Rep {
+ friend class VirtualDB;
friend struct Frontend;
-
+
FrontendPtr get_frontend(Package &package);
void release_frontend(Package &package);
+ void refresh_torus();
private:
- std::map<std::string, Virt_db::Map>m_maps;
- typedef std::map<std::string,Virt_db::Set>::iterator Sets_it;
+ std::list<VirtualDB::Map>m_maps;
+ typedef std::map<std::string,VirtualDB::Set>::iterator Sets_it;
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
std::map<mp::Session, FrontendPtr> m_clients;
+ bool pass_vhosts;
};
}
}
-yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases(
+yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::lookup_backend_from_databases(
std::list<std::string> databases)
{
std::list<BackendPtr>::const_iterator map_it;
return null;
}
-yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
+yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases(
std::list<std::string> databases, int &error_code, std::string &addinfo)
{
BackendPtr b(new Backend);
std::map<std::string,bool> targets_dedup;
for (; db_it != databases.end(); db_it++)
{
- std::map<std::string, Virt_db::Map>::iterator map_it;
- map_it = m_p->m_maps.find(mp::util::database_name_normalize(*db_it));
+ std::list<VirtualDB::Map>::const_iterator map_it;
+ map_it = m_p->m_maps.begin();
+ while (map_it != m_p->m_maps.end())
+ {
+ if (map_it->match(*db_it))
+ break;
+ map_it++;
+ }
+
if (map_it == m_p->m_maps.end()) // database not found
{
- error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
+ error_code = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
addinfo = *db_it;
BackendPtr ptr;
return ptr;
}
std::list<std::string>::const_iterator t_it =
- map_it->second.m_targets.begin();
- for (; t_it != map_it->second.m_targets.end(); t_it++)
- targets_dedup[*t_it] = true;
+ map_it->m_targets.begin();
+ for (; t_it != map_it->m_targets.end(); t_it++) {
+ if (!targets_dedup[*t_it])
+ {
+ targets_dedup[*t_it] = true;
+ b->m_targets.push_back(*t_it);
+ }
+ }
// see if we have a route conflict.
- if (!first_route && b->m_route != map_it->second.m_route)
+ 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;
}
- b->m_route = map_it->second.m_route;
+ b->m_route = map_it->m_route;
first_route = false;
}
- std::map<std::string,bool>::const_iterator tm_it = targets_dedup.begin();
- for (; tm_it != targets_dedup.end(); tm_it++)
- b->m_targets.push_back(tm_it->first);
-
return b;
}
-yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
+yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend(
std::list<std::string> databases, mp::Package &package,
int &error_code, std::string &addinfo)
{
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;
req->implementationVersion = org_init->implementationVersion;
+ *req->preferredMessageSize = *org_init->preferredMessageSize;
+ *req->maximumRecordSize = *org_init->maximumRecordSize;
ODR_MASK_SET(req->options, Z_Options_search);
ODR_MASK_SET(req->options, Z_Options_present);
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
- if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
- Z_APDU_initResponse)
+ error_code = 0;
+ if (gdu && gdu->which == Z_GDU_Z3950
+ && gdu->u.z3950->which == Z_APDU_initResponse)
{
Z_InitResponse *res = gdu->u.z3950->u.initResponse;
if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
{
b->m_named_result_sets = true;
}
- if (!*res->result)
+ if (*res->result && !init_package.session().is_closed())
{
- mp::util::get_init_diagnostics(res, error_code, addinfo);
- BackendPtr null;
- return null;
+ m_backend_list.push_back(b);
+ return b;
}
+ mp::util::get_init_diagnostics(res, error_code, addinfo);
}
- else
+ if (error_code == 0)
{
- error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
- // addinfo = database;
- BackendPtr null;
- return null;
- }
- if (init_package.session().is_closed())
+ 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())
{
- error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
- // addinfo = database;
- BackendPtr null;
- return null;
+ Package close_package(b->m_backend_session, package.origin());
+ close_package.copy_filter(package);
+ close_package.session().close();
+ close_package.move(b->m_route); // closing it
}
-
- m_backend_list.push_back(b);
- return b;
+ BackendPtr null;
+ return null;
}
-void yf::Virt_db::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
+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;
for (i = 0; i<req->num_databaseNames; i++)
databases.push_back(req->databaseNames[i]);
- BackendPtr b; // null for now
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 backend with a database match
- std::list<BackendPtr>::const_iterator map_it;
- map_it = m_backend_list.begin();
- for (; map_it != m_backend_list.end(); map_it++)
- {
- BackendPtr tmp = *map_it;
- if (tmp->m_frontend_databases == databases)
- break;
+ return;
}
- if (map_it != m_backend_list.end())
- b = *map_it;
+ sets_it->second.m_backend->m_number_of_sets--;
}
- else
+ // pick up any existing database with named result sets ..
+ // or one which has no result sets.. yet.
+ BackendPtr b; // null for now
+ std::list<BackendPtr>::const_iterator map_it;
+ map_it = m_backend_list.begin();
+ for (; map_it != m_backend_list.end(); map_it++)
{
- // new result set.
-
- // pick up any existing database with named result sets ..
- // or one which has no result sets.. yet.
- std::list<BackendPtr>::const_iterator map_it;
- map_it = m_backend_list.begin();
- for (; map_it != m_backend_list.end(); map_it++)
+ BackendPtr tmp = *map_it;
+ if (tmp->m_frontend_databases == databases &&
+ (tmp->m_named_result_sets ||
+ tmp->m_number_of_sets == 0))
{
- BackendPtr tmp = *map_it;
- if (tmp->m_frontend_databases == databases &&
- (tmp->m_named_result_sets ||
- tmp->m_number_of_sets == 0))
- break;
- }
- if (map_it != m_backend_list.end())
b = *map_it;
+ break;
+ }
}
if (!b) // no backend yet. Must create a new one
{
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())
package.session().close();
return;
}
- b->m_number_of_sets++;
- m_sets[resultSetId] = Virt_db::Set(b, backend_setname);
- fixup_npr(search_package, b);
+ Z_GDU *gdu = search_package.response().get();
+ if (gdu && gdu->which == Z_GDU_Z3950
+ && gdu->u.z3950->which == Z_APDU_searchResponse)
+ {
+ Z_SearchResponse *b_resp = gdu->u.z3950->u.searchResponse;
+ Z_Records *z_records = b_resp->records;
+ if (!z_records || (z_records && z_records->which == Z_Records_DBOSD))
+ {
+ b->m_number_of_sets++;
+ m_sets[resultSetId] = VirtualDB::Set(b, backend_setname);
+ fixup_package(search_package, b);
+ }
+ }
package.response() = search_package.response();
}
-yf::Virt_db::Frontend::Frontend(Rep *rep)
+yf::VirtualDB::Frontend::Frontend(Rep *rep)
{
m_p = rep;
m_is_virtual = false;
}
-void yf::Virt_db::Frontend::close(mp::Package &package)
+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();
m_backend_list.clear();
}
-yf::Virt_db::Frontend::~Frontend()
+yf::VirtualDB::Frontend::~Frontend()
{
}
-yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(mp::Package &package)
+yf::VirtualDB::FrontendPtr yf::VirtualDB::Rep::get_frontend(mp::Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
- std::map<mp::Session,yf::Virt_db::FrontendPtr>::iterator it;
-
+ 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;
return f;
}
-void yf::Virt_db::Rep::release_frontend(mp::Package &package)
+void yf::VirtualDB::Rep::release_frontend(mp::Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
- std::map<mp::Session,yf::Virt_db::FrontendPtr>::iterator it;
-
+ std::map<mp::Session,yf::VirtualDB::FrontendPtr>::iterator it;
+
it = m_clients.find(package.session());
if (it != m_clients.end())
{
}
}
-yf::Virt_db::Set::Set(BackendPtr b, std::string setname)
+
+yf::VirtualDB::Set::Set(BackendPtr b, std::string setname)
: m_backend(b), m_setname(setname)
{
}
-yf::Virt_db::Set::Set()
+yf::VirtualDB::Set::Set()
{
}
-yf::Virt_db::Set::~Set()
+yf::VirtualDB::Set::~Set()
+{
+}
+
+yf::VirtualDB::Map::Map(std::string database,
+ std::list<std::string> targets, std::string route)
+ : m_dbpattern(database), m_targets(targets), m_route(route)
{
}
-yf::Virt_db::Map::Map(std::list<std::string> targets, std::string route)
- : m_targets(targets), m_route(route)
+yf::VirtualDB::Map::Map(std::string database,
+ std::string target, std::string route)
+ : m_dbpattern(database), m_route(route)
{
+ m_targets.push_back(target);
}
-yf::Virt_db::Map::Map()
+
+yf::VirtualDB::Map::Map()
{
}
-yf::Virt_db::Virt_db() : m_p(new Virt_db::Rep)
+bool yf::VirtualDB::Map::match(const std::string db) const
{
+ std::string norm_db = mp::util::database_name_normalize(db);
+ if (yaz_match_glob(m_dbpattern.c_str(), norm_db.c_str()))
+ return true;
+ return false;
}
-yf::Virt_db::~Virt_db() {
+yf::VirtualDB::VirtualDB() : m_p(new VirtualDB::Rep)
+{
+ m_p->pass_vhosts = false;
}
+yf::VirtualDB::~VirtualDB() {
+}
-void yf::Virt_db::Frontend::fixup_npr(Z_Records *records, std::string database,
- ODR odr)
+void yf::VirtualDB::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr,
+ BackendPtr b)
+{
+ if (npr->databaseName)
+ {
+ std::string b_database = std::string(npr->databaseName);
+
+ // consider each of the frontend databases..
+ std::list<std::string>::const_iterator db_it;
+ 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)
+ std::list<VirtualDB::Map>::const_iterator map_it =
+ m_p->m_maps.begin();
+ while (map_it != m_p->m_maps.end())
+ {
+ if (map_it->match(*db_it))
+ break;
+ 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())
+ {
+ if (*t == b_database)
+ {
+ npr->databaseName = odr_strdup(odr, (*db_it).c_str());
+ return;
+ }
+ t++;
+ }
+ }
+
+ }
+ db_it = b->m_frontend_databases.begin();
+ if (db_it != b->m_frontend_databases.end())
+ {
+ std::string database = *db_it;
+ npr->databaseName = odr_strdup(odr, database.c_str());
+ }
+ }
+}
+
+void yf::VirtualDB::Frontend::fixup_npr_records(ODR odr, Z_Records *records,
+ BackendPtr b)
{
if (records && records->which == Z_Records_DBOSD)
{
int i;
for (i = 0; i < nprlist->num_records; i++)
{
- Z_NamePlusRecord *npr = nprlist->records[i];
- npr->databaseName = odr_strdup(odr, database.c_str());
+ fixup_npr_record(odr, nprlist->records[i], b);
}
}
}
-void yf::Virt_db::Frontend::fixup_npr(mp::Package &p, BackendPtr b)
+void yf::VirtualDB::Frontend::fixup_package(mp::Package &p, BackendPtr b)
{
Z_GDU *gdu = p.response().get();
mp::odr odr;
- std::string database = "dummy";
- std::list<std::string>::const_iterator db_it =
- b->m_frontend_databases.begin();
- if (db_it != b->m_frontend_databases.end())
- database = *db_it;
- if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
- Z_APDU_presentResponse)
+ if (gdu && gdu->which == Z_GDU_Z3950)
{
- fixup_npr(gdu->u.z3950->u.presentResponse->records, database, odr);
- p.response() = gdu;
- }
- if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
- Z_APDU_searchResponse)
- {
- fixup_npr(gdu->u.z3950->u.searchResponse->records, database, odr);
- p.response() = gdu;
+ Z_APDU *apdu = gdu->u.z3950;
+ if (apdu->which == Z_APDU_presentResponse)
+ {
+ fixup_npr_records(odr, apdu->u.presentResponse->records, b);
+ p.response() = gdu;
+ }
+ else if (apdu->which == Z_APDU_searchResponse)
+ {
+ fixup_npr_records(odr, apdu->u.searchResponse->records, b);
+ p.response() = gdu;
+ }
}
}
-void yf::Virt_db::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
+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);
- fixup_npr(present_package, sets_it->second.m_backend);
+ fixup_package(present_package, sets_it->second.m_backend);
if (present_package.session().is_closed())
{
package.response() = present_package.response();
package.session().close();
- return;
}
else
{
delete id;
}
-void yf::Virt_db::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
+int yf::VirtualDB::Frontend::relay_apdu(mp::Package &package, Z_APDU *apdu_req)
+{
+ int no = 0;
+ std::list<BackendPtr>::const_iterator map_it;
+ map_it = m_backend_list.begin();
+ 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);
+
+ relay_package.request() = yazpp_1::GDU(apdu_req);
+
+ relay_package.move(b->m_route);
+ package.response() = relay_package.response();
+ no++;
+ }
+ return no;
+}
+
+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::Virt_db::add_map_db2targets(std::string db,
- std::list<std::string> targets,
- std::string route)
+void yf::VirtualDB::add_map_db2targets(std::string db,
+ std::list<std::string> targets,
+ std::string route)
{
- m_p->m_maps[mp::util::database_name_normalize(db)]
- = Virt_db::Map(targets, route);
+ m_p->m_maps.push_back(
+ VirtualDB::Map(mp::util::database_name_normalize(db), targets, route));
}
-void yf::Virt_db::add_map_db2target(std::string db,
- std::string target,
- std::string route)
-{
- std::list<std::string> targets;
- targets.push_back(target);
+void yf::VirtualDB::add_map_db2target(std::string db,
+ std::string target,
+ std::string route)
- m_p->m_maps[mp::util::database_name_normalize(db)]
- = Virt_db::Map(targets, route);
+{
+ m_p->m_maps.push_back(
+ VirtualDB::Map(mp::util::database_name_normalize(db), target, route));
}
-void yf::Virt_db::process(mp::Package &package) const
+void yf::VirtualDB::process(mp::Package &package) const
{
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, false, vhosts);
- if (vhosts.size() == 0)
+ mp::util::get_vhost_otherinfo(req->otherInfo, vhosts);
+
+ if (vhosts.size() > 0 && m_p->pass_vhosts)
+ {
+ package.move();
+ }
+ 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;
+
package.response() = apdu;
f->m_is_virtual = true;
}
- else
- package.move();
}
else if (!f->m_is_virtual)
package.move();
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)
}
else if (apdu->which == Z_APDU_close)
{
- package.session().close();
+ 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::Virt_db::configure(const xmlNode * ptr)
+void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only,
+ const char *path)
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
if (ptr->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp((const char *) ptr->name, "virtual"))
+ if (!strcmp((const char *) ptr->name, "pass-vhosts"))
+ {
+ m_p->pass_vhosts = mp::xml::get_bool(ptr, false);
+ }
+ else if (!strcmp((const char *) ptr->name, "virtual"))
{
std::string database;
std::list<std::string> targets;
{
if (v_node->type != XML_ELEMENT_NODE)
continue;
-
- if (mp::xml::is_element_yp2(v_node, "database"))
+
+ if (mp::xml::is_element_mp(v_node, "database"))
database = mp::xml::get_text(v_node);
- else if (mp::xml::is_element_yp2(v_node, "target"))
+ else if (mp::xml::is_element_mp(v_node, "target"))
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"
);
}
std::string route = mp::xml::get_route(ptr);
- add_map_db2targets(database, targets, route);
+
+ VirtualDB::Map vmap(mp::util::database_name_normalize(database),
+ targets, route);
+ m_p->m_maps.push_back(vmap);
}
else
{
throw mp::filter::FilterException
- ("Bad element "
+ ("Bad element "
+ std::string((const char *) ptr->name)
+ " in virt_db filter");
}
static mp::filter::Base* filter_creator()
{
- return new mp::filter::Virt_db;
+ return new mp::filter::VirtualDB;
}
extern "C" {
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+
projects / metaproxy-moved-to-github.git / blobdiff