From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 9 May 2006 10:46:56 +0000 (+0000)
Subject: Fixed bug #576: Regexp-2 search misses hits. Problem was that
X-Git-Tag: before.bug.529~130
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=7faa9bb89d27160c17979a21156885539d4f9dcf

Fixed bug #576: Regexp-2 search misses hits. Problem was that
init_pos was always set to 2. And the ordinal encoded prefix might
be of length 1. Hence the first character would not be part of regular
expression _with_ errors.
---

diff --git a/index/zrpn.c b/index/zrpn.c
index ade12f2..b72d4d2 100644
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -1,4 +1,4 @@
-/* $Id: zrpn.c,v 1.210 2006-03-30 09:52:16 adam Exp $
+/* $Id: zrpn.c,v 1.211 2006-05-09 10:46:56 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -1239,6 +1239,8 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 		term_dict[prefix_len++] = 1;
 		term_dict[prefix_len++] = ord_buf[i];
 	    }
+	    if (ord_len > init_pos)
+		init_pos = ord_len;
 	}
 	bases_ok++;
         if (prefix_len)
@@ -1318,7 +1320,6 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
         case 103:       /* Regexp-2 */
             regex_range = 1;
             term_dict[j++] = '(';
-	    init_pos = 2;
             if (!term_103(zh->reg->zebra_maps, reg_type,
                           &termp, term_dict + j, &regex_range,
 			  space_split, term_dst))