Ignore generated file "tstdl".

[metaproxy-moved-to-github.git] / src / filter_virt_db.cpp

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index aa5af9d..3dc1337 100644 (file)
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_virt_db.cpp,v 1.11 2005-10-30 17:13:36 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.15 2005-12-19 08:42:59 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -16,11 +16,9 @@
 #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>
 
@@ -69,6 +67,8 @@ namespace yp2 {
     }
 }
 
+using namespace yp2;
+
 yf::Virt_db_set::Virt_db_set(yp2::Session &id, std::string setname,
                              std::string vhost, bool named_result_sets)
     :   m_backend_session(id), m_backend_setname(setname), m_vhost(vhost),
@@ -119,6 +119,20 @@ 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())
+    {
+        Sets_it sit = it->second.m_sets.begin();
+        for (; sit != it->second.m_sets.end(); sit++)
+        {
+            sit->second.m_backend_session.close();
+            Package close_package(sit->second.m_backend_session, package.origin());
+            close_package.copy_filter(package);
+
+            close_package.move();
+        }
+    }
     m_sessions.erase(package.session());
 }
 
@@ -133,15 +147,10 @@ void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later)
         Ses_it it = m_sessions.find(package.session());
         if (it == m_sessions.end())
         {
-            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();
-
             return;
         }
         if (it->second.m_use_vhost)
@@ -218,13 +227,9 @@ void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later)
         Ses_it it = m_sessions.find(package.session());
         if (it == m_sessions.end())
         {
-            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();
 
             return;
@@ -435,8 +440,10 @@ void yf::Virt_db::add_map_db2vhost(std::string db, std::string vhost)
 void yf::Virt_db::process(Package &package) const
 {
     Z_GDU *gdu = package.request().get();
-
-    if (!gdu || gdu->which != Z_GDU_Z3950)
+    
+    if (package.session().is_closed())
+        m_p->release_session(package);
+    else if (!gdu || gdu->which != Z_GDU_Z3950)
         package.move();
     else
     {
@@ -454,25 +461,25 @@ void yf::Virt_db::process(Package &package) const
         {
             m_p->present(package, apdu, move_later);
         }
+        else if (apdu->which == Z_APDU_close)
+        {
+            package.session().close();
+            m_p->release_session(package);
+        }
         else
         {
             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();
+            m_p->release_session(package);
         }
         if (move_later)
             package.move();
     }
-    if (package.session().is_closed())
-        m_p->release_session(package);
 }