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

diff --git a/src/util.hpp b/src/util.hpp
index 45add31..e985a40 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,7 +1,7 @@
-/* $Id: util.hpp,v 1.11 2006-01-20 22:38:12 marc Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: util.hpp,v 1.17 2006-06-19 23:54:02 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #ifndef YP2_UTIL_HPP
@@ -10,20 +10,27 @@
 #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 {
+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_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);
@@ -58,23 +65,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
 /*