#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 *)
for (; it != fset->results.end(); it++)
{
- if (schema && !strcmp(esn->u.generic, it->conf->schema.c_str()))
- break;
if (yaz_sparql_lookup_schema(it->conf->s, schema))
{
uri_lookup = true;
break;
}
+ if (!schema || !strcmp(esn->u.generic, it->conf->schema.c_str()))
+ break;
}
if (it == fset->results.end())
{
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;