projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ca1d5a9
)
New setting query syntax: override with special query syntax
author
Dennis Schafroth
<dennis@indexdata.com>
Mon, 7 Mar 2011 14:44:27 +0000
(15:44 +0100)
committer
Dennis Schafroth
<dennis@indexdata.com>
Mon, 7 Mar 2011 14:44:27 +0000
(15:44 +0100)
src/client.c
patch
|
blob
|
history
diff --git
a/src/client.c
b/src/client.c
index
e2a363c
..
a30355b
100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-934,7
+934,7
@@
int client_parse_query(struct client *cl, const char *query)
const char *sru = session_setting_oneval(sdb, PZ_SRU);
const char *pqf_prefix = session_setting_oneval(sdb, PZ_PQF_PREFIX);
const char *pqf_strftime = session_setting_oneval(sdb, PZ_PQF_STRFTIME);
const char *sru = session_setting_oneval(sdb, PZ_SRU);
const char *pqf_prefix = session_setting_oneval(sdb, PZ_PQF_PREFIX);
const char *pqf_strftime = session_setting_oneval(sdb, PZ_PQF_STRFTIME);
-
+ const char *query_syntax = session_setting_oneval(sdb, PZ_QUERY_SYNTAX);
if (!ccl_map)
return -1;
if (!ccl_map)
return -1;
@@
-978,7
+978,11
@@
int client_parse_query(struct client *cl, const char *query)
cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf));
xfree(cl->cqlquery);
cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf));
xfree(cl->cqlquery);
- if (*sru)
+
+ /* Support for PQF on SRU targets.
+ * TODO Refactor */
+ yaz_log(YLOG_DEBUG, "Query syntax: %s", query_syntax);
+ if (strcmp(query_syntax, "pqf") != 0 && *sru)
{
if (!strcmp(sru, "solr")) {
if (!(cl->cqlquery = make_solrquery(cl)))
{
if (!strcmp(sru, "solr")) {
if (!(cl->cqlquery = make_solrquery(cl)))