X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=index%2Fzrpn.c;h=1b74b9a1be64fdd8462a0fceda83029982bfc149;hb=7a2d0f25682890bde5d8f2883d6020df2ed0b365;hp=9f3fbec1055c4b05dd59b235c2b5db6eefb10dd7;hpb=a876f6c2860bf13e36f47c8ce938d74b4ce98b8e;p=idzebra-moved-to-github.git

diff --git a/index/zrpn.c b/index/zrpn.c
index 9f3fbec..1b74b9a 100644
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -1,4 +1,4 @@
-/* $Id: zrpn.c,v 1.194 2005-06-02 11:59:54 adam Exp $
+/* $Id: zrpn.c,v 1.197 2005-06-07 14:53:39 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -50,7 +50,6 @@ typedef struct
     Z_AttributesPlusTerm *zapt;
 } AttrType;
 
-
 static int log_level_set = 0;
 static int log_level_rpn = 0;
 
@@ -987,7 +986,8 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 			     struct grep_info *grep_info,
 			     int reg_type, int complete_flag,
 			     int num_bases, char **basenames,
-			     char *term_dst, int xpath_use);
+			     char *term_dst, int xpath_use,
+			     struct ord_list **ol);
 
 static ZEBRA_RES term_trunc(ZebraHandle zh,
 			    Z_AttributesPlusTerm *zapt,
@@ -1003,11 +1003,12 @@ static ZEBRA_RES term_trunc(ZebraHandle zh,
 			    struct rset_key_control *kc)
 {
     ZEBRA_RES res;
+    struct ord_list *ol;
     *rset = 0;
     grep_info->isam_p_indx = 0;
     res = string_term(zh, zapt, term_sub, attributeSet, stream, grep_info,
 		      reg_type, complete_flag, num_bases, basenames,
-		      term_dst, xpath_use);
+		      term_dst, xpath_use, &ol);
     if (res != ZEBRA_OK)
         return res;
     if (!*term_sub)  /* no more terms ? */
@@ -1017,7 +1018,7 @@ static ZEBRA_RES term_trunc(ZebraHandle zh,
 		       grep_info->isam_p_indx, term_dst,
 		       strlen(term_dst), rank_type, 1 /* preserve pos */,
 		       zapt->term->which, rset_nmem,
-		       kc, kc->scope);
+		       kc, kc->scope, ol, reg_type);
     if (!*rset)
 	return ZEBRA_FAIL;
     return ZEBRA_OK;
@@ -1036,7 +1037,8 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 			     struct grep_info *grep_info,
 			     int reg_type, int complete_flag,
 			     int num_bases, char **basenames,
-			     char *term_dst, int xpath_use)
+			     char *term_dst, int xpath_use,
+			     struct ord_list **ol)
 {
     char term_dict[2*IT_MAX_WORD+4000];
     int j, r, base_no;
@@ -1054,6 +1056,9 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     int errCode = 0;      /* err code (if any is not OK) */
     char *errString = 0;  /* addinfo */
 
+
+    *ol = ord_list_create(stream);
+
     rpn_char_map_prepare (zh->reg, reg_type, &rcmi);
     attr_init(&use, zapt, 1);
     use_value = attr_find_ex(&use, &curAttributeSet, &use_string);
@@ -1122,6 +1127,7 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
                 term_dict[prefix_len++] = ord_buf[i];
             }
             attp.local_attributes = 0;  /* no more attributes */
+	    *ol = ord_list_append(stream, *ol, ord);
 	}
         else 
         {
@@ -1167,6 +1173,7 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 					      local_attr->local);
 	    if (ord < 0)
 		continue;
+	    *ol = ord_list_append(stream, *ol, ord);
 	    if (prefix_len)
 		term_dict[prefix_len++] = '|';
 	    else
@@ -1958,7 +1965,7 @@ static ZEBRA_RES rpn_search_APT_numeric(ZebraHandle zh,
 		       strlen(term_dst), rank_type,
 		       0 /* preserve position */,
 		       zapt->term->which, rset_nmem, 
-		       kc, kc->scope);
+		       kc, kc->scope, 0, reg_type);
 	if (!result_sets[num_result_sets])
 	    break;
 	num_result_sets++;
@@ -2152,7 +2159,7 @@ static RSET xpath_trunc(ZebraHandle zh, NMEM stream,
     rset = rset_trunc(zh, grep_info.isam_p_buf,
 		      grep_info.isam_p_indx, term, strlen(term),
 		      flags, 1, term_type,rset_nmem,
-		      kc, kc->scope);
+		      kc, kc->scope, 0, reg_type);
     grep_info_delete(&grep_info);
     return rset;
 }
@@ -2956,7 +2963,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 	    rset = rset_trunc(zh, &scan_info_array[j0].list[ptr[j0]].isam_p, 1,
 			      glist[lo].term, strlen(glist[lo].term),
 			      NULL, 0, zapt->term->which, rset_nmem, 
-			      kc, kc->scope);
+			      kc, kc->scope, 0, reg_id);
 	}
 	ptr[j0]++; /* move index for this set .. */
 	/* get result set for remaining scan terms */
@@ -2977,7 +2984,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 			    glist[lo].term,
 			    strlen(glist[lo].term), NULL, 0,
 			    zapt->term->which,rset_nmem,
-			    kc, kc->scope);
+			    kc, kc->scope, 0, reg_id);
 		    rset = rsmulti_or_create(rset_nmem, kc,
 					     kc->scope, 0 /* termid */,
 					     2, rsets);
@@ -3047,7 +3054,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 	    (zh, &scan_info_array[j0].list[before-1-ptr[j0]].isam_p, 1,
 	     glist[lo].term, strlen(glist[lo].term),
 	     NULL, 0, zapt->term->which, rset_nmem,
-	     kc, kc->scope);
+	     kc, kc->scope, 0, reg_id);
 	
 	ptr[j0]++;
 	
@@ -3066,7 +3073,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 		    glist[lo].term,
 		    strlen(glist[lo].term), NULL, 0,
 		    zapt->term->which, rset_nmem,
-		    kc, kc->scope);
+		    kc, kc->scope, 0, reg_id);
 		rset = rsmulti_or_create(rset_nmem, kc,
 					 kc->scope, 0 /* termid */, 2, rsets);