-/* $Id: zsets.c,v 1.97 2006-01-12 13:21:45 adam Exp $
+/* $Id: zsets.c,v 1.101 2006-05-10 08:13:26 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
#endif
#include "index.h"
+#include "rank.h"
#include <yaz/diagbib1.h>
#include <rset.h>
int num_bases;
char **basenames;
Z_RPNQuery *rpn;
+ Z_SortKeySpecList *sortSpec;
struct zset_sort_info *sort_info;
struct zebra_set_term_entry *term_entries;
int term_entries_max;
s->rset_nmem = 0;
s->nmem = 0;
s->rpn = 0;
+ s->sortSpec = 0;
s->cache_position = 0;
s->cache_rfd = 0;
s->approx_limit = zh->approx_limit;
if (!s->rset_nmem)
s->rset_nmem=nmem_create();
resultSetSearch(zh, nmem, s->rset_nmem, s->rpn, s);
+ if (s->rset && s->sortSpec)
+ {
+ int sort_status;
+ yaz_log(log_level_resultsets, "resort %s", name);
+ resultSetSortSingle (zh, nmem, s, s->rset, s->sortSpec,
+ &sort_status);
+ }
nmem_destroy (nmem);
}
return s;
new_entry->score = score;
}
-static Z_RPNQuery *copy_RPNQuery(Z_RPNQuery *src_rpn, NMEM dst)
+static Z_RPNQuery *copy_RPNQuery(Z_RPNQuery *src, NMEM nmem)
+{
+ Z_RPNQuery *dst = 0;
+ ODR encode = odr_createmem(ODR_ENCODE);
+ ODR decode = odr_createmem(ODR_DECODE);
+
+ if (z_RPNQuery(encode, &src, 0, 0))
+ {
+ int len;
+ char *buf = odr_getbuf(encode, &len, 0);
+
+ if (buf)
+ {
+ odr_setbuf(decode, buf, len, 0);
+ z_RPNQuery(decode, &dst, 0, 0);
+ }
+ }
+ nmem_transfer(nmem, decode->mem);
+ odr_destroy(encode);
+ odr_destroy(decode);
+ return dst;
+}
+
+static Z_SortKeySpecList *copy_SortKeySpecList(Z_SortKeySpecList *src, NMEM nmem)
{
- Z_RPNQuery *dst_rpn = 0;
+ Z_SortKeySpecList *dst = 0;
ODR encode = odr_createmem(ODR_ENCODE);
ODR decode = odr_createmem(ODR_DECODE);
- if (z_RPNQuery(encode, &src_rpn, 0, 0))
+ if (z_SortKeySpecList(encode, &src, 0, 0))
{
int len;
char *buf = odr_getbuf(encode, &len, 0);
if (buf)
{
odr_setbuf(decode, buf, len, 0);
- z_RPNQuery(decode, &dst_rpn, 0, 0);
+ z_SortKeySpecList(decode, &dst, 0, 0);
}
}
- nmem_transfer(dst, decode->mem);
+ nmem_transfer(nmem, decode->mem);
odr_destroy(encode);
odr_destroy(decode);
- return dst_rpn;
+ return dst;
}
ZebraSet resultSetClone(ZebraHandle zh, const char *setname,
}
if (strcmp (output_setname, input_setnames[0]))
sset = resultSetClone(zh, output_setname, sset);
+ sset->sortSpec = copy_SortKeySpecList(sort_sequence, sset->nmem);
return resultSetSortSingle (zh, nmem, sset, rset, sort_sequence,
sort_status);
}
return ZEBRA_OK;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+