X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=67b6750f28860acb6b9748c3184c7c3f2091f620;hb=883b4323df45c0740fbd44a302b2314202355dcc;hp=fdbe8272104526c379813e6cc86e147a13c3a7e0;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index fdbe827..67b6750 100644
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_virt_db.cpp,v 1.36 2006-03-16 10:40:59 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.39 2006-05-15 13:22:02 adam Exp $
    Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
@@ -68,6 +68,11 @@ namespace metaproxy_1 {
             void close(Package &package);
             typedef std::map<std::string,Virt_db::Set>::iterator Sets_it;
 
+            void fixup_npr(Package &p, BackendPtr b);
+
+            void fixup_npr(Z_Records *records, std::string database,
+                           ODR odr);
+
             BackendPtr lookup_backend_from_databases(
                 std::list<std::string> databases);
             BackendPtr create_backend_from_databases(
@@ -87,11 +92,8 @@ namespace metaproxy_1 {
             FrontendPtr get_frontend(Package &package);
             void release_frontend(Package &package);
         private:
-            boost::mutex m_sessions_mutex;
             std::map<std::string, Virt_db::Map>m_maps;
-
             typedef std::map<std::string,Virt_db::Set>::iterator Sets_it;
-
             boost::mutex m_mutex;
             boost::condition m_cond_session_ready;
             std::map<mp::Session, FrontendPtr> m_clients;
@@ -99,8 +101,6 @@ namespace metaproxy_1 {
     }
 }
 
-using namespace mp;
-
 yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases(
     std::list<std::string> databases)
 {
@@ -129,7 +129,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases(
     for (; db_it != databases.end(); db_it++)
     {
         std::map<std::string, Virt_db::Map>::iterator map_it;
-        map_it = m_p->m_maps.find(*db_it);
+        map_it = m_p->m_maps.find(mp::util::database_name_normalize(*db_it));
         if (map_it == m_p->m_maps.end())  // database not found
         {
             error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
@@ -354,11 +354,11 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req)
         package.session().close();
         return;
     }
-    package.response() = search_package.response();
-
     b->m_number_of_sets++;
 
     m_sets[resultSetId] = Virt_db::Set(b, backend_setname);
+    fixup_npr(search_package, b);
+    package.response() = search_package.response();
 }
 
 yf::Virt_db::Frontend::Frontend(Rep *rep)
@@ -462,6 +462,46 @@ yf::Virt_db::Virt_db() : m_p(new Virt_db::Rep)
 yf::Virt_db::~Virt_db() {
 }
 
+
+void yf::Virt_db::Frontend::fixup_npr(Z_Records *records, std::string database,
+                                      ODR odr)
+{
+    if (records && records->which == Z_Records_DBOSD)
+    {
+        Z_NamePlusRecordList *nprlist = records->u.databaseOrSurDiagnostics;
+        int i;
+        for (i = 0; i < nprlist->num_records; i++)
+        {
+            Z_NamePlusRecord *npr = nprlist->records[i];
+            npr->databaseName = odr_strdup(odr, database.c_str());
+        }
+    }
+}
+
+void yf::Virt_db::Frontend::fixup_npr(Package &p, BackendPtr b)
+{
+    Z_GDU *gdu = p.response().get();
+    mp::odr odr;
+    std::string database = "dummy";
+    std::list<std::string>::const_iterator db_it =
+        b->m_frontend_databases.begin();
+    if (db_it != b->m_frontend_databases.end())
+        database = *db_it;
+
+    if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
+        Z_APDU_presentResponse)
+    {
+        fixup_npr(gdu->u.z3950->u.presentResponse->records, database, odr);
+        p.response() = gdu;
+    }
+    if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
+        Z_APDU_searchResponse)
+    {
+        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)
 {
     Z_PresentRequest *req = apdu_req->u.presentRequest;
@@ -492,6 +532,8 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req)
 
     present_package.move(sets_it->second.m_backend->m_route);
 
+    fixup_npr(present_package, sets_it->second.m_backend);
+
     if (present_package.session().is_closed())
     {
         package.response() = present_package.response();
@@ -575,7 +617,8 @@ void yf::Virt_db::add_map_db2targets(std::string db,
                                      std::list<std::string> targets,
                                      std::string route)
 {
-    m_p->m_maps[db] = Virt_db::Map(targets, route);
+    m_p->m_maps[mp::util::database_name_normalize(db)] 
+        = Virt_db::Map(targets, route);
 }
 
 
@@ -586,7 +629,8 @@ void yf::Virt_db::add_map_db2target(std::string db,
     std::list<std::string> targets;
     targets.push_back(target);
 
-    m_p->m_maps[db] = Virt_db::Map(targets, route);
+    m_p->m_maps[mp::util::database_name_normalize(db)]
+        = Virt_db::Map(targets, route);
 }
 
 void yf::Virt_db::process(Package &package) const