X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Futil.cpp;h=6482063ce92fdb6d483cb389ddf804a25fbde359;hb=d0123337d70b0fb97b578cc57467bb94980f1014;hp=f0ea1d6da360b57a645bda9c05904e4e1c9b0de9;hpb=219ffa015c0e35b03fae0788b0e8e6abcfde1a81;p=metaproxy-moved-to-github.git

diff --git a/src/util.cpp b/src/util.cpp
index f0ea1d6..6482063 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,8 +1,20 @@
-/* $Id: util.cpp,v 1.27 2007-04-13 09:57:51 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2009 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
+*/
 
 #include "config.hpp"
 #include "util.hpp"
@@ -292,15 +304,12 @@ int mp_util::get_or_remove_vhost_otherinfo(
     std::list<std::string> &vhosts)
 {
     int cat;
-    const int *oid_proxy = yaz_string_to_oid(yaz_oid_std(),
-                                             CLASS_USERINFO,
-                                             OID_STR_PROXY);
     for (cat = 1; ; cat++)
     {
         // check virtual host
         const char *vhost =
             yaz_oi_get_string_oid(otherInformation,
-                                  oid_proxy,
+                                  yaz_oid_userinfo_proxy,
                                   cat /* categoryValue */,
                                   remove_flag /* delete flag */);
         if (!vhost)
@@ -332,14 +341,10 @@ void mp_util::set_vhost_otherinfo(
     int cat;
     std::list<std::string>::const_iterator it = vhosts.begin();
 
-    const int *oid_proxy = yaz_string_to_oid(yaz_oid_std(),
-                                             CLASS_USERINFO,
-                                             OID_STR_PROXY);
-
     for (cat = 1; it != vhosts.end() ; cat++, it++)
     {
         yaz_oi_set_string_oid(otherInformation, odr,
-                              oid_proxy, cat, it->c_str());
+                              yaz_oid_userinfo_proxy, cat, it->c_str());
     }
 }
 
@@ -347,12 +352,8 @@ void mp_util::set_vhost_otherinfo(
     Z_OtherInformation **otherInformation, ODR odr,
     const std::string vhost, const int cat)
 {
-    const int *oid_proxy = yaz_string_to_oid(yaz_oid_std(),
-                                             CLASS_USERINFO,
-                                             OID_STR_PROXY);
-
     yaz_oi_set_string_oid(otherInformation, odr,
-                          oid_proxy, cat, vhost.c_str());
+                          yaz_oid_userinfo_proxy, cat, vhost.c_str());
 }
 
 void mp_util::split_zurl(std::string zurl, std::string &host,
@@ -632,8 +633,9 @@ Z_ReferenceId **mp_util::get_referenceId(const Z_APDU *apdu)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+