projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Filter backend_test does retrieval. Supports fancy USMARC records
[metaproxy-moved-to-github.git]
/
src
/
filter_virt_db.cpp
diff --git
a/src/filter_virt_db.cpp
b/src/filter_virt_db.cpp
index
d861701
..
4fc928c
100644
(file)
--- a/
src/filter_virt_db.cpp
+++ b/
src/filter_virt_db.cpp
@@
-1,4
+1,4
@@
-/* $Id: filter_virt_db.cpp,v 1.29 2006-01-17 13:34:51 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.31 2006-01-17 16:45:49 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
Copyright (c) 2005, Index Data.
%LICENSE%
@@
-70,6
+70,7
@@
namespace yp2 {
std::list<std::string> databases);
BackendPtr create_backend_from_databases(
std::list<std::string> 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,
std::string &failing_database);
BackendPtr init_backend(std::list<std::string> database,
@@
-111,7
+112,7
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases(
}
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
}
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
- std::list<std::string> databases, std::string &failing_database)
+ std::list<std::string> databases, int &error_code, std::string &addinfo)
{
BackendPtr b(new Backend);
std::list<std::string>::const_iterator db_it = databases.begin();
{
BackendPtr b(new Backend);
std::list<std::string>::const_iterator db_it = databases.begin();
@@
-120,6
+121,8
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
b->m_frontend_databases = databases;
b->m_named_result_sets = false;
b->m_frontend_databases = databases;
b->m_named_result_sets = false;
+ bool first_route = true;
+
std::map<std::string,bool> targets_dedup;
for (; db_it != databases.end(); db_it++)
{
std::map<std::string,bool> targets_dedup;
for (; db_it != databases.end(); db_it++)
{
@@
-127,7
+130,8
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
map_it = m_p->m_maps.find(*db_it);
if (map_it == m_p->m_maps.end()) // database not found
{
map_it = m_p->m_maps.find(*db_it);
if (map_it == m_p->m_maps.end()) // database not found
{
- failing_database = *db_it;
+ error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
+ addinfo = *db_it;
BackendPtr ptr;
return ptr;
}
BackendPtr ptr;
return ptr;
}
@@
-135,7
+139,17
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
map_it->second.m_targets.begin();
for (; t_it != map_it->second.m_targets.end(); t_it++)
targets_dedup[*t_it] = true;
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;
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++)
}
std::map<std::string,bool>::const_iterator tm_it = targets_dedup.begin();
for (; tm_it != targets_dedup.end(); tm_it++)
@@
-148,14
+162,10
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
std::list<std::string> databases, Package &package,
int &error_code, std::string &addinfo)
{
std::list<std::string> databases, Package &package,
int &error_code, std::string &addinfo)
{
- std::string failing_database;
- BackendPtr b = create_backend_from_databases(databases, failing_database);
+ BackendPtr b = create_backend_from_databases(databases, error_code,
+ addinfo);
if (!b)
if (!b)
- {
- error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
- addinfo = failing_database;
return b;
return b;
- }
Package init_package(b->m_backend_session, package.origin());
init_package.copy_filter(package);
Package init_package(b->m_backend_session, package.origin());
init_package.copy_filter(package);
@@
-185,24
+195,24
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
init_package.request() = init_apdu;
init_package.move(b->m_route); // sending init
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)
{
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;
}
{
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
{
}
else
{
@@
-211,6
+221,14
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
BackendPtr null;
return null;
}
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;
}
m_backend_list.push_back(b);
return b;
}
@@
-468,7
+486,7
@@
void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req)
present_package.request() = yazpp_1::GDU(apdu_req);
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())
{
if (present_package.session().is_closed())
{