X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzsets.c;h=98fd1dc4bd9e195075705c0e5ad7fd7edcbc702e;hb=746f36f2b12f2a342dc0213cb03458359a493c8f;hp=ecbee31f24f317b44012fc5d1917738ad16b2efc;hpb=d8b7f92dc036c81ed51a5f22b8c5bc9a5ae74487;p=idzebra-moved-to-github.git

diff --git a/index/zsets.c b/index/zsets.c
index ecbee31..98fd1dc 100644
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,4 +1,4 @@
-/* $Id: zsets.c,v 1.97 2006-01-12 13:21:45 adam Exp $
+/* $Id: zsets.c,v 1.100 2006-05-03 09:31:26 marc Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #include "index.h"
+#include "rank.h"
 #include <yaz/diagbib1.h>
 #include <rset.h>
 
@@ -53,6 +54,7 @@ struct zebra_set {
     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;
@@ -267,6 +269,7 @@ ZebraSet resultSetAdd(ZebraHandle zh, const char *name, int ov)
     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;
@@ -287,6 +290,13 @@ ZebraSet resultSetGet(ZebraHandle zh, const char *name)
                 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;
@@ -654,13 +664,36 @@ void resultSetInsertRank (ZebraHandle zh, struct zset_sort_info *sort_info,
     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);
@@ -668,13 +701,13 @@ static Z_RPNQuery *copy_RPNQuery(Z_RPNQuery *src_rpn, NMEM dst)
 	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,
@@ -739,6 +772,7 @@ ZEBRA_RES resultSetSort(ZebraHandle zh, NMEM nmem,
     }
     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);
 }