/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
#define SORT_STRATEGY_Z3950 0
#define SORT_STRATEGY_TYPE7 1
-#define SORT_STRATEGY_CQL 2
+#define SORT_STRATEGY_CQL 2
#define SORT_STRATEGY_SRU11 3
#define SORT_STRATEGY_EMBED 4
+#define SORT_STRATEGY_SOLR 5
struct ZOOM_query_p {
Z_Query *z_query;
wrbuf_puts(s->full_query, s->query_string);
odr_reset(s->odr_query);
- if (s->sort_spec && s->sort_strategy == SORT_STRATEGY_SRU11)
+ if (s->sort_spec && (s->sort_strategy == SORT_STRATEGY_SRU11 || s->sort_strategy == SORT_STRATEGY_SOLR))
{
- int r;
+ int r = 0;
wrbuf_rewind(s->sru11_sort_spec);
- r = yaz_sort_spec_to_srw_sortkeys(s->sort_spec,
- s->sru11_sort_spec);
+ switch (s->sort_strategy)
+ {
+ case SORT_STRATEGY_SRU11:
+ r = yaz_sort_spec_to_srw_sortkeys(s->sort_spec, s->sru11_sort_spec);
+ break;
+ case SORT_STRATEGY_SOLR:
+ r = yaz_sort_spec_to_solr_sortkeys(s->sort_spec, s->sru11_sort_spec);
+ break;
+ }
if (r)
return r;
}
s->z_query = (Z_Query *) odr_malloc(s->odr_query,
sizeof(*s->z_query));
s->z_query->which = Z_Query_type_1;
- s->z_query->u.type_1 =
+ s->z_query->u.type_1 =
p_query_rpn(s->odr_query, wrbuf_cstr(s->full_query));
if (!s->z_query->u.type_1)
{
ext->descriptor = 0;
ext->which = Z_External_CQL;
ext->u.cql = odr_strdup(s->odr_query, wrbuf_cstr(s->full_query));
-
+
s->z_query = (Z_Query *) odr_malloc(s->odr_query, sizeof(*s->z_query));
s->z_query->which = Z_Query_type_104;
s->z_query->u.type_104 = ext;
-
+
break;
}
}
return s->sort_strategy == SORT_STRATEGY_Z3950 ? s->sort_spec : 0;
}
-static void cql2pqf_wrbuf_puts(const char *buf, void *client_data)
+const char *ZOOM_query_get_query_string(ZOOM_query s)
{
- WRBUF wrbuf = (WRBUF) client_data;
- wrbuf_puts(wrbuf, buf);
+ return wrbuf_cstr(s->full_query);
}
-const char *ZOOM_query_get_query_string(ZOOM_query s)
+void ZOOM_query_get_hash(ZOOM_query s, WRBUF w)
{
- return wrbuf_cstr(s->full_query);
+ wrbuf_printf(w, "%d;", s->query_type);
+ if (s->query_string)
+ wrbuf_puts(w, s->query_string);
+ wrbuf_printf(w, ";%d;", s->sort_strategy);
+ if (s->sort_spec)
+ yaz_sort_spec_to_type7(s->sort_spec, w);
}
/*
}
cqlfile = ZOOM_connection_option_get(c, "cqlfile");
- if (cqlfile == 0)
+ if (cqlfile == 0)
{
ZOOM_set_error(c, ZOOM_ERROR_CQL_TRANSFORM, "no CQL transform file");
}
- else if ((trans = cql_transform_open_fname(cqlfile)) == 0)
+ else if ((trans = cql_transform_open_fname(cqlfile)) == 0)
{
- char buf[512];
+ char buf[512];
sprintf(buf, "can't open CQL transform file '%.200s': %.200s",
cqlfile, strerror(errno));
ZOOM_set_error(c, ZOOM_ERROR_CQL_TRANSFORM, buf);
}
- else
+ else
{
WRBUF wrbuf_result = wrbuf_alloc();
error = cql_transform(trans, cql_parser_result(parser),
- cql2pqf_wrbuf_puts, wrbuf_result);
+ wrbuf_vp_puts, wrbuf_result);
if (error != 0) {
char buf[512];
const char *addinfo;
error = cql_transform_error(trans, &addinfo);
- sprintf(buf, "%.200s (addinfo=%.200s)",
+ sprintf(buf, "%.200s (addinfo=%.200s)",
cql_strerror(error), addinfo);
ZOOM_set_error(c, ZOOM_ERROR_CQL_TRANSFORM, buf);
}
{
s->sort_strategy = SORT_STRATEGY_SRU11;
}
+ else if (!strcmp(strategy, "solr"))
+ {
+ s->sort_strategy = SORT_STRATEGY_SOLR;
+ }
else if (!strcmp(strategy, "embed"))
{
s->sort_strategy = SORT_STRATEGY_EMBED;
odr_reset(s->odr_sort_spec);
s->sort_spec = yaz_sort_spec(s->odr_sort_spec, criteria);
if (!s->sort_spec)
- return -1;
+ return -2;
return generate(s);
}