#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <yaz/ccl_xml.h>
+#include <yaz/ccl.h>
+#include <yaz/rpn2cql.h>
+#include <yaz/pquery.h>
#include <yaz/cql.h>
#include <yaz/oid_db.h>
#include <yaz/diagbib1.h>
void connect(std::string zurl, int *error, const char **addinfo);
void search_pqf(const char *pqf, Odr_int *hits,
int *error, const char **addinfo);
+ void search_cql(const char *cql, Odr_int *hits,
+ int *error, const char **addinfo);
void present(Odr_int start, Odr_int number, ZOOM_record *recs,
int *error, const char **addinfo);
void set_option(const char *name, const char *value);
+ const char *get_option(const char *name);
int get_error(const char **addinfo);
};
class Zoom::Frontend : boost::noncopyable {
*hits = 0;
}
+void yf::Zoom::Backend::search_cql(const char *cql, Odr_int *hits,
+ int *error, const char **addinfo)
+{
+ ZOOM_query q = ZOOM_query_create();
+
+ ZOOM_query_cql(q, cql);
+
+ m_resultset = ZOOM_connection_search(m_connection, q);
+ ZOOM_query_destroy(q);
+ *error = ZOOM_connection_error(m_connection, 0, addinfo);
+ if (*error == 0)
+ *hits = ZOOM_resultset_size(m_resultset);
+ else
+ *hits = 0;
+}
+
void yf::Zoom::Backend::present(Odr_int start, Odr_int number,
ZOOM_record *recs,
int *error, const char **addinfo)
ZOOM_resultset_option_set(m_resultset, name, value);
}
+const char *yf::Zoom::Backend::get_option(const char *name)
+{
+ return ZOOM_connection_option_get(m_connection, name);
+}
+
int yf::Zoom::Backend::get_error(const char **addinfo)
{
return ZOOM_connection_error(m_connection, 0, addinfo);
"Bad attribute " + std::string((const char *)
attr->name));
}
- if (ccl_field.length() && cql_field.length())
+ if (cql_field.length())
fieldmap[cql_field] = ccl_field;
}
else if (!strcmp((const char *) ptr->name, "records"))
if (m_backend && m_backend->m_frontend_database == database)
return m_backend;
- xmlDoc *doc = mp::get_searchable(m_p->torus_url, database);
+ bool db_args = false;
+ std::string torus_db;
+ size_t db_arg_pos = database.find(',');
+ if (db_arg_pos != std::string::npos)
+ {
+ torus_db = database.substr(0, db_arg_pos);
+ db_args = true;
+ }
+ else
+ torus_db = database;
+
+ xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db);
if (!doc)
{
*error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
{
url = sptr->target;
}
- if (cf_parm.length())
+ if (cf_parm.length() && !db_args)
{
url += "," + cf_parm;
}
+ yaz_log(YLOG_LOG, "url=%s", url.c_str());
b->connect(url, error, addinfo);
if (*error == 0)
{
it = fieldmap.find(cn->u.st.index);
if (it == fieldmap.end())
return cn;
- cn->u.st.index = odr_strdup(odr, it->second.c_str());
+ if (it->second.length())
+ cn->u.st.index = odr_strdup(odr, it->second.c_str());
+ else
+ cn->u.st.index = 0;
}
break;
case CQL_NODE_BOOL:
assert(pqf_wrbuf == 0);
int cerror, cpos;
struct ccl_rpn_node *cn;
+ yaz_log(YLOG_LOG, "CCL: %s", wrbuf_cstr(ccl_wrbuf));
cn = ccl_find_str(b->sptr->ccl_bibset, wrbuf_cstr(ccl_wrbuf),
&cerror, &cpos);
wrbuf_destroy(ccl_wrbuf);
}
assert(pqf_wrbuf);
- b->search_pqf(wrbuf_cstr(pqf_wrbuf), &hits, &error, &addinfo);
+ if (b->get_option("sru"))
+ {
+ cql_transform_t cqlt = cql_transform_create();
+ Z_RPNQuery *zquery;
+ WRBUF wrb = wrbuf_alloc();
+ int status;
+
+ zquery = p_query_rpn(odr, wrbuf_cstr(pqf_wrbuf));
+ status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery);
+
+ cql_transform_close(cqlt);
+
+ if (status == 0)
+ {
+ yaz_log(YLOG_LOG, "search CQL: %s", wrbuf_cstr(wrb));
+ b->search_cql(wrbuf_cstr(wrb), &hits, &error, &addinfo);
+ }
+
+ wrbuf_destroy(wrb);
+ wrbuf_destroy(pqf_wrbuf);
+ if (status)
+ {
+ apdu_res =
+ odr.create_searchResponse(apdu_req, YAZ_BIB1_MALFORMED_QUERY,
+ "can not convert from RPN to CQL");
+ package.response() = apdu_res;
+ return;
+ }
+ }
+ else
+ {
+ yaz_log(YLOG_LOG, "search PQF: %s", wrbuf_cstr(pqf_wrbuf));
+ b->search_pqf(wrbuf_cstr(pqf_wrbuf), &hits, &error, &addinfo);
+ wrbuf_destroy(pqf_wrbuf);
+ }
- wrbuf_destroy(pqf_wrbuf);
const char *element_set_name = 0;
Odr_int number_to_present = 0;