/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 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;
int query_type;
char *query_string;
WRBUF full_query;
+ WRBUF sru11_sort_spec;
};
static int generate(ZOOM_query s)
wrbuf_puts(s->full_query, s->query_string);
odr_reset(s->odr_query);
+ if (s->sort_spec && (s->sort_strategy == SORT_STRATEGY_SRU11 || s->sort_strategy == SORT_STRATEGY_SOLR))
+ {
+ int r = 0;
+ wrbuf_rewind(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;
+ }
switch (s->query_type)
{
case Z_Query_type_1: /* RPN */
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 0;
}
+const char *ZOOM_query_get_sru11(ZOOM_query s)
+{
+ if (wrbuf_len(s->sru11_sort_spec))
+ return wrbuf_cstr(s->sru11_sort_spec);
+ return 0;
+}
+
Z_Query *ZOOM_query_get_Z_Query(ZOOM_query s)
{
return s->z_query;
return wrbuf_cstr(s->full_query);
}
+void ZOOM_query_get_hash(ZOOM_query s, WRBUF w)
+{
+ 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);
+}
+
/*
* Returns an xmalloc()d string containing RPN that corresponds to the
* CQL passed in. On error, sets the Connection object's error state
}
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),
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->query_string = 0;
s->full_query = wrbuf_alloc();
s->sort_strategy = SORT_STRATEGY_Z3950;
+ s->sru11_sort_spec = wrbuf_alloc();
return s;
}
odr_destroy(s->odr_sort_spec);
xfree(s->query_string);
wrbuf_destroy(s->full_query);
+ wrbuf_destroy(s->sru11_sort_spec);
xfree(s);
}
}
{
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);
}