X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Futil.hpp;h=ad2b7e468c72bb196d2c3ca44966cd905471ae73;hb=ea0a0e72e69c954962d25f92522bf0eb20281ec5;hp=45add313aa3253163b8be4b28001d3c15461517f;hpb=743341841a21a695d08c99b27a30329119030db5;p=metaproxy-moved-to-github.git

diff --git a/src/util.hpp b/src/util.hpp
index 45add31..ad2b7e4 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,44 +1,83 @@
-/* $Id: util.hpp,v 1.11 2006-01-20 22:38:12 marc Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: util.hpp,v 1.21 2006-10-03 07:57:40 marc Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #ifndef YP2_UTIL_HPP
 #define YP2_UTIL_HPP
 
+#include "package.hpp"
+
 #include <yaz/z-core.h>
-#include <string>
-#include <list>
 
 #include <boost/utility.hpp>
+#include <boost/scoped_ptr.hpp>
 
-#include "package.hpp"
+#include <list>
+#include <vector>
+#include <sstream>
+#include <string>
 
-namespace yp2 {
+
+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();
+        };
+
+        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);
+
+        void transfer_referenceId(ODR odr, const Z_APDU *src, Z_APDU *dst);
 
-        Z_APDU *create_APDU(ODR odr, int type, Z_APDU *in_apdu);
+        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::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);
 
@@ -58,23 +97,33 @@ 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;
     };
-        
+
+    class PlainFile {
+        class Rep;
+        boost::scoped_ptr<Rep> m_p;
+    public:
+        PlainFile();
+        ~PlainFile();
+        bool open(const std::string &fname);
+        bool getline(std::vector<std::string> &args);
+    };
 }
 #endif
 /*