X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=6480379a11eeb5c757136f81101fc1306cfe4773;hb=d7b1186d1f020678b617e2368415485bffef93f9;hp=1902d61cacc102b4b1e94dcce6f9c7674b444867;hpb=cf09b1981338f07c333e43e0a2c907012c841c5d;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index 1902d61..6480379 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_virt_db.cpp,v 1.3 2005-10-25 11:48:30 adam Exp $ +/* $Id: filter_virt_db.cpp,v 1.8 2005-10-25 23:04:06 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -33,8 +33,8 @@ namespace yp2 { 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; }; struct Virt_db_session { @@ -69,7 +69,7 @@ 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) + : m_backend_session(id), m_backend_setname(setname), m_vhost(vhost) { } @@ -117,15 +117,13 @@ 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); @@ -137,10 +135,13 @@ void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later) 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->second.m_use_vhost) @@ -148,7 +149,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); @@ -161,12 +162,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(it->second.m_session); + id = new yp2::Session(sets_it->second.m_backend_session); } ODR odr = odr_createmem(ODR_ENCODE); @@ -176,13 +177,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; } @@ -191,7 +216,7 @@ 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; { boost::mutex::scoped_lock lock(m_sessions_mutex); @@ -203,6 +228,8 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later) 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 search request"); package.response() = apdu; package.session().close(); @@ -243,7 +270,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); @@ -271,16 +298,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); @@ -308,11 +334,10 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later) 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, '/'); @@ -321,16 +346,38 @@ 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); } void yf::Virt_db::Rep::init(Package &package, Z_APDU *apdu, bool &move_later) @@ -351,12 +398,24 @@ void yf::Virt_db::Rep::init(Package &package, Z_APDU *apdu, bool &move_later) 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); @@ -404,6 +463,9 @@ void yf::Virt_db::process(Package &package) const 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();