X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=2ea70c417021ef076d7be7e71d41778571344fe8;hb=8a595f41f5eaaa7ef846a697cfe4466ea57d224a;hp=c12fc193f08233884fe390cc0ea76b6919e7519d;hpb=4235d0c6a59fc0d9431fe611ee8acea471c4e296;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index c12fc19..2ea70c4 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_virt_db.cpp,v 1.5 2005-10-25 16:00:58 adam Exp $ +/* $Id: filter_virt_db.cpp,v 1.10 2005-10-29 15:54:29 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -29,13 +29,14 @@ namespace yp2 { 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); @@ -68,8 +69,9 @@ 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) { } @@ -105,27 +107,24 @@ yf::Virt_db_session::Virt_db_session(yp2::Session &id, } -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; { boost::mutex::scoped_lock lock(m_sessions_mutex); @@ -151,7 +150,7 @@ void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later) 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); @@ -164,12 +163,12 @@ void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later) 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(sets_it->second.m_session); + id = new yp2::Session(sets_it->second.m_backend_session); } ODR odr = odr_createmem(ODR_ENCODE); @@ -179,13 +178,37 @@ void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later) 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()) + { + 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_RESULT_SET_NO_LONGER_EXISTS_UNILATERALLY_DELETED_BY_, + resultSetId.c_str()); + package.response() = apdu; + + odr_destroy(odr); + + 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; } @@ -194,7 +217,8 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later) 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 { boost::mutex::scoped_lock lock(m_sessions_mutex); @@ -248,7 +272,7 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later) 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); @@ -276,16 +300,15 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later) 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); @@ -313,11 +336,35 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later) package.response() = apdu; odr_destroy(odr); + } + 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 + { + 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; + + 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, '/'); @@ -326,16 +373,39 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later) 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()) + { + 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; + + odr_destroy(odr); + 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)