Fixed bug #975: HTTP HEAD Request kills SRU server.

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

diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp
index a0a7d82..9cb97bb 100644 (file)
--- a/src/filter_sru_to_z3950.cpp
+++ b/src/filter_sru_to_z3950.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_sru_to_z3950.cpp,v 1.29 2007-01-25 14:05:54 adam Exp $
+/* $Id: filter_sru_to_z3950.cpp,v 1.31 2007-03-20 07:05:10 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
@@ -179,11 +179,21 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
                                             sru_pdu_res, soap,
                                             charset, stylesheet)))
     {
-        mp_util::build_sru_explain(package, odr_en, sru_pdu_res, 
-                                   sruinfo, explainnode);
-        mp_util::build_sru_response(package, odr_en, soap, 
-                           sru_pdu_res, charset, stylesheet);
-        package.session().close();
+        if (soap)
+        {
+            mp_util::build_sru_explain(package, odr_en, sru_pdu_res, 
+                                       sruinfo, explainnode);
+            mp_util::build_sru_response(package, odr_en, soap, 
+                                        sru_pdu_res, charset, stylesheet);
+        }
+        else
+        {
+            metaproxy_1::odr odr; 
+            Z_GDU *zgdu_res = 
+                odr.create_HTTP_Response(package.session(), 
+                                         zgdu_req->u.HTTP_Request, 400);
+            package.response() = zgdu_res;
+        }
         return;
     }
     
@@ -261,7 +271,6 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
         sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response);
         
         // TODO: make nice diagnostic return package 
-        package.session().close();
         return;
     }
 
@@ -313,7 +322,6 @@ yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package,
                                &(sru_pdu_res->u.response->diagnostics),
                                &(sru_pdu_res->u.response->num_diagnostics),
                                2, 0);
-        package.session().close();
         return false;
     }
 
@@ -329,16 +337,12 @@ yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package,
                            &(sru_pdu_res->u.response->diagnostics),
                            &(sru_pdu_res->u.response->num_diagnostics),
                            2, 0);
-    package.session().close();
     return false;
 }
 
 bool 
 yf::SRUtoZ3950::Impl::z3950_close_request(mp::Package &package) const
 {
-    // close SRU package
-    package.session().close();
-
     // prepare and close Z3950 package 
     Package z3950_package(package.session(), package.origin());
     z3950_package.copy_filter(package);
@@ -430,7 +434,6 @@ yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package,
                                &(sru_pdu_res->u.response->diagnostics),
                                &(sru_pdu_res->u.response->num_diagnostics),
                                2, 0);
-        package.session().close();
         return false;
     }
     
@@ -606,10 +609,9 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package,
                                &(sru_pdu_res->u.response->diagnostics), 
                                &(sru_pdu_res->u.response->num_diagnostics), 
                                2, 0);
-        package.session().close();
         return false;
     }
-    
+
 
     // everything fine, continuing