X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Futil.hpp;h=84bf3ef3701fbe00a5517a2fb619511dc81db273;hb=637a685d61a9ff0e3f398a59da426979815c4d68;hp=5b81d04b1ad7ad377fe09438b37790a04c2c8c47;hpb=f47e8cf4cde2ba5465106e219c803e6424a4f177;p=metaproxy-moved-to-github.git

diff --git a/src/util.hpp b/src/util.hpp
index 5b81d04..84bf3ef 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,45 +1,106 @@
-/* $Id: util.hpp,v 1.12 2006-01-25 11:27:19 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: util.hpp,v 1.25 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+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.
  */
 
 #ifndef YP2_UTIL_HPP
 #define YP2_UTIL_HPP
 
+#include "package.hpp"
+
 #include <yaz/z-core.h>
-#include <string>
-#include <list>
-#include <vector>
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
-#include "package.hpp"
 
-namespace yp2 {
+#include <list>
+#include <vector>
+#include <sstream>
+#include <string>
+
+
+namespace metaproxy_1 {
     namespace util  {
+
+        
+        template<typename T> 
+        std::string to_string(const T& t)
+        {
+            std::ostringstream o;
+            if(o << t)
+                return o.str();    
+            return std::string();
+        };
+
+        const char * 
+        record_composition_to_esn(Z_RecordComposition *comp);
+
+        std::string http_header_value(const Z_HTTP_Header* header, 
+                                               const std::string name);
+
+        std::string http_headers_debug(const Z_HTTP_Request &http_req);        
+
+        void http_response(metaproxy_1::Package &package, 
+                           const std::string &content, 
+                           int http_code = 200);
+
+
+        int memcmp2(const void *buf1, int len1, const void *buf2, int len2);
+
+        std::string database_name_normalize(const std::string &s);
+
 	bool pqf(ODR odr, Z_APDU *apdu, const std::string &q);
 
         std::string zQueryToString(Z_Query *query);
 
-        Z_ReferenceId **get_referenceId(Z_APDU *apdu);
+        Z_ReferenceId **get_referenceId(const Z_APDU *apdu);
 
-        Z_APDU *create_APDU(ODR odr, int type, Z_APDU *in_apdu);
+        void transfer_referenceId(ODR odr, const Z_APDU *src, Z_APDU *dst);
+
+        Z_APDU *create_APDU(ODR odr, int type, const Z_APDU *in_apdu);
 
         bool set_databases_from_zurl(ODR odr, std::string zurl,
                                      int *db_num, char ***db_strings);
 
         void split_zurl(std::string zurl, std::string &host,
                         std::list<std::string> &db);
-
-        int get_vhost_otherinfo(Z_OtherInformation **otherInformation,
-                                bool remove_flag,
-                                std::list<std::string> &vhosts);
+        
+        void get_vhost_otherinfo(Z_OtherInformation *otherInformation,
+                                 std::list<std::string> &vhosts);
+        
+        int remove_vhost_otherinfo(Z_OtherInformation **otherInformation,
+                                   std::list<std::string> &vhosts);
+
+        void set_vhost_otherinfo(Z_OtherInformation **otherInformation, 
+                                 ODR odr,
+                                 const std::string vhost, 
+                                 const int cat = 1 );
 
         void set_vhost_otherinfo(Z_OtherInformation **otherInformation,
                                  ODR odr,
                                  const std::list<std::string> &vhosts);
 
+        int get_or_remove_vhost_otherinfo(
+            Z_OtherInformation **otherInformation,
+            bool remove_flag,
+            std::list<std::string> &vhosts);
+
         void get_init_diagnostics(Z_InitResponse *res,
                                   int &error_code, std::string &addinfo);
 
@@ -59,18 +120,19 @@ namespace yp2 {
         odr();
         ~odr();
         operator ODR() const;
-        Z_APDU *create_close(Z_APDU *in_apdu, 
+        Z_APDU *create_close(const Z_APDU *in_apdu, 
                              int reason, const char *addinfo);
-        Z_APDU *create_initResponse(Z_APDU *in_apdu, 
+        Z_APDU *create_initResponse(const Z_APDU *in_apdu, 
                                     int error, const char *addinfo);
-        Z_APDU *create_searchResponse(Z_APDU *in_apdu,
+        Z_APDU *create_searchResponse(const Z_APDU *in_apdu,
                                       int error, const char *addinfo);
-        Z_APDU *create_presentResponse(Z_APDU *in_apdu,
+        Z_APDU *create_presentResponse(const Z_APDU *in_apdu,
                                        int error, const char *addinfo);
-        Z_APDU *create_scanResponse(Z_APDU *in_apdu,
+        Z_APDU *create_scanResponse(const Z_APDU *in_apdu,
                                     int error, const char *addinfo);
-        Z_APDU *create_APDU(int type, Z_APDU *in_apdu);
-        Z_GDU *create_HTTP_Response(yp2::Session &session,
+        Z_APDU *create_APDU(int type, const Z_APDU *in_apdu);
+
+        Z_GDU *create_HTTP_Response(metaproxy_1::Session &session,
                                     Z_HTTP_Request *req, int code);
     private:
         ODR m_odr;