/* This file is part of Metaproxy.
- Copyright (C) 2005-2011 Index Data
+ Copyright (C) 2005-2012 Index Data
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
#include <boost/shared_ptr.hpp>
#include <metaproxy/util.hpp>
-#include "torus.hpp"
#include <yaz/zgdu.h>
#include <yaz/otherinfo.h>
#include <yaz/diagbib1.h>
#include <yaz/match_glob.h>
+#include <yaz/query-charset.h>
#include <yaz/log.h>
#include <map>
std::list<std::string> m_targets;
std::string m_route;
public:
- std::string m_query_encoding;
+ std::string query_encoding;
};
struct VirtualDB::Backend {
mp::Session m_backend_session;
std::list<std::string> m_frontend_databases;
std::list<std::string> m_targets;
std::string m_route;
+ std::string query_encoding;
bool m_named_result_sets;
int m_number_of_sets;
};
boost::condition m_cond_session_ready;
std::map<mp::Session, FrontendPtr> m_clients;
bool pass_vhosts;
- mp::Torus torus;
};
}
}
// see if we have a route conflict.
if (!first_route && b->m_route != map_it->m_route)
{
- // we have a conflict..
+ // we have a conflict.. routing must be same for all
error_code = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
BackendPtr ptr;
return ptr;
}
b->m_route = map_it->m_route;
+ if (!first_route && b->query_encoding != map_it->query_encoding)
+ {
+ // we have a conflict. query encoding must be same for all
+ error_code = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
+ BackendPtr ptr;
+ return ptr;
+ }
+ b->query_encoding = map_it->query_encoding;
first_route = false;
}
return b;
// we hope to get an init response
error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
if (gdu && gdu->which == Z_GDU_Z3950
- && gdu->u.z3950->which == Z_APDU_initResponse
- && *gdu->u.z3950->u.initResponse->result)
+ && gdu->u.z3950->which == Z_APDU_initResponse)
{
Z_InitResponse *res = gdu->u.z3950->u.initResponse;
if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
&req->databaseNames);
}
+ if (b->query_encoding.length() &&
+ (req->query->which == Z_Query_type_1 ||
+ req->query->which == Z_Query_type_101))
+ {
+ yaz_iconv_t cd = yaz_iconv_open(b->query_encoding.c_str(), "UTF-8");
+ if (cd)
+ {
+ int r = yaz_query_charset_convert_rpnquery_check(
+ req->query->u.type_1, odr, cd);
+ yaz_iconv_close(cd);
+ if (r)
+ yaz_log(YLOG_LOG, "query could not be converted");
+ }
+ }
*req->replaceIndicator = 1;
search_package.request() = yazpp_1::GDU(apdu_req);
}
}
-void yf::VirtualDB::Rep::refresh_torus(void)
-{
- xmlDoc *doc = torus.get_doc();
- if (!doc)
- return;
-
- xmlNode *ptr1 = xmlDocGetRootElement(doc);
- if (!ptr1)
- return ;
-
- for (ptr1 = ptr1->children; ptr1; ptr1 = ptr1->next)
- {
- if (ptr1->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) ptr1->name, "record"))
- {
- xmlNode *ptr2 = ptr1;
- for (ptr2 = ptr2->children; ptr2; ptr2 = ptr2->next)
- {
- if (ptr2->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) ptr2->name, "layer"))
- {
- std::string database;
- std::string target;
- std::string route;
- std::string solr;
- std::string query_encoding;
- xmlNode *ptr3 = ptr2;
- for (ptr3 = ptr3->children; ptr3; ptr3 = ptr3->next)
- {
- if (ptr3->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) ptr3->name, "id"))
- {
- database = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name, "zurl"))
- {
- target = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name, "sru"))
- {
- solr = mp::xml::get_text(ptr3);
- }
- else if (!strcmp((const char *) ptr3->name,
- "queryEncoding"))
- {
- query_encoding = mp::xml::get_text(ptr3);
- }
- }
- if (solr.length() == 0 &&
- database.length() && target.length())
- {
- VirtualDB::Map vmap(
- mp::util::database_name_normalize(database),
- target, route);
- vmap.m_query_encoding = query_encoding;
- m_maps.push_back(vmap);
- }
- }
- }
- }
- }
-}
yf::VirtualDB::Set::Set(BackendPtr b, std::string setname)
: m_backend(b), m_setname(setname)
&req->num_databaseNames,
&req->databaseNames);
}
+
+ if (b->query_encoding.length())
+ {
+ yaz_iconv_t cd = yaz_iconv_open(b->query_encoding.c_str(), "UTF-8");
+ if (cd)
+ {
+ yaz_query_charset_convert_apt(req->termListAndStartPoint, odr, cd);
+ yaz_iconv_close(cd);
+ }
+ }
+
scan_package.request() = yazpp_1::GDU(apdu_req);
scan_package.move(b->m_route);
m_p->release_frontend(package);
}
-void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only)
+void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only,
+ const char *path)
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
continue;
if (!strcmp((const char *) ptr->name, "pass-vhosts"))
{
- m_p->pass_vhosts = mp::xml::get_bool(ptr->children, false);
+ m_p->pass_vhosts = mp::xml::get_bool(ptr, false);
}
else if (!strcmp((const char *) ptr->name, "virtual"))
{
VirtualDB::Map vmap(mp::util::database_name_normalize(database),
targets, route);
- vmap.m_query_encoding = query_encoding;
+ vmap.query_encoding = query_encoding;
m_p->m_maps.push_back(vmap);
}
- else if (!strcmp((const char *) ptr->name, "torus"))
- {
- std::string url;
- const struct _xmlAttr *attr;
- for (attr = ptr->properties; attr; attr = attr->next)
- {
- if (!strcmp((const char *) attr->name, "url"))
- url = mp::xml::get_text(attr->children);
- else
- throw mp::filter::FilterException(
- "Bad attribute " + std::string((const char *)
- attr->name));
- }
- m_p->torus.read_searchables(url);
- m_p->refresh_torus();
- }
else
{
throw mp::filter::FilterException
projects / metaproxy-moved-to-github.git / blobdiff