X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=src%2Futil.hpp;h=35eb7338eac3dfdb374178ae9e96e0d5767c30b3;hb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;hp=9918d45b642f07abea82b2a4893e1f4215788466;hpb=93d4dd6d4f9698c7aaa74cadb343a2da8ef8ff5a;p=metaproxy-moved-to-github.git

diff --git a/src/util.hpp b/src/util.hpp
index 9918d45..35eb733 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,7 +1,7 @@
-/* $Id: util.hpp,v 1.3 2005-10-30 18:51:21 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: util.hpp,v 1.16 2006-06-10 14:29:13 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #ifndef YP2_UTIL_HPP
@@ -9,12 +9,52 @@
 
 #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 {
-    struct util  {
-	static bool pqf(ODR odr, Z_APDU *apdu, const std::string &q);
+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(Z_APDU *apdu);
+
+        Z_APDU *create_APDU(ODR odr, int type, 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 set_vhost_otherinfo(Z_OtherInformation **otherInformation,
+                                 ODR odr,
+                                 const 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 {
@@ -23,12 +63,32 @@ namespace yp2 {
         odr();
         ~odr();
         operator ODR() const;
-        Z_APDU *create_close(int reason, const char *addinfo);
-        Z_APDU *create_initResponse(int error, const char *addinfo);
+        Z_APDU *create_close(Z_APDU *in_apdu, 
+                             int reason, const char *addinfo);
+        Z_APDU *create_initResponse(Z_APDU *in_apdu, 
+                                    int error, const char *addinfo);
+        Z_APDU *create_searchResponse(Z_APDU *in_apdu,
+                                      int error, const char *addinfo);
+        Z_APDU *create_presentResponse(Z_APDU *in_apdu,
+                                       int error, const char *addinfo);
+        Z_APDU *create_scanResponse(Z_APDU *in_apdu,
+                                    int error, const char *addinfo);
+        Z_APDU *create_APDU(int type, 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
 /*