X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Futil.hpp;h=e63b9eabd1aa3fceccb4398e83b8a6a4bf93ac45;hb=e9530d6289df9b848e4901d7c73f5a2f27706d66;hp=fbdd367dfd841cfb590d7ce56a2413fc09d69ff9;hpb=c93d8c8db5ae24e01775060677f8e8e9c2afff34;p=metaproxy-moved-to-github.git

diff --git a/src/util.hpp b/src/util.hpp
index fbdd367..e63b9ea 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,8 +1,20 @@
-/* $Id: util.hpp,v 1.19 2006-09-29 08:42:47 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 Index Data
 
-   See the LICENSE file for details
- */
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #ifndef YP2_UTIL_HPP
 #define YP2_UTIL_HPP
@@ -14,7 +26,6 @@
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#include <string>
 #include <list>
 #include <vector>
 #include <sstream>
@@ -34,9 +45,19 @@ namespace metaproxy_1 {
             return std::string();
         };
 
+        const char * 
+        record_composition_to_esn(Z_RecordComposition *comp);
+
         std::string http_header_value(const Z_HTTP_Header* header, 
                                                const std::string name);
 
+        std::string http_headers_debug(const Z_HTTP_Request &http_req);        
+
+        void http_response(metaproxy_1::Package &package, 
+                           const std::string &content, 
+                           int http_code = 200);
+
+
         int memcmp2(const void *buf1, int len1, const void *buf2, int len2);
 
         std::string database_name_normalize(const std::string &s);
@@ -63,6 +84,11 @@ namespace metaproxy_1 {
         int remove_vhost_otherinfo(Z_OtherInformation **otherInformation,
                                    std::list<std::string> &vhosts);
 
+        void set_vhost_otherinfo(Z_OtherInformation **otherInformation, 
+                                 ODR odr,
+                                 const std::string vhost, 
+                                 const int cat);
+
         void set_vhost_otherinfo(Z_OtherInformation **otherInformation,
                                  ODR odr,
                                  const std::list<std::string> &vhosts);