X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frpnsearch.c;h=5ade0eaabaf93c15789015ed2f657e2f43f36dc7;hb=10fa93c4e981675844ea25e09882495a636e9e4e;hp=7743362b6639250f4d20e336444f4d0abd41dcdd;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197;p=idzebra-moved-to-github.git

diff --git a/index/rpnsearch.c b/index/rpnsearch.c
index 7743362..5ade0ea 100644
--- a/index/rpnsearch.c
+++ b/index/rpnsearch.c
@@ -1,4 +1,4 @@
-/* $Id: rpnsearch.c,v 1.6 2007-01-15 15:10:17 adam Exp $
+/* $Id: rpnsearch.c,v 1.9 2007-03-06 12:21:04 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -1183,7 +1183,9 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
                              grep_info, &max_pos, 
                              ord_len /* number of "exact" chars */,
                              grep_handle);
-        if (r)
+        if (r == 1)
+            zebra_set_partial_result(zh);
+        else if (r)
             yaz_log(YLOG_WARN, "dict_lookup_grep fail %d", r);
     }
     if (!bases_ok)
@@ -1208,10 +1210,6 @@ static ZEBRA_RES grep_info_prepare(ZebraHandle zh,
 				   struct grep_info *grep_info,
 				   int reg_type)
 {
-    AttrType termset;
-    int termset_value_numeric;
-    const char *termset_value_string;
-
 #ifdef TERM_COUNT
     grep_info->term_no = 0;
 #endif
@@ -1221,35 +1219,50 @@ static ZEBRA_RES grep_info_prepare(ZebraHandle zh,
     grep_info->zh = zh;
     grep_info->reg_type = reg_type;
     grep_info->termset = 0;
-    if (!zapt)
-        return ZEBRA_OK;
-    attr_init_APT(&termset, zapt, 8);
-    termset_value_numeric =
-        attr_find_ex(&termset, NULL, &termset_value_string);
-    if (termset_value_numeric != -1)
+    if (zapt)
+    {
+        AttrType truncmax;
+        int truncmax_value;
+
+        attr_init_APT(&truncmax, zapt, 13);
+        truncmax_value = attr_find(&truncmax, NULL);
+        if (truncmax_value != -1)
+            grep_info->trunc_max = truncmax_value;
+    }
+    if (zapt)
     {
+        AttrType termset;
+        int termset_value_numeric;
+        const char *termset_value_string;
+
+        attr_init_APT(&termset, zapt, 8);
+        termset_value_numeric =
+            attr_find_ex(&termset, NULL, &termset_value_string);
+        if (termset_value_numeric != -1)
+        {
 #if TERMSET_DISABLE
-        zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, "termset");
-        return ZEBRA_FAIL;
+            zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, "termset");
+            return ZEBRA_FAIL;
 #else
-        char resname[32];
-        const char *termset_name = 0;
-        if (termset_value_numeric != -2)
-        {
-    
-            sprintf(resname, "%d", termset_value_numeric);
-            termset_name = resname;
-        }
-        else
+            char resname[32];
+            const char *termset_name = 0;
+            if (termset_value_numeric != -2)
+            {
+                
+                sprintf(resname, "%d", termset_value_numeric);
+                termset_name = resname;
+            }
+            else
             termset_name = termset_value_string;
-        yaz_log(log_level_rpn, "creating termset set %s", termset_name);
-        grep_info->termset = resultSetAdd(zh, termset_name, 1);
-        if (!grep_info->termset)
-        {
-	    zebra_setError(zh, YAZ_BIB1_ILLEGAL_RESULT_SET_NAME, termset_name);
-            return ZEBRA_FAIL;
-        }
+            yaz_log(log_level_rpn, "creating termset set %s", termset_name);
+            grep_info->termset = resultSetAdd(zh, termset_name, 1);
+            if (!grep_info->termset)
+            {
+                zebra_setError(zh, YAZ_BIB1_ILLEGAL_RESULT_SET_NAME, termset_name);
+                return ZEBRA_FAIL;
+            }
 #endif
+        }
     }
     return ZEBRA_OK;
 }
@@ -1699,7 +1712,10 @@ static int numeric_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_tmp);
     r = dict_lookup_grep(zh->reg->dict, term_dict, 0, grep_info, max_pos,
                           0, grep_handle);
-    if (r != 0 && r != 1)
+
+    if (r == 1)
+        zebra_set_partial_result(zh);
+    else if (r)
         yaz_log(YLOG_WARN, "dict_lookup_grep fail, rel = gt: %d", r);
     yaz_log(log_level_rpn, "%d positions", grep_info->isam_p_indx);
     return 1;
@@ -1870,21 +1886,35 @@ static ZEBRA_RES rpn_search_APT_local(ZebraHandle zh,
 				      RSET *rset,
 				      struct rset_key_control *kc)
 {
-    RSFD rsfd;
-    struct it_key key;
-    int sys;
-    *rset = rset_create_temp(rset_nmem, kc, kc->scope,
-                             res_get (zh->res, "setTmpDir"),0 );
-    rsfd = rset_open(*rset, RSETF_WRITE);
+    Record rec;
+    zint sysno = atozint(termz);
     
-    sys = atoi(termz);
-    if (sys <= 0)
-        sys = 1;
-    key.mem[0] = sys;
-    key.mem[1] = 1;
-    key.len = 2;
-    rset_write (rsfd, &key);
-    rset_close (rsfd);
+    if (sysno <= 0)
+        sysno = 0;
+    rec = rec_get(zh->reg->records, sysno);
+    if (!rec)
+        sysno = 0;
+
+    rec_free(&rec);
+
+    if (sysno <= 0)
+    {
+        *rset = rset_create_null(rset_nmem, kc, 0);
+    }
+    else
+    {
+        RSFD rsfd;
+        struct it_key key;
+        *rset = rset_create_temp(rset_nmem, kc, kc->scope,
+                                 res_get(zh->res, "setTmpDir"), 0);
+        rsfd = rset_open(*rset, RSETF_WRITE);
+        
+        key.mem[0] = sysno;
+        key.mem[1] = 1;
+        key.len = 2;
+        rset_write(rsfd, &key);
+        rset_close(rsfd);
+    }
     return ZEBRA_OK;
 }