-/* $Id: filter_virt_db.cpp,v 1.2 2005-10-24 21:01:53 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.4 2005-10-25 15:19:39 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
namespace yp2 {
namespace filter {
struct Virt_db_set {
- Virt_db_set(yp2::Session &id, Z_InternationalString *setname,
+ Virt_db_set(yp2::Session &id, std::string setname,
std::string vhost);
+ Virt_db_set();
~Virt_db_set();
yp2::Session m_session;
};
struct Virt_db_session {
Virt_db_session(yp2::Session &id, bool use_vhost);
+ Virt_db_session();
yp2::Session m_session;
bool m_use_vhost;
- std::list<Virt_db_set> m_sets;
+ std::map<std::string,Virt_db_set> m_sets;
};
struct Virt_db_map {
Virt_db_map(std::string vhost);
void release_session(Package &package);
void init(Package &package, Z_APDU *apdu, bool &move_later);
void search(Package &package, Z_APDU *apdu, bool &move_later);
+ void present(Package &package, Z_APDU *apdu, bool &move_later);
private:
boost::mutex m_sessions_mutex;
- std::list<Virt_db_session>m_sessions;
+ std::map<yp2::Session,Virt_db_session>m_sessions;
std::map<std::string, Virt_db_map>m_maps;
+
+ typedef std::map<yp2::Session,Virt_db_session>::iterator Ses_it;
+ typedef std::map<std::string,Virt_db_set>::iterator Sets_it;
};
}
}
-yf::Virt_db_set::Virt_db_set(yp2::Session &id, Z_InternationalString *setname,
+yf::Virt_db_set::Virt_db_set(yp2::Session &id, std::string setname,
std::string vhost)
: m_session(id), m_setname(setname), m_vhost(vhost)
{
}
+
+yf::Virt_db_set::Virt_db_set()
+{
+}
+
+
yf::Virt_db_set::~Virt_db_set()
{
}
{
}
+yf::Virt_db_session::Virt_db_session()
+ : m_use_vhost(false)
+{
+
+}
+
yf::Virt_db_session::Virt_db_session(yp2::Session &id,
bool use_vhost) :
m_session(id) , m_use_vhost(use_vhost)
void yf::Virt_db::Rep::release_session(Package &package)
{
- if (package.session().is_closed())
+ boost::mutex::scoped_lock lock(m_sessions_mutex);
+
+ Ses_it it = m_sessions.find(package.session());
+
+ if (it != m_sessions.end())
+ m_sessions.erase(it);
+}
+
+void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later){
+ Session *id = 0;
+ Z_PresentRequest *req = apdu->u.presentRequest;
{
boost::mutex::scoped_lock lock(m_sessions_mutex);
- std::list<Virt_db_session>::iterator it;
- for (it = m_sessions.begin(); it != m_sessions.end(); it++)
+ Ses_it it = m_sessions.find(package.session());
+ if (it == m_sessions.end())
{
- if (package.session() == (*it).m_session)
- break;
+ ODR odr = odr_createmem(ODR_ENCODE);
+
+ Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
+
+ *apdu->u.close->closeReason = Z_Close_protocolError;
+ apdu->u.close->diagnosticInformation =
+ odr_strdup(odr, "no session for present request");
+
+ package.response() = apdu;
+ package.session().close();
+ odr_destroy(odr);
+ assert(false);
+ return;
}
- if (it == m_sessions.end())
+ if (it->second.m_use_vhost)
+ {
+ move_later = true;
return;
- m_sessions.erase(it);
+ }
+ Sets_it sets_it = it->second.m_sets.find(req->resultSetId);
+ if (sets_it == it->second.m_sets.end())
+ {
+ ODR odr = odr_createmem(ODR_ENCODE);
+ Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentResponse);
+
+ Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records));
+ apdu->u.presentResponse->records = rec;
+ rec->which = Z_Records_NSD;
+ rec->u.nonSurrogateDiagnostic =
+ zget_DefaultDiagFormat(
+ odr,
+ YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+ req->resultSetId);
+ package.response() = apdu;
+ odr_destroy(odr);
+ return;
+ }
+ id = new yp2::Session(it->second.m_session);
}
+ ODR odr = odr_createmem(ODR_ENCODE);
+
+ // sending present to backend
+ Package present_package(*id, package.origin());
+ present_package.copy_filter(package);
+
+ req->resultSetId = odr_strdup(odr, "default");
+ present_package.request() = yazpp_1::GDU(apdu);
+
+ odr_destroy(odr);
+
+ present_package.move();
+
+ package.response() = present_package.response();
+ // must check for a closed present session..
+ delete id;
}
void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
Session *id = 0;
{
boost::mutex::scoped_lock lock(m_sessions_mutex);
-
- std::list<Virt_db_session>::iterator it;
- for (it = m_sessions.begin(); it != m_sessions.end(); it++)
- {
- if (package.session() == (*it).m_session)
- break;
- }
+
+ Ses_it it = m_sessions.find(package.session());
if (it == m_sessions.end())
{
- // error should be returned
- move_later = true;
+ ODR odr = odr_createmem(ODR_ENCODE);
+
+ Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
+
+ *apdu->u.close->closeReason = Z_Close_protocolError;
+
+ package.response() = apdu;
+ package.session().close();
+ odr_destroy(odr);
return;
}
- if ((*it).m_use_vhost)
+ if (it->second.m_use_vhost)
{
move_later = true;
return;
odr_destroy(odr);
return;
}
+ if (*req->replaceIndicator == 0)
+ {
+ Sets_it sets_it = it->second.m_sets.find(req->resultSetName);
+ if (sets_it != it->second.m_sets.end())
+ {
+ ODR odr = odr_createmem(ODR_ENCODE);
+ Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse);
+
+ Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records));
+ apdu->u.searchResponse->records = rec;
+ rec->which = Z_Records_NSD;
+ rec->u.nonSurrogateDiagnostic =
+ zget_DefaultDiagFormat(
+ odr,
+ YAZ_BIB1_RESULT_SET_EXISTS_AND_REPLACE_INDICATOR_OFF,
+ 0);
+ package.response() = apdu;
+
+ odr_destroy(odr);
+ return;
+ }
+ }
vhost = map_it->second.m_vhost;
id = new Session;
- (*it).m_sets.push_back(Virt_db_set(*id, req->resultSetName, vhost));
+
+ it->second.m_sets[req->resultSetName] =
+ Virt_db_set(*id, req->resultSetName, vhost);
}
const char *vhost_cstr = vhost.c_str();
if (true)
init_package.request() = init_apdu;
odr_destroy(odr);
- init_package.move(); // send init
+ init_package.move(); // sending init
if (init_package.session().is_closed())
{
}
// sending search to backend
Package search_package(*id, package.origin());
+
search_package.copy_filter(package);
const char *sep = strchr(vhost_cstr, '/');
ODR odr = odr_createmem(ODR_ENCODE);
if (sep)
req->databaseNames[0] = odr_strdup(odr, sep+1);
-
+
+ *req->replaceIndicator = 1;
+ req->resultSetName = odr_strdup(odr, "default");
search_package.request() = yazpp_1::GDU(apdu);
odr_destroy(odr);
search_package.move();
package.response() = search_package.response();
+ // must check for a closed search session..
+ delete id;
}
void yf::Virt_db::Rep::init(Package &package, Z_APDU *apdu, bool &move_later)
{
+ release_session(package);
boost::mutex::scoped_lock lock(m_sessions_mutex);
- std::list<Virt_db_session>::iterator it;
-
- for (it = m_sessions.begin(); it != m_sessions.end(); it++)
- {
- if (package.session() == (*it).m_session)
- break;
- }
- if (it != m_sessions.end())
- m_sessions.erase(it);
Z_InitRequest *req = apdu->u.initRequest;
int i;
static const int masks[] = {
- Z_Options_search, Z_Options_present, 0
+ Z_Options_search, Z_Options_present, Z_Options_namedResultSets, -1
};
- for (i = 0; masks[i]; i++)
+ 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,
+ Z_ProtocolVersion_3,
+ -1
+ };
+ for (i = 0; versions[i] != -1; i++)
+ if (ODR_MASK_GET(req->protocolVersion, versions[i]))
+ ODR_MASK_SET(resp->protocolVersion, versions[i]);
+ else
+ break;
+
package.response() = apdu;
odr_destroy(odr);
- m_sessions.push_back(Virt_db_session(package.session(), false));
+ m_sessions[package.session()] = Virt_db_session(package.session(), false);
}
else
{
- m_sessions.push_back(Virt_db_session(package.session(), true));
+ m_sessions[package.session()] = Virt_db_session(package.session(), true);
move_later = true;
}
}
{
m_p->search(package, apdu, move_later);
}
+ else if (apdu->which == Z_APDU_presentRequest)
+ {
+ m_p->present(package, apdu, move_later);
+ }
else
{
ODR odr = odr_createmem(ODR_ENCODE);
Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
*apdu->u.close->closeReason = Z_Close_protocolError;
+
+ apdu->u.close->diagnosticInformation =
+ odr_strdup(odr, "unsupported APDU in filter_virt_db");
package.response() = apdu;
package.session().close();
if (move_later)
package.move();
}
- m_p->release_session(package);
+ if (package.session().is_closed())
+ m_p->release_session(package);
}
projects / metaproxy-moved-to-github.git / blobdiff