X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffilter_sru_to_z3950.cpp;h=a07663435b0d8695ebeaccc21fefc1524ccf5e0a;hb=3dc4fee179ffd760e6b15e96e3bb14a7221d5a64;hp=260efeb528b841691bfcce6dfe0be593859767e3;hpb=3825178e4cb10dda3de93336cad102f1459e48c6;p=metaproxy-moved-to-github.git

diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp
index 260efeb..a076634 100644
--- a/src/filter_sru_to_z3950.cpp
+++ b/src/filter_sru_to_z3950.cpp
@@ -1,44 +1,148 @@
-/* $Id: filter_sru_to_z3950.cpp,v 1.1 2006-09-13 10:43:24 marc Exp $
+/* $Id: filter_sru_to_z3950.cpp,v 1.9 2006-09-20 15:08:27 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
  */
 
 #include "config.hpp"
-
 #include "filter.hpp"
 #include "package.hpp"
-
-#include <boost/thread/mutex.hpp>
-
 #include "util.hpp"
+#include "gduutil.hpp"
 #include "filter_sru_to_z3950.hpp"
 
 #include <yaz/zgdu.h>
+#include <yaz/z-core.h>
+#include <yaz/srw.h>
+#include <yaz/pquery.h>
+
+#include <boost/thread/mutex.hpp>
+
+#include <iostream>
+#include <sstream>
+#include <string>
+
 
 namespace mp = metaproxy_1;
 namespace yf = mp::filter;
 
+namespace metaproxy_1 
+{
+
+    template<typename T>
+    std::string to_string(const T& t)
+    {
+        std::ostringstream o;
+        if(o << t)
+            return o.str();
+        
+        return std::string();
+    }
+
+    std::string http_header_value(const Z_HTTP_Header* header, 
+                                  const std::string name)
+    {
+        while (header && header->name
+               && std::string(header->name) !=  name)
+            header = header->next;
+        
+        if (header && header->name && std::string(header->name) == name
+            && header->value)
+            return std::string(header->value);
+
+        return std::string();
+    }
+    
+
+}
+
+
 namespace metaproxy_1 {
     namespace filter {
         class SRUtoZ3950::Rep {
-            friend class SRUtoZ3950;
-            //int dummy;
+            //friend class SRUtoZ3950;
+        private:
+            union SRW_query {char * cql; char * xcql; char * pqf;};
+            typedef const int& SRW_query_type;
+        public:
+            void configure(const xmlNode *xmlnode);
+            void process(metaproxy_1::Package &package) const;
+        private:
+            std::string sru_protocol(const Z_HTTP_Request &http_req) const;
+            std::string debug_http(const Z_HTTP_Request &http_req) const;
+            void http_response(mp::Package &package, 
+                               const std::string &content, 
+                               int http_code = 200) const;
+            bool build_sru_debug_package(mp::Package &package) const;
+            bool build_sru_response(mp::Package &package, 
+                                    mp::odr &odr_en,
+                                    Z_SOAP *soap,
+                                    const Z_SRW_PDU *sru_pdu_res,
+                                    char *charset,
+                                    const char *stylesheet) const;
+            Z_SRW_PDU * decode_sru_request(mp::Package &package,   
+                                           mp::odr &odr_de,
+                                           Z_SOAP *&soap,
+                                           char *charset,
+                                           const char *stylesheet) const;
+            bool z3950_build_query(mp::odr &odr_en, Z_Query *z_query, 
+                                   const SRW_query &query, 
+                                   SRW_query_type query_type) const;
+            bool z3950_init_request(mp::Package &package, 
+                                         const std::string 
+                                         &database = "Default") 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;
+                                      //const std::string &database, 
+                                      //const std::string &query, 
+                                      //int query_type) 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;
+            //unsigned int start_position,
+            //unsigned int records_requested) const;
+            bool z3950_scan_request(mp::Package &package,
+                                    mp::odr &odr_en,
+                                    Z_SRW_PDU *sru_pdu_res,
+                                    Z_SRW_scanRequest 
+                                    const *sr_req) const;
+            //const std::string &database, 
+            //const std::string &query, 
+            //int query_type) const;
         };
     }
 }
 
 yf::SRUtoZ3950::SRUtoZ3950() : m_p(new Rep)
 {
-    //m_p->dummy = 1;
 }
 
 yf::SRUtoZ3950::~SRUtoZ3950()
 {  // must have a destructor because of boost::scoped_ptr
 }
 
+void yf::SRUtoZ3950::configure(const xmlNode *xmlnode)
+{
+    m_p->configure(xmlnode);
+}
+
 void yf::SRUtoZ3950::process(mp::Package &package) const
 {
+    m_p->process(package);
+}
+
+void yf::SRUtoZ3950::Rep::configure(const xmlNode *xmlnode)
+{
+}
+
+void yf::SRUtoZ3950::Rep::process(mp::Package &package) const
+{
     Z_GDU *zgdu_req = package.request().get();
 
     // ignoring all non HTTP_Request packages
@@ -48,37 +152,683 @@ void yf::SRUtoZ3950::process(mp::Package &package) const
     }
     
     // only working on  HTTP_Request packages now
+
+
+    // TODO: Z3950 response parsing and translation to SRU package
+    bool ok = true;    
+
+    Z_SRW_PDU *sru_pdu_req = 0;
+    mp::odr odr_de(ODR_DECODE);
+
+    Z_SRW_PDU *sru_pdu_res = 0;
+    mp::odr odr_en(ODR_ENCODE);
+
+    Z_SOAP *soap = 0;
+    char *charset = 0;
+    const char *stylesheet = 0;
+
+    if (! (sru_pdu_req = decode_sru_request(package, odr_de, soap, 
+                                            charset, stylesheet)))
+    {
+        sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response);
+        std::cout << "TODO: correct error when SRW package could not be"
+            " parsed\n";
+        //build_sru_debug_package(package);
+        build_sru_response(package, odr_en, soap, 
+                           sru_pdu_res, charset, stylesheet);
+        return;
+    }
+    
+    
+    // SRU request package translation to Z3950 package
+    if (sru_pdu_req)
+        std::cout << *sru_pdu_req << "\n";
+    else
+        std::cout << "SRU empty\n";
+    
+
+    // explain
+    if (sru_pdu_req && sru_pdu_req->which == Z_SRW_explain_request)
+    {
+        //Z_SRW_searchRetrieveRequest *sr_req = sru_pdu_req->u.request;
+        sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response);
+        std::cout << "TODO: implement explain response";
+        
+    }
+    
+
+    // searchRetrieve
+    if (sru_pdu_req && sru_pdu_req->which == Z_SRW_searchRetrieve_request)
+    {
+        Z_SRW_searchRetrieveRequest *sr_req = sru_pdu_req->u.request;   
+        
+        sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_searchRetrieve_response);
+
+        // TODO: checking of unsupported operations and proper diagnostic setup
+
+        // recordXPath unsupported.
+        //if (sr_req->recordXPath)
+        //    yaz_add_srw_diagnostic(odr_decode(),
+        //                           &diag, &num_diags, 72, 0);
+        // sort unsupported
+        //    if (sr_req->sort_type != Z_SRW_sort_type_none)
+        //        yaz_add_srw_diagnostic(odr_decode(),
+        //                               &diag, &num_diags, 80, 0);
+
+
+        if (z3950_init_request(package))
+        {
+            {
+                ok = z3950_search_request(package, odr_en,
+                                          sru_pdu_res, sr_req);
+
+                if (ok && sru_pdu_res->u.response->numberOfRecords
+                    && *(sru_pdu_res->u.response->numberOfRecords))
+                    
+                    ok = z3950_present_request(package, odr_en,
+                                               sru_pdu_res,
+                                               sr_req);
+                z3950_close_request(package);
+            }
+        }
+    }
+
+    // scan
+    else if (sru_pdu_req && sru_pdu_req->which == Z_SRW_scan_request)
+    {
+        Z_SRW_scanRequest  *sr_req = sru_pdu_req->u.scan_request;   
+
+        sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_scan_response);
+        
+        if (z3950_init_request(package))
+        {
+            z3950_scan_request(package, odr_en, sru_pdu_res, sr_req);    
+            z3950_close_request(package);
+        }        
+    }
+    else
+    {
+        std::cout << "SRU OPERATION NOT SUPPORTED \n";
+        sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response);
+        
+        // TODO: make nice diagnostic return package 
+        package.session().close();
+        return;
+    }
+
+    //build_sru_debug_package(package);
+    build_sru_response(package, odr_en, soap, 
+                       sru_pdu_res, charset, stylesheet);
+    return;
+
+
+
+
+
+
+
+}
+
+bool yf::SRUtoZ3950::Rep::build_sru_debug_package(mp::Package &package) const
+{
+    Z_GDU *zgdu_req = package.request().get();
+    if  (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request)
+    {    
+        Z_HTTP_Request* http_req =  zgdu_req->u.HTTP_Request;
+        std::string content = debug_http(*http_req);
+        int http_code = 400;    
+        http_response(package, content, http_code);
+        return true;
+    }
+    package.session().close();
+    return false;
+}
+
+
+bool yf::SRUtoZ3950::Rep::build_sru_response(mp::Package &package, 
+                                             mp::odr &odr_en,
+                                             Z_SOAP *soap,
+                                             const Z_SRW_PDU *sru_pdu_res,
+                                             char *charset,
+                                             const char *stylesheet) 
+    const
+{
+
+    // SRU request package translation to Z3950 package
+    if (sru_pdu_res)
+        std::cout << *(const_cast<Z_SRW_PDU *>(sru_pdu_res)) << "\n";
+    else
+        std::cout << "SRU empty\n";
+
+    
+    Z_GDU *zgdu_req = package.request().get();
+    if  (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request)
+    {    
+        Z_GDU *zgdu_res //= z_get_HTTP_Response(odr_en, 200);
+            = odr_en.create_HTTP_Response(package.session(), 
+                                          zgdu_req->u.HTTP_Request, 
+                                          200);
+          Z_HTTP_Response * http_res = zgdu_res->u.HTTP_Response;
+
+          static Z_SOAP_Handler soap_handlers[4] = {
+              {"http://www.loc.gov/zing/srw/", 0,
+               (Z_SOAP_fun) yaz_srw_codec},
+              {"http://www.loc.gov/zing/srw/v1.0/", 0,
+               (Z_SOAP_fun) yaz_srw_codec},
+              {"http://www.loc.gov/zing/srw/update/", 0,
+               (Z_SOAP_fun) yaz_ucp_codec},
+              {0, 0, 0}
+          };
+
+          //if (!stylesheet && assoc->server)
+          //stylesheet = assoc->server->stylesheet;
+
+          /* empty stylesheet means NO stylesheet */
+          //if (stylesheet && *stylesheet == '\0')
+          //    stylesheet = 0;
+          //ret = z_soap_codec_enc_xsl(assoc->encode, &soap_package,
+          //&hres->content_buf, &hres->content_len,
+          //                             soap_handlers, charset, stylesheet);
+
+          // encoding SRU package
+
+         soap->u.generic->p  = (void*) sru_pdu_res;         
+         //int ret = 
+         z_soap_codec_enc_xsl(odr_en, &soap, 
+                              &http_res->content_buf, &http_res->content_len,
+                              soap_handlers, charset, 0);
+
+         package.response() = zgdu_res;
+         return true;
+    }
+    package.session().close();
+    return false;
+}
+
+
+
+ Z_SRW_PDU * yf::SRUtoZ3950::Rep::decode_sru_request(mp::Package &package,
+                                                     mp::odr &odr_de,
+                                                     Z_SOAP *&soap,
+                                                     char *charset,
+                                                     const char *stylesheet) 
+     const
+{
+    Z_GDU *zgdu_req = package.request().get();
+    Z_SRW_PDU *sru_pdu_req = 0;
+
+    // ignoring all non HTTP_Request packages
+    if (!zgdu_req || !(zgdu_req->which == Z_GDU_HTTP_Request)){
+        return 0;
+    }
+    
     Z_HTTP_Request* http_req =  zgdu_req->u.HTTP_Request;
+    if (! http_req)
+        return 0;
 
-    // TODO: SRU package checking and translation to Z3950 package
+    Z_SRW_diagnostic *diag = 0;
+    int num_diags = 0;
+    
+    if (0 == yaz_sru_decode(http_req, &sru_pdu_req, &soap, 
+                            odr_de, &charset, &diag, &num_diags))
+    {
+        if (num_diags)
+        {
+            std::cout << "SRU DECODE DIAGNOSTICS " << num_diags << "\n";
+            // TODO: make nice diagnostic return package 
+            //Z_SRW_PDU *srw_pdu_res =
+            //            yaz_srw_get(odr(ODR_ENCODE),
+            //                        Z_SRW_searchRetrieve_response);
+            //        Z_SRW_searchRetrieveResponse *srw_res = srw_pdu_res->u.response;
+            
+            //        srw_res->diagnostics = diagnostic;
+            //        srw_res->num_diagnostics = num_diagnostic;
+            //        send_srw_response(srw_pdu_res);
+            //        return;
+            
+            // package.session().close();
+            //return 0;
+        }
+        return sru_pdu_req;
+    }
+    else if (0 == yaz_srw_decode(http_req, &sru_pdu_req, &soap, 
+                                 odr_de, &charset))
+        return sru_pdu_req;
+    else 
+    {
+        //std::cout << "SRU DECODING ERROR - SHOULD NEVER HAPPEN\n";
+        package.session().close();
+        return 0;
+    }
+    return 0;
+}
 
-    // sending Z3950 package through pipeline
-    package.move();
+bool 
+yf::SRUtoZ3950::Rep::z3950_init_request(mp::Package &package, 
+                                             const std::string &database) const
+{
+    // prepare Z3950 package
+    //Session s;
+    //Package z3950_package(s, package.origin());
+    Package z3950_package(package.session(), package.origin());
+    z3950_package.copy_filter(package);
 
+    // set initRequest APDU
+    mp::odr odr_en(ODR_ENCODE);
+    Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_initRequest);
+    Z_InitRequest *init_req = apdu->u.initRequest;
+    //TODO: add user name in apdu
+    //TODO: add user passwd in apdu
+    //init_req->idAuthentication = org_init->idAuthentication;
+    //init_req->implementationId = "IDxyz";
+    //init_req->implementationName = "NAMExyz";
+    //init_req->implementationVersion = "VERSIONxyz";
 
-    // TODO: Z3950 response parsing and translation to SRU package
-    //Z_HTTP_Response* http_res = 0;
+    ODR_MASK_SET(init_req->options, Z_Options_search);
+    ODR_MASK_SET(init_req->options, Z_Options_present);
+    ODR_MASK_SET(init_req->options, Z_Options_namedResultSets);
+    ODR_MASK_SET(init_req->options, Z_Options_scan);
+
+    ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_1);
+    ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_2);
+    ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_3);
+
+    z3950_package.request() = apdu;
+
+    // send Z3950 package
+    // std::cout << "z3950_init_request " << *apdu <<"\n";
+    z3950_package.move();
+
+    // dead Z3950 backend detection
+    if (z3950_package.session().is_closed()){
+        package.session().close();
+        return false;
+    }
+
+    // check successful initResponse
+    Z_GDU *z3950_gdu = z3950_package.response().get();
+
+    if (z3950_gdu && z3950_gdu->which == Z_GDU_Z3950 
+        && z3950_gdu->u.z3950->which == Z_APDU_initResponse)
+         return true;
+ 
+    return false;
+}
+
+bool 
+yf::SRUtoZ3950::Rep::z3950_close_request(mp::Package &package) const
+{
+    // prepare Z3950 package 
+    Package z3950_package(package.session(), package.origin());
+    z3950_package.copy_filter(package);
+    z3950_package.session().close();
+
+    // set close APDU
+    //mp::odr odr_en(ODR_ENCODE);
+    //Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_close);
+    //z3950_package.request() = apdu;
+
+    z3950_package.move();
+
+    // check successful close response
+    //Z_GDU *z3950_gdu = z3950_package.response().get();
+    //if (z3950_gdu && z3950_gdu->which == Z_GDU_Z3950 
+    //    && z3950_gdu->u.z3950->which == Z_APDU_close)
+    //    return true;
+
+    if (z3950_package.session().is_closed()){
+        //package.session().close();
+        return true;
+    }
+    return false;
+}
+
+bool 
+yf::SRUtoZ3950::Rep::z3950_search_request(mp::Package &package,  
+                                          mp::odr &odr_en,
+                                          Z_SRW_PDU *sru_pdu_res,
+                                          Z_SRW_searchRetrieveRequest 
+                                          const *sr_req) const
+{
+    Package z3950_package(package.session(), package.origin());
+    z3950_package.copy_filter(package); 
+    //mp::odr odr_en(ODR_ENCODE);
+    Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_searchRequest);
+
+    //add stuff in z3950 apdu
+    Z_SearchRequest *z_searchRequest = apdu->u.searchRequest;
+
+    // z3950'fy database
+    z_searchRequest->num_databaseNames = 1;
+    z_searchRequest->databaseNames = (char**)
+        odr_malloc(odr_en, sizeof(char *));
+    if (sr_req->database)
+        z_searchRequest->databaseNames[0] 
+            = odr_strdup(odr_en, const_cast<char *>(sr_req->database));
+    else
+        z_searchRequest->databaseNames[0] 
+            = odr_strdup(odr_en, "Default");
+
+
+    // z3950'fy query
+    Z_Query *z_query = (Z_Query *) odr_malloc(odr_en, sizeof(Z_Query));
+    z_searchRequest->query = z_query;
+ 
+    if (!z3950_build_query(odr_en, z_query, 
+                           (const SRW_query&)sr_req->query, 
+                           sr_req->query_type))
+    {    
+        //send_to_srw_client_error(7, "query");
+        return false;
+    }
+
+    z3950_package.request() = apdu;
+    //std::cout << "z3950_search_request " << *apdu << "\n";
+        
+    z3950_package.move();
+
+    //TODO: check success condition
+
+    //int yaz_diag_bib1_to_srw (int bib1_code);
+    //int yaz_diag_srw_to_bib1(int srw_code);
+    //Se kode i src/seshigh.c (srw_bend_search, srw_bend_init).
+
+    Z_GDU *z3950_gdu = z3950_package.response().get();
+    //std::cout << "z3950_search_request " << *z3950_gdu << "\n";
+
+    if (z3950_gdu && z3950_gdu->which == Z_GDU_Z3950 
+        && z3950_gdu->u.z3950->which == Z_APDU_searchResponse
+        && z3950_gdu->u.z3950->u.searchResponse->searchStatus)
+    {
+
+        Z_SearchResponse *sr = z3950_gdu->u.z3950->u.searchResponse;
+        if (sr)
+        {
+            // srw'fy number of records
+            sru_pdu_res->u.response->numberOfRecords 
+                = (int *) odr_malloc(odr_en, sizeof(int *));
+            *(sru_pdu_res->u.response->numberOfRecords) = *(sr->resultCount);
+        }
+
+        return true;
+    }
+    
+    return false;
+}
+
+bool 
+yf::SRUtoZ3950::Rep::z3950_present_request(mp::Package &package, 
+                                           mp::odr &odr_en,
+                                           Z_SRW_PDU *sru_pdu_res,
+                                           Z_SRW_searchRetrieveRequest 
+                                           const *sr_req)
+    const
+{
+
+    if (!sr_req)
+        return false;
+
+    
+    // no need to work if nobody wants records seen ..
+    if (!(sr_req->maximumRecords) || 0 == *(sr_req->maximumRecords))
+        return true;
+
+    // creating Z3950 package
+    Package z3950_package(package.session(), package.origin());
+    z3950_package.copy_filter(package); 
+    //mp::odr odr_en(ODR_ENCODE);
+    Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_presentRequest);
+
+    //TODO: add stuff in apdu
+    assert(apdu->u.presentRequest);
+
+    // z3950'fy start record position
+    if (sr_req->startRecord)
+        *(apdu->u.presentRequest->resultSetStartPoint) 
+            = *(sr_req->startRecord);
+    else 
+        *(apdu->u.presentRequest->resultSetStartPoint) = 1;
+    
+    // z3950'fy number of records requested 
+    if (sr_req->maximumRecords)
+        *(apdu->u.presentRequest->numberOfRecordsRequested) 
+            = *(sr_req->maximumRecords);
+     
+    // TODO: z3950'fy record schema
+    //if (sr_req->recordSchema)
+    //    *(apdu->u.presentRequest->preferredRecordSyntax) 
+    //        = *(sr_req->recordSchema);  
+
+    z3950_package.request() = apdu;
+
+    //std::cout << "z3950_present_request " << *apdu << "\n";   
+    z3950_package.move();
+
+    //TODO: check success condition
+    Z_GDU *z3950_gdu = z3950_package.response().get();
+    if (z3950_gdu && z3950_gdu->which == Z_GDU_Z3950 
+        && z3950_gdu->u.z3950->which == Z_APDU_presentResponse)
+
+    {
+        //std::cout << "z3950_present_request OK\n";
+
+        Z_PresentResponse *pr = z3950_gdu->u.z3950->u.presentResponse;
+        if (pr)
+        {
 
+            // srw'fy number of returned records
+            //sru_pdu_res->u.response->num_records 
+            //    = *(pr->numberOfRecordsReturned);
+            //= (int *) odr_malloc(odr_en, sizeof(int *));
+            //*(sru_pdu_res->u.response->num_records) 
+            //    = *(pr->numberOfRecordsReturned);
 
+            // srw'fy nextRecordPosition
+            sru_pdu_res->u.response->nextRecordPosition 
+                = (int *) odr_malloc(odr_en, sizeof(int *));
+            *(sru_pdu_res->u.response->nextRecordPosition) 
+                = *(pr->nextResultSetPosition);
+        }
+        return true;
+    }
+
+    return false;
+}
+
+bool 
+yf::SRUtoZ3950::Rep::z3950_scan_request(mp::Package &package,
+                                        mp::odr &odr_en,
+                                        Z_SRW_PDU *sru_pdu_res,
+                                        Z_SRW_scanRequest const *sr_req) const 
+{
+    Package z3950_package(package.session(), package.origin());
+    z3950_package.copy_filter(package); 
+    //mp::odr odr_en(ODR_ENCODE);
+    Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_scanRequest);
+
+    //TODO: add stuff in apdu
+    Z_ScanRequest *z_scanRequest = apdu->u.scanRequest;
+
+    // database repackaging
+    z_scanRequest->num_databaseNames = 1;
+    z_scanRequest->databaseNames = (char**)
+        odr_malloc(odr_en, sizeof(char *));
+    if (sr_req->database)
+        z_scanRequest->databaseNames[0] 
+            = odr_strdup(odr_en, const_cast<char *>(sr_req->database));
+    else
+        z_scanRequest->databaseNames[0] 
+            = odr_strdup(odr_en, "Default");
+
+
+    // query repackaging
+    // CQL or XCQL scan is not possible in Z3950, flagging a diagnostic
+    if (sr_req->query_type != Z_SRW_query_type_pqf)
+    {        
+        //send_to_srw_client_error(7, "query");
+        return false;
+    }
+
+    // PQF query repackaging
+    // need to use Z_AttributesPlusTerm structure, not Z_Query
+    // this can be digget out of a 
+    // Z_query->type1(Z_RPNQuery)->RPNStructure(Z_RPNStructure)
+    //   ->u.simple(Z_Operand)->u.attributesPlusTerm(Z_AttributesPlusTerm )
+
+    //Z_Query *z_query = (Z_Query *) odr_malloc(odr_en, sizeof(Z_Query));
+    //z_searchRequest->query = z_query;
+
+    //if (!z3950_build_query(odr_en, z_query, 
+    //                       (const SRW_query&)sr_req->query, 
+    //                       sr_req->query_type))
+    //{    
+        //send_to_srw_client_error(7, "query");
+    //    return false;
+    //}
+
+    // TODO: 
+
+    z3950_package.request() = apdu;
+    std::cout << "z3950_scan_request " << *apdu << "\n";   
+
+    z3950_package.move();
+    //TODO: check success condition
+    return true;
+    return false;
+}
+
+bool yf::SRUtoZ3950::Rep::z3950_build_query(mp::odr &odr_en, Z_Query *z_query, 
+                                            const SRW_query &query, 
+                                            SRW_query_type query_type) const
+{        
+    if (query_type == Z_SRW_query_type_cql)
+    {
+        Z_External *ext = (Z_External *) 
+            odr_malloc(odr_en, sizeof(*ext));
+        ext->direct_reference = 
+            odr_getoidbystr(odr_en, "1.2.840.10003.16.2");
+        ext->indirect_reference = 0;
+        ext->descriptor = 0;
+        ext->which = Z_External_CQL;
+        ext->u.cql = const_cast<char *>(query.cql);
+        
+        z_query->which = Z_Query_type_104;
+        z_query->u.type_104 =  ext;
+        return true;
+    }
+
+    if (query_type == Z_SRW_query_type_pqf)
+    {
+        Z_RPNQuery *RPNquery;
+        YAZ_PQF_Parser pqf_parser;
+        
+        pqf_parser = yaz_pqf_create ();
+        
+        RPNquery = yaz_pqf_parse (pqf_parser, odr_en, query.pqf);
+        if (!RPNquery)
+        {
+            std::cout << "TODO: Handeling of bad PQF\n";
+            std::cout << "TODO: Diagnostic to be send\n";
+        }
+        z_query->which = Z_Query_type_1;
+        z_query->u.type_1 =  RPNquery;
+        
+        yaz_pqf_destroy(pqf_parser);
+        return true;
+    }
+    return false;
+}
+
+
+std::string 
+yf::SRUtoZ3950::Rep::sru_protocol(const Z_HTTP_Request &http_req) const
+{
+    const std::string mime_urlencoded("application/x-www-form-urlencoded");
+    const std::string mime_text_xml("text/xml");
+    const std::string mime_soap_xml("application/soap+xml");
+
+    const std::string http_method(http_req.method);
+    const std::string http_type 
+        =  http_header_value(http_req.headers, "Content-Type");
+
+    if (http_method == "GET")
+        return "SRU GET";
+
+    if (http_method == "POST"
+              && http_type  == mime_urlencoded)
+        return "SRU POST";
+    
+    if ( http_method == "POST"
+         && (http_type  == mime_text_xml
+             || http_type  == mime_soap_xml))
+        return "SRU SOAP";
+
+    return "HTTP";
+}
+
+std::string 
+yf::SRUtoZ3950::Rep::debug_http(const Z_HTTP_Request &http_req) const
+{
+    std::string message("<html>\n<body>\n<h1>"
+                        "Metaproxy SRUtoZ3950 filter"
+                        "</h1>\n");
+    
+    message += "<h3>HTTP Info</h3><br/>\n";
+    message += "<p>\n";
+    message += "<b>Method: </b> " + std::string(http_req.method) + "<br/>\n";
+    message += "<b>Version:</b> " + std::string(http_req.version) + "<br/>\n";
+    message += "<b>Path:   </b> " + std::string(http_req.path) + "<br/>\n";
+
+    message += "<b>Content-Type:</b>"
+        + http_header_value(http_req.headers, "Content-Type")
+        + "<br/>\n";
+    message += "<b>Content-Length:</b>"
+        + http_header_value(http_req.headers, "Content-Length")
+        + "<br/>\n";
+    message += "</p>\n";    
+    
+    message += "<h3>Headers</h3><br/>\n";
+    message += "<p>\n";    
+    Z_HTTP_Header* header = http_req.headers;
+    while (header){
+        message += "<b>Header: </b> <i>" 
+            + std::string(header->name) + ":</i> "
+            + std::string(header->value) + "<br/>\n";
+        header = header->next;
+    }
+    message += "</p>\n";    
+    message += "</body>\n</html>\n";
+    return message;
+}
+
+void yf::SRUtoZ3950::Rep::http_response(metaproxy_1::Package &package, 
+                                        const std::string &content, 
+                                        int http_code) const
+{
+
+    Z_GDU *zgdu_req = package.request().get(); 
     Z_GDU *zgdu_res = 0; 
-    metaproxy_1::odr odr; 
+    mp::odr odr;
     zgdu_res 
        = odr.create_HTTP_Response(package.session(), 
-                                  zgdu_req->u.HTTP_Request, 200);
-
-    //zgdu_res->u.HTTP_Response->content_len = message.str().size();
-    //zgdu_res->u.HTTP_Response->content_buf 
-    //    = (char*) odr_malloc(odr, zgdu_res->u.HTTP_Response->content_len);
-
-    //strncpy(zgdu_res->u.HTTP_Response->content_buf, 
-    //        message.str().c_str(),  zgdu_res->u.HTTP_Response->content_len);
+                                  zgdu_req->u.HTTP_Request, 
+                                  http_code);
+        
+    zgdu_res->u.HTTP_Response->content_len = content.size();
+    zgdu_res->u.HTTP_Response->content_buf 
+        = (char*) odr_malloc(odr, zgdu_res->u.HTTP_Response->content_len);
+    
+    strncpy(zgdu_res->u.HTTP_Response->content_buf, 
+            content.c_str(),  zgdu_res->u.HTTP_Response->content_len);
     
-        // z_HTTP_header_add(o, &hres->headers,
-        //            "Content-Type", content_type.c_str());
+    //z_HTTP_header_add(odr, &hres->headers,
+    //                  "Content-Type", content_type.c_str());
     package.response() = zgdu_res;
-
 }
 
+
+
+
 static mp::filter::Base* filter_creator()
 {
     return new mp::filter::SRUtoZ3950;