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

diff --git a/src/util.hpp b/src/util.hpp
index 45add31..f60e818 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,5 +1,5 @@
-/* $Id: util.hpp,v 1.11 2006-01-20 22:38:12 marc Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: util.hpp,v 1.14 2006-05-15 11:43:01 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
@@ -10,13 +10,16 @@
 #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  {
+        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);
@@ -69,12 +72,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
 /*