-/* $Id: filter_virt_db.cpp,v 1.3 2005-10-25 11:48:30 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.13 2005-11-03 14:45:16 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
#include <boost/thread/mutex.hpp>
+#include "util.hpp"
#include "filter_virt_db.hpp"
#include <yaz/zgdu.h>
namespace filter {
struct Virt_db_set {
Virt_db_set(yp2::Session &id, std::string setname,
- std::string vhost);
+ std::string vhost, bool named_result_sets);
Virt_db_set();
~Virt_db_set();
- yp2::Session m_session;
- std::string m_setname;
+ yp2::Session m_backend_session;
+ std::string m_backend_setname;
std::string m_vhost;
+ bool m_named_result_sets;
};
struct Virt_db_session {
Virt_db_session(yp2::Session &id, bool use_vhost);
}
}
+using namespace yp2;
+
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)
+ std::string vhost, bool named_result_sets)
+ : m_backend_session(id), m_backend_setname(setname), m_vhost(vhost),
+ m_named_result_sets(named_result_sets)
{
}
}
-yf::Virt_db::Virt_db() {
- m_p = new Virt_db::Rep;
+yf::Virt_db::Virt_db() : m_p(new Virt_db::Rep)
+{
}
yf::Virt_db::~Virt_db() {
- delete m_p;
}
void yf::Virt_db::Rep::release_session(Package &package)
{
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);
+ m_sessions.erase(package.session());
}
void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later){
Session *id = 0;
Z_PresentRequest *req = apdu->u.presentRequest;
+ std::string resultSetId = req->resultSetId;
+ yp2::odr odr;
{
boost::mutex::scoped_lock lock(m_sessions_mutex);
Ses_it it = m_sessions.find(package.session());
if (it == m_sessions.end())
{
- 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.response() = odr.create_close(
+ Z_Close_protocolError,
+ "no session for present request");
package.session().close();
- odr_destroy(odr);
return;
}
if (it->second.m_use_vhost)
move_later = true;
return;
}
- Sets_it sets_it = it->second.m_sets.find(req->resultSetId);
+ Sets_it sets_it = it->second.m_sets.find(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));
zget_DefaultDiagFormat(
odr,
YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
- req->resultSetId);
+ resultSetId.c_str());
package.response() = apdu;
- odr_destroy(odr);
+
return;
}
- id = new yp2::Session(it->second.m_session);
+ id = new yp2::Session(sets_it->second.m_backend_session);
}
- ODR odr = odr_createmem(ODR_ENCODE);
// sending present to backend
Package present_package(*id, package.origin());
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..
+ if (present_package.session().is_closed())
+ {
+ 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_RESULT_SET_NO_LONGER_EXISTS_UNILATERALLY_DELETED_BY_,
+ resultSetId.c_str());
+ package.response() = apdu;
+
+ boost::mutex::scoped_lock lock(m_sessions_mutex);
+ Ses_it it = m_sessions.find(package.session());
+ if (it != m_sessions.end())
+ it->second.m_sets.erase(resultSetId);
+ }
+ else
+ {
+ package.response() = present_package.response();
+ }
delete id;
}
Z_SearchRequest *req = apdu->u.searchRequest;
std::string vhost;
std::string database;
- Session *id = 0;
+ std::string resultSetId = req->resultSetName;
+ bool support_named_result_sets = false; // whether backend supports it
+ yp2::odr odr;
{
boost::mutex::scoped_lock lock(m_sessions_mutex);
Ses_it it = m_sessions.find(package.session());
if (it == m_sessions.end())
{
- 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.response() = odr.create_close(
+ Z_Close_protocolError,
+ "no session for search request");
package.session().close();
- odr_destroy(odr);
+
return;
}
if (it->second.m_use_vhost)
}
if (req->num_databaseNames != 1)
{ // exactly one database must be specified
- 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));
odr, YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0);
package.response() = apdu;
- odr_destroy(odr);
return;
}
database = req->databaseNames[0];
map_it = m_maps.find(database);
if (map_it == m_maps.end())
{ // no map for database: return diagnostic
- 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));
rec->which = Z_Records_NSD;
rec->u.nonSurrogateDiagnostic =
zget_DefaultDiagFormat(
- odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str());
+ odr, YAZ_BIB1_DATABASE_DOES_NOT_EXIST, database.c_str());
package.response() = apdu;
- 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));
0);
package.response() = apdu;
- odr_destroy(odr);
return;
}
}
+ it->second.m_sets.erase(req->resultSetName);
vhost = map_it->second.m_vhost;
- id = new Session;
-
- it->second.m_sets[req->resultSetName] =
- Virt_db_set(*id, req->resultSetName, vhost);
}
+ // we might look for an existing session with same vhost
+ Session id;
const char *vhost_cstr = vhost.c_str();
if (true)
{ // sending init to backend
- Package init_package(*id, package.origin());
+ Package init_package(id, package.origin());
init_package.copy_filter(package);
- ODR odr = odr_createmem(ODR_ENCODE);
Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest);
yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr,
VAL_PROXY, 1, vhost_cstr);
init_package.request() = init_apdu;
- odr_destroy(odr);
init_package.move(); // sending init
if (init_package.session().is_closed())
{
- 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_DATABASE_UNAVAILABLE, database.c_str());
+ package.response() = apdu;
+ }
+ 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))
+ support_named_result_sets = true;
+ }
+ else
+ {
Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse);
Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records));
odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str());
package.response() = apdu;
- odr_destroy(odr);
return;
}
}
// sending search to backend
- Package search_package(*id, package.origin());
+ 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");
+
+ std::string backend_resultSetId = "default";
+ req->resultSetName = odr_strdup(odr, backend_resultSetId.c_str());
search_package.request() = yazpp_1::GDU(apdu);
- odr_destroy(odr);
-
search_package.move();
+ if (search_package.session().is_closed())
+ {
+ 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_DATABASE_UNAVAILABLE, database.c_str());
+ package.response() = apdu;
+
+ return;
+ }
package.response() = search_package.response();
- // must check for a closed search session..
- delete id;
+
+ boost::mutex::scoped_lock lock(m_sessions_mutex);
+ Ses_it it = m_sessions.find(package.session());
+ if (it != m_sessions.end())
+ it->second.m_sets[resultSetId] =
+ Virt_db_set(id, backend_resultSetId, vhost,
+ support_named_result_sets);
}
void yf::Virt_db::Rep::init(Package &package, Z_APDU *apdu, bool &move_later)
yaz_oi_get_string_oidval(&req->otherInfo, VAL_PROXY, 1, 0);
if (!vhost)
{
- ODR odr = odr_createmem(ODR_ENCODE);
-
+ yp2::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
Z_InitResponse *resp = apdu->u.initResponse;
int i;
static const int masks[] = {
- Z_Options_search, Z_Options_present, Z_Options_namedResultSets, 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[package.session()] = Virt_db_session(package.session(), false);
}
else
}
else
{
- ODR odr = odr_createmem(ODR_ENCODE);
-
- Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
+ yp2::odr odr;
- *apdu->u.close->closeReason = Z_Close_protocolError;
-
- package.response() = apdu;
+ package.response() = odr.create_close(
+ Z_Close_protocolError,
+ "unsupported APDU in filter_virt_db");
+
package.session().close();
- odr_destroy(odr);
}
if (move_later)
package.move();
projects / metaproxy-moved-to-github.git / blobdiff