projects
/
yaz-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:
fa7650e
)
New solr sort strategy. Using it
author
Dennis Schafroth
<dennis@indexdata.com>
Mon, 1 Oct 2012 12:38:17 +0000
(14:38 +0200)
committer
Dennis Schafroth
<dennis@indexdata.com>
Mon, 1 Oct 2012 12:38:17 +0000
(14:38 +0200)
src/zoom-query.c
patch
|
blob
|
history
diff --git
a/src/zoom-query.c
b/src/zoom-query.c
index
5a552bd
..
3f49d1b
100644
(file)
--- a/
src/zoom-query.c
+++ b/
src/zoom-query.c
@@
-25,9
+25,10
@@
#define SORT_STRATEGY_Z3950 0
#define SORT_STRATEGY_TYPE7 1
#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_SRU11 3
#define SORT_STRATEGY_EMBED 4
+#define SORT_STRATEGY_SOLR 5
struct ZOOM_query_p {
Z_Query *z_query;
struct ZOOM_query_p {
Z_Query *z_query;
@@
-52,13
+53,20
@@
static int generate(ZOOM_query s)
wrbuf_puts(s->full_query, s->query_string);
odr_reset(s->odr_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);
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;
}
if (r)
return r;
}
@@
-345,6
+353,10
@@
ZOOM_query_sortby2(ZOOM_query s, const char *strategy, const char *criteria)
{
s->sort_strategy = SORT_STRATEGY_SRU11;
}
{
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;
else if (!strcmp(strategy, "embed"))
{
s->sort_strategy = SORT_STRATEGY_EMBED;