-/* $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-2011 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"
+#include <metaproxy/util.hpp>
#include <yaz/odr.h>
#include <yaz/pquery.h>
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)
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());
}
}
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,
zget_init_diagnostics(m_odr, error, addinfo);
*apdu->u.initResponse->result = 0;
}
+ apdu->u.initResponse->implementationName =
+ odr_prepend(m_odr, "Metaproxy",
+ apdu->u.initResponse->implementationName);
+ apdu->u.initResponse->implementationVersion =
+ odr_prepend(m_odr,
+ VERSION, apdu->u.initResponse->implementationVersion);
+
return 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
*/
+