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
Updates for new log filter facilities.
[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
69a3ee4
..
9b7e7e9
100644
(file)
--- a/
src/filter_virt_db.cpp
+++ b/
src/filter_virt_db.cpp
@@
-1,7
+1,7
@@
-/* $Id: filter_virt_db.cpp,v 1.38 2006-05-15 11:43:01 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.41 2006-06-10 14:29:12 adam Exp $
Copyright (c) 2005-2006, Index Data.
Copyright (c) 2005-2006, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
*/
#include "config.hpp"
@@
-161,7
+161,7
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
}
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
}
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
- std::list<std::string> databases, Package &package,
+ std::list<std::string> databases, mp::Package &package,
int &error_code, std::string &addinfo)
{
BackendPtr b = create_backend_from_databases(databases, error_code,
int &error_code, std::string &addinfo)
{
BackendPtr b = create_backend_from_databases(databases, error_code,
@@
-237,7
+237,7
@@
yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
return b;
}
return b;
}
-void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req)
+void yf::Virt_db::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
{
Z_SearchRequest *req = apdu_req->u.searchRequest;
std::string vhost;
{
Z_SearchRequest *req = apdu_req->u.searchRequest;
std::string vhost;
@@
-367,7
+367,7
@@
yf::Virt_db::Frontend::Frontend(Rep *rep)
m_is_virtual = false;
}
m_is_virtual = false;
}
-void yf::Virt_db::Frontend::close(Package &package)
+void yf::Virt_db::Frontend::close(mp::Package &package)
{
std::list<BackendPtr>::const_iterator b_it;
{
std::list<BackendPtr>::const_iterator b_it;
@@
-385,7
+385,7
@@
yf::Virt_db::Frontend::~Frontend()
{
}
{
}
-yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package)
+yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(mp::Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
{
boost::mutex::scoped_lock lock(m_mutex);
@@
-410,7
+410,7
@@
yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package)
return f;
}
return f;
}
-void yf::Virt_db::Rep::release_frontend(Package &package)
+void yf::Virt_db::Rep::release_frontend(mp::Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
std::map<mp::Session,yf::Virt_db::FrontendPtr>::iterator it;
{
boost::mutex::scoped_lock lock(m_mutex);
std::map<mp::Session,yf::Virt_db::FrontendPtr>::iterator it;
@@
-478,7
+478,7
@@
void yf::Virt_db::Frontend::fixup_npr(Z_Records *records, std::string database,
}
}
}
}
-void yf::Virt_db::Frontend::fixup_npr(Package &p, BackendPtr b)
+void yf::Virt_db::Frontend::fixup_npr(mp::Package &p, BackendPtr b)
{
Z_GDU *gdu = p.response().get();
mp::odr odr;
{
Z_GDU *gdu = p.response().get();
mp::odr odr;
@@
-500,10
+500,9
@@
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(mp::Package &package, Z_APDU *apdu_req)
{
Z_PresentRequest *req = apdu_req->u.presentRequest;
std::string resultSetId = req->resultSetId;
{
Z_PresentRequest *req = apdu_req->u.presentRequest;
std::string resultSetId = req->resultSetId;
@@
-548,7
+547,7
@@
void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req)
delete id;
}
delete id;
}
-void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req)
+void yf::Virt_db::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
{
Z_ScanRequest *req = apdu_req->u.scanRequest;
std::string vhost;
{
Z_ScanRequest *req = apdu_req->u.scanRequest;
std::string vhost;
@@
-634,7
+633,7
@@
void yf::Virt_db::add_map_db2target(std::string db,
= Virt_db::Map(targets, route);
}
= Virt_db::Map(targets, route);
}
-void yf::Virt_db::process(Package &package) const
+void yf::Virt_db::process(mp::Package &package) const
{
FrontendPtr f = m_p->get_frontend(package);
{
FrontendPtr f = m_p->get_frontend(package);