X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=9de1921f71ec89cf17c954b601eb830e0161a05f;hb=67700507285e0823f80e097fa0b1aae5968451bb;hp=32a5c878886d96b6859083552961a98d51dd48a9;hpb=078a786204b5edef350982c385342f889d37e5ad;p=idzebra-moved-to-github.git

diff --git a/index/zrpn.c b/index/zrpn.c
index 32a5c87..9de1921 100644
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -1,4 +1,4 @@
-/* $Id: zrpn.c,v 1.155 2004-10-01 14:25:28 heikki Exp $
+/* $Id: zrpn.c,v 1.159 2004-11-03 16:04:45 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -1695,6 +1695,7 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh,
     int  r, rset_no = 0;
     struct grep_info grep_info;
 
+    logf (LOG_DEBUG, "APT_numeric t='%s'",termz);
     if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream))
         return 0;
     while (1)
@@ -1738,7 +1739,7 @@ static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     struct it_key key;
     int sys;
     result = rstemp_create( rset_nmem,key_it_ctrl,key_it_ctrl->scope,
-                     res_get (zh->res, "setTmpDir") );
+                     res_get (zh->res, "setTmpDir"),0 );
     rsfd = rset_open (result, RSETF_WRITE);
 
     sys = atoi(termz);
@@ -2281,7 +2282,7 @@ RSET rpn_search (ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
 
     sort_sequence = (Z_SortKeySpecList *)
         nmem_malloc (nmem, sizeof(*sort_sequence));
-    sort_sequence->num_specs = 10;
+    sort_sequence->num_specs = 10; /* FIXME - Hard-coded number */
     sort_sequence->specs = (Z_SortKeySpec **)
         nmem_malloc (nmem, sort_sequence->num_specs *
                      sizeof(*sort_sequence->specs));
@@ -2303,7 +2304,7 @@ RSET rpn_search (ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
         ;
     sort_sequence->num_specs = i;
     if (!i)
-        resultSetRank (zh, sset, rset);
+        resultSetRank (zh, sset, rset, rset_nmem);
     else
     {
         logf (LOG_DEBUG, "resultSetSortSingle in rpn_search");
@@ -2391,7 +2392,7 @@ static void count_set (RSET r, int *count)
 
     *count = 0;
     rfd = rset_open (r, RSETF_READ);
-    while (rset_read (rfd, &key))
+    while (rset_read (rfd, &key,0 /* never mind terms */))
     {
         if (key.mem[0] != psysno)
         {