X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Futil.hpp;h=ee920f12a46abbc12d93db6224563d9bbcd0d133;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=f610ce5b1049f7ccc235c0b34eea9e204ad005e7;hpb=1751782d8e3c9d4574754463ffd43373cf92133a;p=metaproxy-moved-to-github.git

diff --git a/src/util.hpp b/src/util.hpp
index f610ce5..ee920f1 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,5 +1,5 @@
-/* $Id: util.hpp,v 1.10 2006-01-19 21:43:51 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: util.hpp,v 1.13 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
@@ -10,29 +10,39 @@
 #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  {
 	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);
 
@@ -60,12 +70,21 @@ namespace yp2 {
         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(yp2::Session &session,
+        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
 /*