/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
#if HAVE_CONFIG_H
return ret;
}
-static int srw_sortkeys(const char *arg, const char *expected_result)
+static int strategy_sortkeys(const char *arg, const char *expected_result, int (*strategy) (Z_SortKeySpecList *, WRBUF))
{
ODR odr = odr_createmem(ODR_ENCODE);
Z_SortKeySpecList *sort_spec = yaz_sort_spec(odr, arg);
else
{
WRBUF w = wrbuf_alloc();
- int r = yaz_sort_spec_to_srw_sortkeys(sort_spec, w);
+ int r = (strategy)(sort_spec, w);
if (!expected_result && r)
ret = 1;
return ret;
}
-static int check_srw_sortkeys_to_sort_spec(const char *arg,
- const char *expected_result)
+static int srw_sortkeys(const char *arg, const char *expected_result) {
+ return strategy_sortkeys(arg, expected_result, yaz_sort_spec_to_srw_sortkeys);
+}
+
+static int solr_sortkeys(const char *arg, const char *expected_result) {
+ return strategy_sortkeys(arg, expected_result, yaz_sort_spec_to_solr_sortkeys);
+}
+
+
+
+static int check_sortkeys_to_sort_spec(const char *arg,
+ const char *expected_result, int (*sort_strategy)(const char *, WRBUF))
{
WRBUF w = wrbuf_alloc();
int ret = 0;
- int r = yaz_srw_sortkeys_to_sort_spec(arg, w);
+ int r = sort_strategy(arg, w);
if (!expected_result && r)
ret = 1;
return ret;
}
+static int check_srw_sortkeys_to_sort_spec(const char *arg, const char *expected_result) {
+ return check_sortkeys_to_sort_spec(arg, expected_result, yaz_srw_sortkeys_to_sort_spec);
+}
+
+static int check_solr_sortkeys_to_sort_spec(const char *arg, const char *expected_result) {
+ return check_sortkeys_to_sort_spec(arg, expected_result, yaz_solr_sortkeys_to_sort_spec);
+}
static void tst(void)
{
YAZ_CHECK(check_srw_sortkeys_to_sort_spec(
"date,,1,0,1900",
"date ai=1900"));
+
+ YAZ_CHECK(solr_sortkeys("title a",
+ "title asc"));
+ YAZ_CHECK(solr_sortkeys("title a date ds",
+ "title asc"
+ ",date desc"));
+ YAZ_CHECK(solr_sortkeys("1=4,2=3 a", 0));
+
+ YAZ_CHECK(check_solr_sortkeys_to_sort_spec(
+ "date asc",
+ "date ai"));
+
}
int main(int argc, char **argv)