X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_sru_to_z3950.cpp;h=6d3b10ad3b7f1307bc0bb823cfda5867b3ff4fe6;hb=fded284bf0a30c454f83741d52ccb06023b5627f;hp=30be4dad28437d2a7d1a64a69464f4d78ecc441a;hpb=219ffa015c0e35b03fae0788b0e8e6abcfde1a81;p=metaproxy-moved-to-github.git

diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp
index 30be4da..6d3b10a 100644
--- a/src/filter_sru_to_z3950.cpp
+++ b/src/filter_sru_to_z3950.cpp
@@ -1,8 +1,23 @@
-/* $Id: filter_sru_to_z3950.cpp,v 1.33 2007-04-13 09:57:51 adam Exp $
+/* $Id: filter_sru_to_z3950.cpp,v 1.36 2008-01-29 16:51:12 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
-   See the LICENSE file for details
-*/
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
 
 #include "config.hpp"
 #include "filter.hpp"
@@ -49,23 +64,22 @@ namespace metaproxy_1 {
 
             bool z3950_init_request(mp::Package &package, 
                                     mp::odr &odr_en,
-                                    Z_SRW_PDU *sru_pdu_res,
-                                    const std::string 
-                                    &database = "Default") const;
+                                    Z_SRW_PDU *sru_pdu_req,
+                                    Z_SRW_PDU *sru_pdu_res) const;
 
             bool z3950_close_request(mp::Package &package) const;
 
-            bool z3950_search_request(mp::Package &package,
-                                      mp::odr &odr_en,
-                                      Z_SRW_PDU *sru_pdu_res,
-                                      Z_SRW_searchRetrieveRequest 
-                                          const *sr_req) const;
+            bool z3950_search_request(
+                mp::Package &package,
+                mp::odr &odr_en,
+                Z_SRW_PDU *sru_pdu_res,
+                Z_SRW_searchRetrieveRequest const *sr_req) const;
 
-            bool z3950_present_request(mp::Package &package,
-                                       mp::odr &odr_en,
-                                       Z_SRW_PDU *sru_pdu_res,
-                                       Z_SRW_searchRetrieveRequest 
-                                       const *sr_req) const;
+            bool z3950_present_request(
+                mp::Package &package,
+                mp::odr &odr_en,
+                Z_SRW_PDU *sru_pdu_res,
+                Z_SRW_searchRetrieveRequest const *sr_req) const;
 
             bool z3950_scan_request(mp::Package &package,
                                     mp::odr &odr_en,
@@ -219,7 +233,7 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
         ok = mp_util::check_sru_query_exists(package, odr_en, 
                                              sru_pdu_res, sr_req);
 
-        if (ok && z3950_init_request(package, odr_en, sru_pdu_res))
+        if (ok && z3950_init_request(package, odr_en, sru_pdu_req, sru_pdu_res))
         {
             {
                 ok = z3950_search_request(package, odr_en,
@@ -255,7 +269,8 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
                                4, "scan");
  
         // to be used when we do scan
-        if (false && z3950_init_request(package, odr_en, sru_pdu_res))
+        if (false && z3950_init_request(package, odr_en, sru_pdu_req,
+                                        sru_pdu_res))
         {
             z3950_scan_request(package, odr_en, sru_pdu_res, sr_req);    
             z3950_close_request(package);
@@ -280,8 +295,8 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
 bool 
 yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package, 
                                          mp::odr &odr_en,
-                                         Z_SRW_PDU *sru_pdu_res,
-                                         const std::string &database) const
+                                         Z_SRW_PDU *sru_pdu_req,
+                                         Z_SRW_PDU *sru_pdu_res) const
 {
     // prepare Z3950 package
     Package z3950_package(package.session(), package.origin());
@@ -306,6 +321,16 @@ yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package,
     ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_2);
     ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_3);
 
+    Z_SRW_extra_arg *arg;
+    for ( arg = sru_pdu_req->extra_args; arg; arg = arg->next)
+        if (!strcmp(arg->name, "x-target"))
+        {
+            std::string target(arg->value);
+            mp_util::set_vhost_otherinfo(&init_req->otherInfo,
+                                         odr_en, target, 1);
+            
+        }
+
     z3950_package.request() = apdu;
 
     // send Z3950 package
@@ -568,8 +593,7 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package,
 
     // RecordSyntax will always be XML
     apdu->u.presentRequest->preferredRecordSyntax
-        = yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, OID_STR_XML,
-                                odr_en);
+        = odr_oiddup(odr_en, yaz_oid_recsyn_xml);
 
     // z3950'fy record schema
      if (sr_req->recordSchema)
@@ -664,11 +688,8 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package,
             else
             {
                 Z_External *r = npr->u.databaseRecord;
-                const int *xml_oid = yaz_string_to_oid(yaz_oid_std(),
-                                                       CLASS_RECSYN,
-                                                       OID_STR_XML);
-                if (xml_oid && r->direct_reference 
-                    && !oid_oidcmp(r->direct_reference, xml_oid))
+                if (r->direct_reference 
+                    && !oid_oidcmp(r->direct_reference, yaz_oid_recsyn_xml))
                 {
                     sru_res->records[i].recordSchema = "dc";
                     sru_res->records[i].recordData_buf