#include <boost/scoped_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
+#include <boost/algorithm/string.hpp>
#include "sparql.h"
#include <yaz/zgdu.h>
conf->uri = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "schema"))
conf->schema = mp::xml::get_text(attr->children);
+ else if (!strcmp((const char *) attr->name, "include"))
+ {
+ std::vector<std::string> dbs;
+ std::string db = mp::xml::get_text(attr->children);
+ boost::split(dbs, db, boost::is_any_of(" \t"));
+ size_t i;
+ for (i = 0; i < dbs.size(); i++)
+ {
+ if (dbs[i].length() == 0)
+ continue;
+ std::list<ConfPtr>::const_iterator it = db_conf.begin();
+ while (1)
+ if (it == db_conf.end())
+ {
+ throw mp::filter::FilterException(
+ "include db not found: " + dbs[i]);
+ }
+ else if (dbs[i].compare((*it)->db) == 0)
+ {
+ yaz_sparql_include(s, (*it)->s);
+ break;
+ }
+ else
+ it++;
+ }
+ }
else
throw mp::filter::FilterException(
"Bad attribute " + std::string((const char *)
std::list<Result>::iterator it = fset->results.begin();
const char *schema = 0;
bool uri_lookup = false;
+ bool fetch_logged = false;
if (esn && esn->which == Z_ElementSetNames_generic)
schema = esn->u.generic;
{
if (n->type == XML_ELEMENT_NODE)
{
- if (!strcmp((const char *) n->name, "uri"))
+ //if (!strcmp((const char *) n->name, "uri"))
+ if (!strcmp((const char *) n->name, "uri") ||
+ !strcmp((const char *) n->name, "bnode") )
{
uri = mp::xml::get_text(n->children);
uri.c_str(), schema);
if (!error)
{
- yaz_log(YLOG_LOG, "query=%s", query.c_str());
+ if (!fetch_logged)
+ { // Log the fetch query only once
+ package.log("sparql", YLOG_LOG,
+ "fetch query: for %s \n%s",
+ uri.c_str(), query.c_str() );
+ fetch_logged = true;
+ }
+ else
+ {
+ package.log("sparql", YLOG_LOG,
+ "fetch uri:%s", uri.c_str() );
+ }
error = invoke_sparql(package, query.c_str(),
it->conf, w);
}
gdu->u.HTTP_Request->content_buf = path;
gdu->u.HTTP_Request->content_len = strlen(path);
- yaz_log(YLOG_LOG, "sparql: HTTP request\n%s", sparql_query);
+ yaz_log(YLOG_DEBUG, "sparql: HTTP request\n%s", sparql_query);
http_package.request() = gdu;
http_package.move();
}
else if (gdu_resp->u.HTTP_Response->code != 200)
{
+ Z_HTTP_Response *resp = gdu_resp->u.HTTP_Response;
wrbuf_printf(w, "sparql: HTTP error %d from backend",
- gdu_resp->u.HTTP_Response->code);
+ resp->code);
+ package.log("sparql", YLOG_LOG,
+ "HTTP error %d from backend ",
+ resp->code );
+ package.log("sparql", YLOG_LOG,
+ "%.*s" , resp->content_len, resp->content_buf );
return YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
}
Z_HTTP_Response *resp = gdu_resp->u.HTTP_Response;
Z_APDU *apdu_res = 0;
mp::wrbuf w;
+ package.log("sparql", YLOG_LOG,
+ "search query:\n%s", sparql_query );
+
int error = invoke_sparql(package, sparql_query, conf, w);
if (error)
{
result.doc = doc;
result.conf = conf;
fset->results.push_back(result);
- yaz_log(YLOG_LOG, "saving sparql result xmldoc=%p", doc);
+ yaz_log(YLOG_DEBUG, "saving sparql result xmldoc=%p", doc);
get_result(result.doc, &fset->hits, -1, 0);
m_frontend_sets[req->resultSetName] = fset;
fset->db = db;
it = m_sparql->db_conf.begin();
for (; it != m_sparql->db_conf.end(); it++)
- if (yaz_match_glob((*it)->db.c_str(), db.c_str()))
+ if ((*it)->schema.length() > 0
+ && yaz_match_glob((*it)->db.c_str(), db.c_str()))
{
mp::wrbuf addinfo_wr;
mp::wrbuf sparql_wr;