public:
std::string db;
std::string uri;
+ std::string schema;
yaz_sparql_t s;
~Conf();
};
friend class Session;
Odr_int hits;
std::string db;
+ ConfPtr conf;
xmlDoc *doc;
};
class SPARQL::Session {
Z_APDU *apdu_req,
mp::odr &odr,
const char *sparql_query,
- const char *uri);
+ ConfPtr conf);
Z_Records *fetch(
FrontendSetPtr fset,
ODR odr, Odr_oid *preferredRecordSyntax,
conf->db = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "uri"))
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
throw mp::filter::FilterException(
"Bad attribute " + std::string((const char *)
{
xmlNode *ptr = xmlDocGetRootElement(doc);
Odr_int cur = 0;
- for (; ptr; ptr = ptr->next)
- if (ptr->type == XML_ELEMENT_NODE &&
- !strcmp((const char *) ptr->name, "sparql"))
- break;
- if (ptr)
+
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "RDF"))
{
- for (ptr = ptr->children; ptr; ptr = ptr->next)
- if (ptr->type == XML_ELEMENT_NODE &&
- !strcmp((const char *) ptr->name, "results"))
- break;
+ ptr = ptr->children;
+
+ while (ptr && ptr->type != XML_ELEMENT_NODE)
+ ptr = ptr->next;
+ if (ptr && ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "Description"))
+ {
+ xmlNode *p = ptr->children;
+
+ while (p && p->type != XML_ELEMENT_NODE)
+ p = p->next;
+ if (p && p->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) p->name, "type"))
+ { /* SELECT RESULT */
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "solution"))
+ {
+ if (cur++ == pos)
+ break;
+ }
+ }
+ else
+ { /* CONSTRUCT result */
+ for (; ptr; ptr = ptr->next)
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "Description"))
+ {
+ if (cur++ == pos)
+ break;
+ }
+ }
+ }
}
- if (ptr)
+ else
{
- for (ptr = ptr->children; ptr; ptr = ptr->next)
+ for (; ptr; ptr = ptr->next)
if (ptr->type == XML_ELEMENT_NODE &&
- !strcmp((const char *) ptr->name, "result"))
- {
- if (cur++ == pos)
+ !strcmp((const char *) ptr->name, "sparql"))
+ break;
+ if (ptr)
+ {
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "results"))
break;
- }
+ }
+ if (ptr)
+ {
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "result"))
+ {
+ if (cur++ == pos)
+ break;
+ }
+ }
}
if (sz)
*sz = cur;
int *number_returned, int *next_position)
{
Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records));
+ if (esn && esn->which == Z_ElementSetNames_generic &&
+ fset->conf->schema.length())
+ {
+ if (strcmp(esn->u.generic, fset->conf->schema.c_str()))
+ {
+ rec->which = Z_Records_NSD;
+ rec->u.nonSurrogateDiagnostic =
+ zget_DefaultDiagFormat(
+ odr,
+ YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_,
+ esn->u.generic);
+ return rec;
+ }
+ }
rec->which = Z_Records_DBOSD;
rec->u.databaseOrSurDiagnostics = (Z_NamePlusRecordList *)
odr_malloc(odr, sizeof(Z_NamePlusRecordList));
if (!node)
break;
assert(node->type == XML_ELEMENT_NODE);
- assert(!strcmp((const char *) node->name, "result"));
xmlNode *tmp = xmlCopyNode(node, 1);
xmlBufferPtr buf = xmlBufferCreate();
xmlNodeDump(buf, tmp->doc, tmp, 0, 0);
Z_APDU *apdu_req,
mp::odr &odr,
const char *sparql_query,
- const char *uri)
+ ConfPtr conf)
{
Z_SearchRequest *req = apdu_req->u.searchRequest;
Package http_package(package.session(), package.origin());
http_package.copy_filter(package);
- Z_GDU *gdu = z_get_HTTP_Request_uri(odr, uri, 0, 1);
+ Z_GDU *gdu = z_get_HTTP_Request_uri(odr, conf->uri.c_str(), 0, 1);
z_HTTP_header_add(odr, &gdu->u.HTTP_Request->headers,
"Content-Type", "application/x-www-form-urlencoded");
+ z_HTTP_header_add(odr, &gdu->u.HTTP_Request->headers,
+ "Accept", "application/sparql-results+xml,"
+ "application/rdf+xml");
const char *names[2];
names[0] = "query";
names[1] = 0;
fset->doc = xmlParseMemory(resp->content_buf, resp->content_len);
fset->db = req->databaseNames[0];
+ fset->conf = conf;
if (!fset->doc)
apdu_res = odr.create_searchResponse(apdu_req,
YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
else
{
apdu_res = run_sparql(package, apdu_req, odr,
- wrbuf_cstr(sparql_wr),
- (*it)->uri.c_str());
+ wrbuf_cstr(sparql_wr), *it);
}
wrbuf_destroy(addinfo_wr);
wrbuf_destroy(sparql_wr);