projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Odr_oid for OIDs. Requires YAZ 3.0.2
[metaproxy-moved-to-github.git]
/
src
/
util.cpp
diff --git
a/src/util.cpp
b/src/util.cpp
index
c92fc0b
..
c615811
100644
(file)
--- a/
src/util.cpp
+++ b/
src/util.cpp
@@
-1,5
+1,5
@@
-/* $Id: util.cpp,v 1.23 2006-10-04 14:04:00 marc Exp $
- Copyright (c) 2005-2006, Index Data.
+/* $Id: util.cpp,v 1.28 2007-04-16 21:54:52 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
See the LICENSE file for details
*/
See the LICENSE file for details
*/
@@
-10,7
+10,8
@@
#include <yaz/odr.h>
#include <yaz/pquery.h>
#include <yaz/otherinfo.h>
#include <yaz/odr.h>
#include <yaz/pquery.h>
#include <yaz/otherinfo.h>
-#include <yaz/querytowrbuf.h> // for yaz_query_to_wrbuf()
+#include <yaz/querytowrbuf.h>
+#include <yaz/oid_db.h>
#include <iostream>
#include <iostream>
@@
-215,7
+216,7
@@
std::string mp_util::zQueryToString(Z_Query *query)
query_str = std::string(wrbuf_buf(w), wrbuf_len(w));
// destroy wrbuf
query_str = std::string(wrbuf_buf(w), wrbuf_len(w));
// destroy wrbuf
- wrbuf_free(w, 1);
+ wrbuf_destroy(w);
}
}
}
}
@@
-295,10
+296,10
@@
int mp_util::get_or_remove_vhost_otherinfo(
{
// check virtual host
const char *vhost =
{
// check virtual host
const char *vhost =
- yaz_oi_get_string_oidval(otherInformation,
- VAL_PROXY,
- cat /* categoryValue */,
- remove_flag /* delete flag */);
+ yaz_oi_get_string_oid(otherInformation,
+ yaz_oid_userinfo_proxy,
+ cat /* categoryValue */,
+ remove_flag /* delete flag */);
if (!vhost)
break;
vhosts.push_back(std::string(vhost));
if (!vhost)
break;
vhosts.push_back(std::string(vhost));
@@
-327,15
+328,24
@@
void mp_util::set_vhost_otherinfo(
{
int cat;
std::list<std::string>::const_iterator it = vhosts.begin();
{
int cat;
std::list<std::string>::const_iterator it = vhosts.begin();
+
for (cat = 1; it != vhosts.end() ; cat++, it++)
{
for (cat = 1; it != vhosts.end() ; cat++, it++)
{
- yaz_oi_set_string_oidval(otherInformation, odr,
- VAL_PROXY, cat, it->c_str());
+ yaz_oi_set_string_oid(otherInformation, odr,
+ yaz_oid_userinfo_proxy, cat, it->c_str());
}
}
}
}
+void mp_util::set_vhost_otherinfo(
+ Z_OtherInformation **otherInformation, ODR odr,
+ const std::string vhost, const int cat)
+{
+ yaz_oi_set_string_oid(otherInformation, odr,
+ yaz_oid_userinfo_proxy, cat, vhost.c_str());
+}
+
void mp_util::split_zurl(std::string zurl, std::string &host,
void mp_util::split_zurl(std::string zurl, std::string &host,
- std::list<std::string> &db)
+ std::list<std::string> &db)
{
const char *zurl_cstr = zurl.c_str();
const char *sep = strchr(zurl_cstr, '/');
{
const char *zurl_cstr = zurl.c_str();
const char *sep = strchr(zurl_cstr, '/');