X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=663c1bef44ad152e15a195ddb5be505f89c45fe0;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=250a7a61e3f5f8da1700fd0c848ffac6cabbe203;hpb=5881ad68262d382703c51d9e015afb69e5521883;p=metaproxy-moved-to-github.git

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index 250a7a6..663c1be 100644
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_virt_db.cpp,v 1.7 2005-10-25 22:44:39 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.14 2005-11-14 23:35:22 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -12,14 +12,13 @@
 
 #include <boost/thread/mutex.hpp>
 
+#include "util.hpp"
 #include "filter_virt_db.hpp"
 
 #include <yaz/zgdu.h>
-#include <yaz/log.h>
 #include <yaz/otherinfo.h>
 #include <yaz/diagbib1.h>
 
-#include <list>
 #include <map>
 #include <iostream>
 
@@ -29,13 +28,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_backend_session;
-            std::string m_setname;
+            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);
@@ -67,9 +67,12 @@ namespace yp2 {
     }
 }
 
+using namespace yp2;
+
 yf::Virt_db_set::Virt_db_set(yp2::Session &id, std::string setname,
-                             std::string vhost)
-    :   m_backend_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,12 +108,11 @@ 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)
@@ -122,27 +124,19 @@ void yf::Virt_db::Rep::release_session(Package &package)
 
 void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later){
     Session *id = 0;
-    std::string resultSetId;
     Z_PresentRequest *req = apdu->u.presentRequest;
+    std::string resultSetId = req->resultSetId;
+    yp2::odr odr;
     {
-        resultSetId = req->resultSetId;
         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;
-            apdu->u.close->diagnosticInformation =
-                odr_strdup(odr, "no session for present request");
-            
-            package.response() = apdu;
+            package.response() = odr.create_close(
+                Z_Close_protocolError,
+                "no session for present request");
             package.session().close();
-            odr_destroy(odr);
-            assert(false);
             return;
         }
         if (it->second.m_use_vhost)
@@ -153,7 +147,6 @@ void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later)
         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));
@@ -165,12 +158,11 @@ void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later)
                     YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
                     resultSetId.c_str());
             package.response() = apdu;
-            odr_destroy(odr);
+
             return;
         }
         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());
@@ -179,13 +171,10 @@ 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();
 
     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));
@@ -198,8 +187,6 @@ void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later)
                 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())
@@ -217,23 +204,20 @@ 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;
+    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;
-            apdu->u.close->diagnosticInformation =
-                odr_strdup(odr, "no session for search request");
-            
-            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)
@@ -243,7 +227,6 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
         }
         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));
@@ -254,7 +237,6 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
                     odr, YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0);
             package.response() = apdu;
             
-            odr_destroy(odr);
             return;
         }
         database = req->databaseNames[0];
@@ -262,7 +244,6 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
         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));
@@ -270,10 +251,9 @@ 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);
             return;
         }
         if (*req->replaceIndicator == 0)
@@ -281,7 +261,6 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
             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));
@@ -294,7 +273,6 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
                         0);
                 package.response() = apdu;
                 
-                odr_destroy(odr);
                 return;
             }
         }
@@ -309,20 +287,38 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
         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));
@@ -333,7 +329,7 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
                     odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str());
             package.response() = apdu;
             
-            odr_destroy(odr);
+            return;
         }
     }
     // sending search to backend
@@ -341,21 +337,19 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
 
     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())
     {
-        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));
@@ -366,7 +360,6 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
                 odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str());
         package.response() = apdu;
         
-        odr_destroy(odr);
         return;
     }
     package.response() = search_package.response();
@@ -374,8 +367,9 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
     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[req->resultSetName] =
-            Virt_db_set(id, req->resultSetName, vhost);
+        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)
@@ -389,8 +383,7 @@ 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;
         
@@ -416,8 +409,6 @@ void yf::Virt_db::Rep::init(Package &package, Z_APDU *apdu, bool &move_later)
 
         package.response() = apdu;
         
-        odr_destroy(odr);
-
         m_sessions[package.session()] = Virt_db_session(package.session(), false);
     }
     else
@@ -456,18 +447,13 @@ void yf::Virt_db::process(Package &package) const
         }
         else
         {
-            ODR odr = odr_createmem(ODR_ENCODE);
+            yp2::odr odr;
             
-            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.response() = odr.create_close(
+                Z_Close_protocolError,
+                "unsupported APDU in filter_virt_db");
+                                                 
             package.session().close();
-            odr_destroy(odr);
         }
         if (move_later)
             package.move();