-/* $Id: filter_virt_db.cpp,v 1.24 2006-01-14 08:38:57 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.31 2006-01-17 16:45:49 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
std::string m_setname;
};
struct Virt_db::Map {
- Map(std::string vhost, std::string route);
+ Map(std::list<std::string> targets, std::string route);
Map();
- std::string m_vhost;
+ std::list<std::string> m_targets;
std::string m_route;
};
struct Virt_db::Backend {
yp2::Session m_backend_session;
- std::string m_backend_database;
- std::string m_frontend_database;
- std::string m_vhost;
+ std::list<std::string> m_frontend_databases;
+ std::list<std::string> m_targets;
std::string m_route;
bool m_named_result_sets;
int m_number_of_sets;
void close(Package &package);
typedef std::map<std::string,Virt_db::Set>::iterator Sets_it;
- BackendPtr lookup_backend_from_database(std::string database);
- BackendPtr create_backend_from_database(std::string database);
+ 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::string database, Package &package,
+ BackendPtr init_backend(std::list<std::string> database,
+ Package &package,
int &error_code, std::string &addinfo);
Rep *m_p;
};
using namespace yp2;
-yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_database(
- std::string database)
+yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases(
+ std::list<std::string> databases)
{
std::list<BackendPtr>::const_iterator map_it;
map_it = m_backend_list.begin();
for (; map_it != m_backend_list.end(); map_it++)
- if ((*map_it)->m_frontend_database == database)
+ if ((*map_it)->m_frontend_databases == databases)
return *map_it;
BackendPtr null;
return null;
}
-yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_database(
- std::string database)
+yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
+ std::list<std::string> databases, int &error_code, std::string &addinfo)
{
- std::map<std::string, Virt_db::Map>::iterator map_it;
- map_it = m_p->m_maps.find(database);
- if (map_it == m_p->m_maps.end())
- {
- BackendPtr ptr;
- return ptr;
- }
BackendPtr b(new Backend);
+ std::list<std::string>::const_iterator db_it = databases.begin();
b->m_number_of_sets = 0;
- b->m_frontend_database = database;
+ b->m_frontend_databases = databases;
b->m_named_result_sets = false;
- b->m_route = map_it->second.m_route;
- b->m_vhost = map_it->second.m_vhost;
- const char *sep = strchr(b->m_vhost.c_str(), '/');
- std::string backend_database;
- if (sep)
- b->m_backend_database = std::string(sep+1);
- else
- b->m_backend_database = database;
+
+ bool first_route = true;
+
+ 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(*db_it);
+ if (map_it == m_p->m_maps.end()) // database not found
+ {
+ error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
+ 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;
+
+ // see if we have a route conflict.
+ if (!first_route && b->m_route != map_it->second.m_route)
+ {
+ // we have a conflict..
+ error_code = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
+ BackendPtr ptr;
+ return ptr;
+ }
+ b->m_route = map_it->second.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(
- std::string database, Package &package,
+ std::list<std::string> databases, Package &package,
int &error_code, std::string &addinfo)
{
- BackendPtr b = create_backend_from_database(database);
+ BackendPtr b = create_backend_from_databases(databases, error_code,
+ addinfo);
if (!b)
- {
- error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
- addinfo = database;
return b;
- }
Package init_package(b->m_backend_session, package.origin());
init_package.copy_filter(package);
yp2::odr odr;
Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest);
-
- yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr,
- VAL_PROXY, 1, b->m_vhost.c_str());
-
+
+ std::list<std::string>::const_iterator t_it = b->m_targets.begin();
+ int cat = 1;
+ for (; t_it != b->m_targets.end(); t_it++, cat++)
+ {
+ yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr,
+ VAL_PROXY, cat, t_it->c_str());
+ }
+
Z_InitRequest *req = init_apdu->u.initRequest;
ODR_MASK_SET(req->options, Z_Options_search);
init_package.request() = init_apdu;
init_package.move(b->m_route); // sending init
-
- if (init_package.session().is_closed())
- {
- error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
- addinfo = database;
- BackendPtr null;
- return null;
- }
+
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)
{
- if (ODR_MASK_GET(gdu->u.z3950->u.initResponse->options,
- Z_Options_namedResultSets))
+ Z_InitResponse *res = gdu->u.z3950->u.initResponse;
+ if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
{
b->m_named_result_sets = true;
}
+ std::cout << "GOT INIT res=" << *res->result << "\n";
+ if (!*res->result)
+ {
+ yp2::util::get_init_diagnostics(res, error_code, addinfo);
+ BackendPtr null;
+ return null;
+ }
}
else
{
error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
- addinfo = database;
+ // addinfo = database;
BackendPtr null;
return null;
}
+ if (init_package.session().is_closed())
+ {
+ error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
+ // addinfo = database;
+ BackendPtr null;
+ return null;
+ }
+
m_backend_list.push_back(b);
return b;
}
std::string resultSetId = req->resultSetName;
yp2::odr odr;
- // only one datatabase for now
- if (req->num_databaseNames != 1)
- { // exactly one database must be specified
- Z_APDU *apdu =
- odr.create_searchResponse(
- apdu_req, YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0);
- package.response() = apdu;
-
- return;
- }
- std::string database = std::string(req->databaseNames[0]);
+ std::list<std::string> databases;
+ int i;
+ 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);
for (; map_it != m_backend_list.end(); map_it++)
{
BackendPtr tmp = *map_it;
- if (tmp->m_frontend_database == database)
+ if (tmp->m_frontend_databases == databases)
break;
}
if (map_it != m_backend_list.end())
for (; map_it != m_backend_list.end(); map_it++)
{
BackendPtr tmp = *map_it;
- if (tmp->m_frontend_database == database &&
+ if (tmp->m_frontend_databases == databases &&
(tmp->m_named_result_sets ||
tmp->m_number_of_sets == 0))
break;
{
int error_code;
std::string addinfo;
- b = init_backend(database, package, error_code, addinfo);
+ b = init_backend(databases, package, error_code, addinfo);
if (!b)
{
// did not get a backend (unavailable somehow?)
req->resultSetName = odr_strdup(odr, backend_setname.c_str());
}
- const char *backend_database = b->m_backend_database.c_str();
- req->databaseNames[0] = odr_strdup(odr, backend_database);
+ // pick first targets spec and move the databases from it ..
+ std::list<std::string>::const_iterator t_it = b->m_targets.begin();
+ if (t_it != b->m_targets.end())
+ {
+ if (!yp2::util::set_databases_from_zurl(odr, *t_it,
+ &req->num_databaseNames,
+ &req->databaseNames));
+ }
*req->replaceIndicator = 1;
if (search_package.session().is_closed())
{
- Z_APDU *apdu =
- odr.create_searchResponse(
- apdu_req,
- YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str());
- package.response() = apdu;
+ package.response() = search_package.response();
+ package.session().close();
return;
}
package.response() = search_package.response();
{
}
-yf::Virt_db::Map::Map(std::string vhost, std::string route)
- : m_vhost(vhost), m_route(route)
+yf::Virt_db::Map::Map(std::list<std::string> targets, std::string route)
+ : m_targets(targets), m_route(route)
{
}
YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
resultSetId.c_str());
package.response() = apdu;
-
return;
}
Session *id =
// 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());
- req->resultSetId = odr_strdup(odr, "default");
present_package.request() = yazpp_1::GDU(apdu_req);
- present_package.move();
+ present_package.move(sets_it->second.m_backend->m_route);
if (present_package.session().is_closed())
{
- Z_APDU *apdu =
- odr.create_presentResponse(
- apdu_req,
- YAZ_BIB1_RESULT_SET_NO_LONGER_EXISTS_UNILATERALLY_DELETED_BY_,
- resultSetId.c_str());
- package.response() = apdu;
- m_sets.erase(resultSetId);
+ package.response() = present_package.response();
+ package.session().close();
+ return;
}
else
{
std::string vhost;
yp2::odr odr;
- // only one datatabase for now
- if (req->num_databaseNames != 1)
- { // exactly one database must be specified
- Z_APDU *apdu =
- odr.create_scanResponse(
- apdu_req,
- YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0);
- package.response() = apdu;
- return;
- }
- std::string database = std::string(req->databaseNames[0]);
-
+ std::list<std::string> databases;
+ int i;
+ for (i = 0; i<req->num_databaseNames; i++)
+ databases.push_back(req->databaseNames[i]);
+
BackendPtr b;
// pick up any existing backend with a database match
std::list<BackendPtr>::const_iterator map_it;
for (; map_it != m_backend_list.end(); map_it++)
{
BackendPtr tmp = *map_it;
- if (tmp->m_frontend_database == database)
+ if (tmp->m_frontend_databases == databases)
break;
}
if (map_it != m_backend_list.end())
{
int error_code;
std::string addinfo;
- b = init_backend(database, package, error_code, addinfo);
+ b = init_backend(databases, package, error_code, addinfo);
if (!b)
{
// did not get a backend (unavailable somehow?)
scan_package.copy_filter(package);
- const char *backend_database = b->m_backend_database.c_str();
- req->databaseNames[0] = odr_strdup(odr, backend_database);
-
+ // pick first targets spec and move the databases from it ..
+ std::list<std::string>::const_iterator t_it = b->m_targets.begin();
+ if (t_it != b->m_targets.end())
+ {
+ if (!yp2::util::set_databases_from_zurl(odr, *t_it,
+ &req->num_databaseNames,
+ &req->databaseNames));
+ }
scan_package.request() = yazpp_1::GDU(apdu_req);
scan_package.move(b->m_route);
if (scan_package.session().is_closed())
{
- Z_APDU *apdu =
- odr.create_scanResponse(
- apdu_req, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str());
- package.response() = apdu;
+ package.response() = scan_package.response();
+ package.session().close();
return;
}
package.response() = scan_package.response();
}
-void yf::Virt_db::add_map_db2vhost(std::string db, std::string vhost,
- std::string route)
+void yf::Virt_db::add_map_db2targets(std::string db,
+ std::list<std::string> targets,
+ std::string route)
+{
+ m_p->m_maps[db] = Virt_db::Map(targets, route);
+}
+
+
+void yf::Virt_db::add_map_db2target(std::string db,
+ std::string target,
+ std::string route)
{
- m_p->m_maps[db] = Virt_db::Map(vhost, route);
+ std::list<std::string> targets;
+ targets.push_back(target);
+
+ m_p->m_maps[db] = Virt_db::Map(targets, route);
}
void yf::Virt_db::process(Package &package) const
if (!strcmp((const char *) ptr->name, "virtual"))
{
std::string database;
- std::string target;
+ std::list<std::string> targets;
xmlNode *v_node = ptr->children;
for (; v_node; v_node = v_node->next)
{
if (yp2::xml::is_element_yp2(v_node, "database"))
database = yp2::xml::get_text(v_node);
else if (yp2::xml::is_element_yp2(v_node, "target"))
- target = yp2::xml::get_text(v_node);
+ targets.push_back(yp2::xml::get_text(v_node));
else
throw yp2::filter::FilterException
("Bad element "
);
}
std::string route = yp2::xml::get_route(ptr);
- add_map_db2vhost(database, target, route);
- std::cout << "Add " << database << "->" << target
- << "," << route << "\n";
+ add_map_db2targets(database, targets, route);
}
else
{
projects / metaproxy-moved-to-github.git / blobdiff