X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzsets.c;h=cdfc2d28b3fac33c9577a218976def6c8e5193eb;hp=e424abe35e3283af159734710a2d650048b49797;hb=6988ba91e363565638c27a8d5895ad9afc409e75;hpb=e1352999e1be86b0ce5c2698bb62f9fc7d598a4f

diff --git a/index/zsets.c b/index/zsets.c
index e424abe..cdfc2d2 100644
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,4 +1,4 @@
-/* $Id: zsets.c,v 1.117 2007-01-16 15:31:23 adam Exp $
+/* $Id: zsets.c,v 1.122 2007-08-21 11:06:47 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -100,7 +100,6 @@ static ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
                                  Z_RPNQuery *rpn, ZebraSet sset)
 {
     RSET rset = 0;
-    oident *attrset;
     Z_SortKeySpecList *sort_sequence;
     int sort_status, i;
     ZEBRA_RES res = ZEBRA_OK;
@@ -114,11 +113,9 @@ static ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
     for (i = 0; i<sort_sequence->num_specs; i++)
         sort_sequence->specs[i] = 0;
     
-    attrset = oid_getentbyoid (rpn->attributeSetId);
-
     rpn_get_top_approx_limit(zh, rpn->RPNStructure, &sset->approx_limit);
 
-    res = rpn_search_top(zh, rpn->RPNStructure, attrset->value,
+    res = rpn_search_top(zh, rpn->RPNStructure, rpn->attributeSetId,
 			 nmem, rset_nmem,
 			 sort_sequence,
 			 sset->num_bases, sset->basenames,
@@ -936,6 +933,14 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem,
 	kno++;
         if (this_sys != psysno)
         {
+            if ((sset->hits & 255) == 0 && zh->break_handler_func)
+            {
+                if (zh->break_handler_func(zh->break_handler_data))
+                {
+                    rset_set_hits_limit(rset, 0);
+                    break;
+                }
+            }
             (sset->hits)++;
             psysno = this_sys;
             resultSetInsertSort(zh, sset,
@@ -997,7 +1002,6 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
     terms = (TERMID *) nmem_malloc(nmem, sizeof(*terms)*n);
     rset_getterms(rset, terms, n, &numTerms);
 
-
     rank_class = zebraRankLookup(zh, rank_handler_name);
     if (!rank_class)
     {
@@ -1011,10 +1015,8 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
 	struct rank_control *rc = rank_class->control;
 	int score;
 	zint count = 0;
-	
-	void *handle =
-	    (*rc->begin) (zh->reg, rank_class->class_handle, rset, nmem,
-			  terms, numTerms);
+        void *handle = (*rc->begin) (zh->reg, rank_class->class_handle, rset,
+                                     nmem, terms, numTerms);
 	zint psysno = 0;  /* previous doc id / sys no */
 	zint pstaticrank = 0; /* previous static rank */
 	int stop_flag = 0;
@@ -1028,11 +1030,16 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
 		key_logdump_txt(log_level_searchhits, &key, termid->name);
 	    if (this_sys != psysno) 
 	    {   /* new record .. */
-		if (rfd->counted_items > rset->hits_limit)
+                if (!(rfd->counted_items & 255) && zh->break_handler_func)
                 {
-                    zebraSet->estimated_hit_count = 1;
-		    break;
+                    if (zh->break_handler_func(zh->break_handler_data))
+                    {
+                        yaz_log(YLOG_LOG, "Aborted search");
+                        stop_flag = 1;
+                    }
                 }
+		if (rfd->counted_items > rset->hits_limit)
+                    stop_flag = 1;
 		if (psysno)
 		{   /* only if we did have a previous record */
 		    score = (*rc->calc) (handle, psysno, pstaticrank,
@@ -1040,9 +1047,13 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
 		    /* insert the hit. A=Ascending */
 		    resultSetInsertRank (zh, sort_info, psysno, score, 'A');
 		    count++;
-		    if (stop_flag)
-			break;
 		}
+                if (stop_flag)
+                {
+                    zebraSet->estimated_hit_count = 1;
+                    rset_set_hits_limit(rset, 0);
+                    break;
+                }
 		psysno = this_sys;
 		if (zh->m_staticrank)
 		    pstaticrank = key.mem[0];
@@ -1193,7 +1204,11 @@ ZEBRA_RES zebra_result_set_term_info(ZebraHandle zh, const char *setname,
 		    if (ret == (size_t)(-1))
 			*termlen = 0;
 		    else
+                    {
+		        yaz_iconv(zh->iconv_from_utf8, 0, 0, 
+                                  &outbuf, &outleft);
 			*termlen = outbuf - termbuf;
+                    }
 		}
 		else
 		{
@@ -1258,7 +1273,7 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
 		struct ord_list *ol;
 		for (ol = termid->ol; ol; ol = ol->next)
 		{
-		    zebra_snippets_append(snippets, key.mem[key.len-1],
+		    zebra_snippets_append(snippets, key.mem[key.len-1], 0,
 					  ol->ord, termid->name);
 		}
 	    }