X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Futil.cpp;h=8bb34f972460f46d5b6ac89c8e77a222fc28cf6a;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=15aa7aea4ffb7be59ba8ba4b5bd5e9d2f1161c66;hpb=33243335d807707f1ae5eb0468cc74b574eb4b69;p=metaproxy-moved-to-github.git

diff --git a/src/util.cpp b/src/util.cpp
index 15aa7ae..8bb34f9 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,5 +1,5 @@
-/* $Id: util.cpp,v 1.9 2006-01-17 17:55:40 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: util.cpp,v 1.14 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
@@ -9,9 +9,14 @@
 #include <yaz/odr.h>
 #include <yaz/pquery.h>
 #include <yaz/otherinfo.h>
+#include <yaz/querytowrbuf.h> // for yaz_query_to_wrbuf()
 #include "util.hpp"
 
-void yp2::util::piggyback(int smallSetUpperBound,
+//#include <iostream>
+
+namespace mp = metaproxy_1;
+
+void mp::util::piggyback(int smallSetUpperBound,
                           int largeSetLowerBound,
                           int mediumSetPresentNumber,
                           int result_set_size,
@@ -38,7 +43,8 @@ void yp2::util::piggyback(int smallSetUpperBound,
     }
 }
 
-bool yp2::util::pqf(ODR odr, Z_APDU *apdu, const std::string &q) {
+
+bool mp::util::pqf(ODR odr, Z_APDU *apdu, const std::string &q) {
     YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
     
     Z_RPNQuery *rpn = yaz_pqf_parse(pqf_parser, odr, q.c_str());
@@ -56,7 +62,50 @@ bool yp2::util::pqf(ODR odr, Z_APDU *apdu, const std::string &q) {
     return true;
 }
 
-void yp2::util::get_default_diag(Z_DefaultDiagFormat *r,
+
+std::string mp::util::zQueryToString(Z_Query *query)
+{
+    std::string query_str = "";
+
+    if (query && query->which == Z_Query_type_1){
+        Z_RPNQuery *rpn = query->u.type_1;
+        
+        if (rpn){
+            
+            // allocate wrbuf (strings in YAZ!)
+            WRBUF w = wrbuf_alloc();
+            
+            // put query in w
+            yaz_rpnquery_to_wrbuf(w, rpn);
+            
+            // from w to std::string
+            query_str = std::string(wrbuf_buf(w), wrbuf_len(w));
+            
+            // destroy wrbuf
+            wrbuf_free(w, 1);
+        }
+    }
+
+#if 0
+    if (query && query->which == Z_Query_type_1){
+        
+        // allocate wrbuf (strings in YAZ!)
+        WRBUF w = wrbuf_alloc();
+        
+        // put query in w
+        yaz_query_to_wrbuf(w, query);
+        
+        // from w to std::string
+        query_str = std::string(wrbuf_buf(w), wrbuf_len(w));
+        
+        // destroy wrbuf
+        wrbuf_free(w, 1);
+    }    
+#endif
+    return query_str;
+}
+
+void mp::util::get_default_diag(Z_DefaultDiagFormat *r,
                                  int &error_code, std::string &addinfo)
 {
     error_code = *r->condition;
@@ -71,7 +120,7 @@ void yp2::util::get_default_diag(Z_DefaultDiagFormat *r,
     }
 }
 
-void yp2::util::get_init_diagnostics(Z_InitResponse *initrs,
+void mp::util::get_init_diagnostics(Z_InitResponse *initrs,
                                      int &error_code, std::string &addinfo)
 {
     Z_External *uif = initrs->userInformationField;
@@ -95,7 +144,7 @@ void yp2::util::get_init_diagnostics(Z_InitResponse *initrs,
                 {
                     Z_DiagnosticFormat_s *ds = diag->elements[0];
                     if (ds->which == Z_DiagnosticFormat_s_defaultDiagRec)
-                        yp2::util::get_default_diag(ds->u.defaultDiagRec,
+                        mp::util::get_default_diag(ds->u.defaultDiagRec,
                                                     error_code, addinfo);
                 }
             } 
@@ -103,7 +152,7 @@ void yp2::util::get_init_diagnostics(Z_InitResponse *initrs,
     }
 }
 
-int yp2::util::get_vhost_otherinfo(Z_OtherInformation **otherInformation,
+int mp::util::get_vhost_otherinfo(Z_OtherInformation **otherInformation,
                                    bool remove_flag,
                                    std::list<std::string> &vhosts)
 {
@@ -124,7 +173,20 @@ int yp2::util::get_vhost_otherinfo(Z_OtherInformation **otherInformation,
     return cat;
 }
 
-void yp2::util::split_zurl(std::string zurl, std::string &host,
+void mp::util::set_vhost_otherinfo(Z_OtherInformation **otherInformation,
+                                    ODR odr,
+                                    const std::list<std::string> &vhosts)
+{
+    int cat;
+    std::list<std::string>::const_iterator it = vhosts.begin();
+    for (cat = 1; it != vhosts.end() ; cat++, it++)
+    {
+        yaz_oi_set_string_oidval(otherInformation, odr,
+                                 VAL_PROXY, cat, it->c_str());
+    }
+}
+
+void mp::util::split_zurl(std::string zurl, std::string &host,
                            std::list<std::string> &db)
 {
     const char *zurl_cstr = zurl.c_str();
@@ -154,7 +216,7 @@ void yp2::util::split_zurl(std::string zurl, std::string &host,
     }
 }
 
-bool yp2::util::set_databases_from_zurl(ODR odr, std::string zurl,
+bool mp::util::set_databases_from_zurl(ODR odr, std::string zurl,
                                         int *db_num, char ***db_strings)
 {
     std::string host;
@@ -173,27 +235,27 @@ bool yp2::util::set_databases_from_zurl(ODR odr, std::string zurl,
     return true;
 }
 
-yp2::odr::odr(int type)
+mp::odr::odr(int type)
 {
     m_odr = odr_createmem(type);
 }
 
-yp2::odr::odr()
+mp::odr::odr()
 {
     m_odr = odr_createmem(ODR_ENCODE);
 }
 
-yp2::odr::~odr()
+mp::odr::~odr()
 {
     odr_destroy(m_odr);
 }
 
-yp2::odr::operator ODR() const
+mp::odr::operator ODR() const
 {
     return m_odr;
 }
 
-Z_APDU *yp2::odr::create_close(Z_APDU *in_apdu,
+Z_APDU *mp::odr::create_close(Z_APDU *in_apdu,
                                int reason, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_close, in_apdu);
@@ -204,20 +266,20 @@ Z_APDU *yp2::odr::create_close(Z_APDU *in_apdu,
     return apdu;
 }
 
-Z_APDU *yp2::odr::create_APDU(int type, Z_APDU *in_apdu)
+Z_APDU *mp::odr::create_APDU(int type, Z_APDU *in_apdu)
 {
-    return yp2::util::create_APDU(m_odr, type, in_apdu);
+    return mp::util::create_APDU(m_odr, type, in_apdu);
 }
 
-Z_APDU *yp2::util::create_APDU(ODR odr, int type, Z_APDU *in_apdu)
+Z_APDU *mp::util::create_APDU(ODR odr, int type, Z_APDU *in_apdu)
 {
     Z_APDU *out_apdu = zget_APDU(odr, type);
 
-    Z_ReferenceId **id_to = yp2::util::get_referenceId(out_apdu);
+    Z_ReferenceId **id_to = mp::util::get_referenceId(out_apdu);
     *id_to = 0;
     if (in_apdu)
     {
-        Z_ReferenceId **id_from = yp2::util::get_referenceId(in_apdu);
+        Z_ReferenceId **id_from = mp::util::get_referenceId(in_apdu);
         if (id_from && *id_from && id_to)
         {
             *id_to = (Z_ReferenceId*) odr_malloc (odr, sizeof(**id_to));
@@ -231,7 +293,7 @@ Z_APDU *yp2::util::create_APDU(ODR odr, int type, Z_APDU *in_apdu)
     return out_apdu;
 }
 
-Z_APDU *yp2::odr::create_initResponse(Z_APDU *in_apdu,
+Z_APDU *mp::odr::create_initResponse(Z_APDU *in_apdu,
                                       int error, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_initResponse, in_apdu);
@@ -244,7 +306,7 @@ Z_APDU *yp2::odr::create_initResponse(Z_APDU *in_apdu,
     return apdu;
 }
 
-Z_APDU *yp2::odr::create_searchResponse(Z_APDU *in_apdu,
+Z_APDU *mp::odr::create_searchResponse(Z_APDU *in_apdu,
                                         int error, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_searchResponse, in_apdu);
@@ -261,7 +323,7 @@ Z_APDU *yp2::odr::create_searchResponse(Z_APDU *in_apdu,
     return apdu;
 }
 
-Z_APDU *yp2::odr::create_presentResponse(Z_APDU *in_apdu,
+Z_APDU *mp::odr::create_presentResponse(Z_APDU *in_apdu,
                                          int error, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_presentResponse, in_apdu);
@@ -269,6 +331,7 @@ Z_APDU *yp2::odr::create_presentResponse(Z_APDU *in_apdu,
     {
         Z_Records *rec = (Z_Records *) odr_malloc(m_odr, sizeof(Z_Records));
         apdu->u.presentResponse->records = rec;
+        
         rec->which = Z_Records_NSD;
         rec->u.nonSurrogateDiagnostic =
             zget_DefaultDiagFormat(m_odr, error, addinfo);
@@ -277,28 +340,67 @@ Z_APDU *yp2::odr::create_presentResponse(Z_APDU *in_apdu,
     return apdu;
 }
 
-Z_APDU *yp2::odr::create_scanResponse(Z_APDU *in_apdu,
+Z_APDU *mp::odr::create_scanResponse(Z_APDU *in_apdu,
                                       int error, const char *addinfo)
 {
     Z_APDU *apdu = create_APDU(Z_APDU_scanResponse, in_apdu);
+    Z_ScanResponse *res = apdu->u.scanResponse;
+    res->entries = (Z_ListEntries *) odr_malloc(m_odr, sizeof(*res->entries));
+    res->entries->num_entries = 0;
+    res->entries->entries = 0;
+
     if (error)
     {
-        Z_ScanResponse *res = apdu->u.scanResponse;
-        res->entries = (Z_ListEntries *) odr_malloc(m_odr, sizeof(*res->entries));
         *res->scanStatus = Z_Scan_failure;
 
-        res->entries->num_entries = 0;
-        res->entries->entries = 0;
         res->entries->num_nonsurrogateDiagnostics = 1;
         res->entries->nonsurrogateDiagnostics = (Z_DiagRec **)
             odr_malloc(m_odr, sizeof(Z_DiagRec *));
         res->entries->nonsurrogateDiagnostics[0] = 
             zget_DiagRec(m_odr, error, addinfo);
     }
+    else
+    {
+        res->entries->num_nonsurrogateDiagnostics = 0;
+        res->entries->nonsurrogateDiagnostics = 0;
+    }
     return apdu;
 }
 
-Z_ReferenceId **yp2::util::get_referenceId(Z_APDU *apdu)
+Z_GDU *mp::odr::create_HTTP_Response(mp::Session &session,
+                                      Z_HTTP_Request *hreq, int code)
+{
+    const char *response_version = "1.0";
+    bool keepalive = false;
+    if (!strcmp(hreq->version, "1.0")) 
+    {
+        const char *v = z_HTTP_header_lookup(hreq->headers, "Connection");
+        if (v && !strcmp(v, "Keep-Alive"))
+            keepalive = true;
+        else
+            session.close();
+        response_version = "1.0";
+    }
+    else
+    {
+        const char *v = z_HTTP_header_lookup(hreq->headers, "Connection");
+        if (v && !strcmp(v, "close"))
+            session.close();
+        else
+            keepalive = true;
+        response_version = "1.1";
+    }
+
+    Z_GDU *gdu = z_get_HTTP_Response(m_odr, code);
+    Z_HTTP_Response *hres = gdu->u.HTTP_Response;
+    hres->version = odr_strdup(m_odr, response_version);
+    if (keepalive)
+        z_HTTP_header_add(m_odr, &hres->headers, "Connection", "Keep-Alive");
+    
+    return gdu;
+}
+
+Z_ReferenceId **mp::util::get_referenceId(Z_APDU *apdu)
 {
     switch (apdu->which)
     {