X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Futil.hpp;h=ba89bfd48b3048b227560459ab6b52824eebcac1;hb=e1c7fdb3e2ff41fb43ea3dd2c540b6d568dee851;hp=fa6f96b334fc3e4673a67be945417108ed8363da;hpb=b54482cdb759f092fcd07a9be4fdc8c28009b895;p=metaproxy-moved-to-github.git

diff --git a/src/util.hpp b/src/util.hpp
index fa6f96b..ba89bfd 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,7 +1,7 @@
-/* $Id: util.hpp,v 1.1 2005-10-26 18:53:49 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: util.hpp,v 1.18 2006-08-30 12:27:34 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #ifndef YP2_UTIL_HPP
@@ -9,9 +9,95 @@
 
 #include <yaz/z-core.h>
 #include <string>
-namespace yp2 {
-    struct util  {
-	static bool pqf(ODR odr, Z_APDU *apdu, const std::string &q);
+#include <list>
+#include <vector>
+
+#include <boost/utility.hpp>
+#include <boost/scoped_ptr.hpp>
+#include "package.hpp"
+
+namespace metaproxy_1 {
+    namespace util  {
+        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(const Z_APDU *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);
+        
+        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);
+
+        void get_default_diag(Z_DefaultDiagFormat *r,
+                              int &error_code, std::string &addinfo);
+
+        void piggyback(int smallSetUpperBound,
+                       int largeSetLowerBound,
+                       int mediumSetPresentNumber,
+                       int result_set_size,
+                       int &number_to_present);
+    };
+
+    class odr : public boost::noncopyable {
+    public:
+        odr(int type);
+        odr();
+        ~odr();
+        operator ODR() const;
+        Z_APDU *create_close(const Z_APDU *in_apdu, 
+                             int reason, const char *addinfo);
+        Z_APDU *create_initResponse(const Z_APDU *in_apdu, 
+                                    int error, const char *addinfo);
+        Z_APDU *create_searchResponse(const Z_APDU *in_apdu,
+                                      int error, const char *addinfo);
+        Z_APDU *create_presentResponse(const Z_APDU *in_apdu,
+                                       int error, const char *addinfo);
+        Z_APDU *create_scanResponse(const Z_APDU *in_apdu,
+                                    int error, const char *addinfo);
+        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