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
Fixed comment
[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
bf6e02d
..
67b6750
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.37 2006-04-29 08:09:13 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.39 2006-05-15 13:22:02 adam Exp $
Copyright (c) 2005-2006, Index Data.
%LICENSE%
Copyright (c) 2005-2006, Index Data.
%LICENSE%
@@
-92,11
+92,8
@@
namespace metaproxy_1 {
FrontendPtr get_frontend(Package &package);
void release_frontend(Package &package);
private:
FrontendPtr get_frontend(Package &package);
void release_frontend(Package &package);
private:
- boost::mutex m_sessions_mutex;
std::map<std::string, Virt_db::Map>m_maps;
std::map<std::string, Virt_db::Map>m_maps;
-
typedef std::map<std::string,Virt_db::Set>::iterator Sets_it;
typedef std::map<std::string,Virt_db::Set>::iterator Sets_it;
-
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
std::map<mp::Session, FrontendPtr> m_clients;
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
std::map<mp::Session, FrontendPtr> m_clients;
@@
-104,8
+101,6
@@
namespace metaproxy_1 {
}
}
}
}
-using namespace mp;
-
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases(
std::list<std::string> databases)
{
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases(
std::list<std::string> databases)
{
@@
-134,7
+129,7
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
for (; db_it != databases.end(); db_it++)
{
std::map<std::string, Virt_db::Map>::iterator map_it;
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);
+ map_it = m_p->m_maps.find(mp::util::database_name_normalize(*db_it));
if (map_it == m_p->m_maps.end()) // database not found
{
error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
if (map_it == m_p->m_maps.end()) // database not found
{
error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
@@
-505,7
+500,6
@@
void yf::Virt_db::Frontend::fixup_npr(Package &p, BackendPtr b)
fixup_npr(gdu->u.z3950->u.searchResponse->records, database, odr);
p.response() = gdu;
}
fixup_npr(gdu->u.z3950->u.searchResponse->records, database, odr);
p.response() = gdu;
}
-
}
void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req)
}
void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req)
@@
-623,7
+617,8
@@
void yf::Virt_db::add_map_db2targets(std::string db,
std::list<std::string> targets,
std::string route)
{
std::list<std::string> targets,
std::string route)
{
- m_p->m_maps[db] = Virt_db::Map(targets, route);
+ m_p->m_maps[mp::util::database_name_normalize(db)]
+ = Virt_db::Map(targets, route);
}
}
@@
-634,7
+629,8
@@
void yf::Virt_db::add_map_db2target(std::string db,
std::list<std::string> targets;
targets.push_back(target);
std::list<std::string> targets;
targets.push_back(target);
- m_p->m_maps[db] = Virt_db::Map(targets, route);
+ m_p->m_maps[mp::util::database_name_normalize(db)]
+ = Virt_db::Map(targets, route);
}
void yf::Virt_db::process(Package &package) const
}
void yf::Virt_db::process(Package &package) const