X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=2a257532a3e8599750dbddf395e6bc859b80436c;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hp=9cf39d43ffeec5853358bb7c600a6d10bf68d4ea;hpb=34552d7bc714468512b1873f1d6b75608d6b4655;p=idzebra-moved-to-github.git

diff --git a/index/zrpn.c b/index/zrpn.c
index 9cf39d4..2a25753 100644
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -1,4 +1,4 @@
-/* $Id: zrpn.c,v 1.207 2005-11-09 11:51:30 adam Exp $
+/* $Id: zrpn.c,v 1.212 2006-05-10 08:13:23 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -181,8 +181,12 @@ void zebra_term_untrans(ZebraHandle zh, int reg_type,
     {
         const char *cp = zebra_maps_output(zh->reg->zebra_maps,
 					   reg_type, &src);
-        if (!cp && len < IT_MAX_WORD-1)
-            dst[len++] = *src++;
+	if (!cp)
+	{
+	    if (len < IT_MAX_WORD-1)
+		dst[len++] = *src;
+	    src++;
+	}
         else
             while (*cp && len < IT_MAX_WORD-1)
                 dst[len++] = *cp++;
@@ -241,7 +245,7 @@ static void add_isam_p(const char *name, const char *info,
         zebra_term_untrans  (p->zh, p->reg_type, term_tmp, name+len+1);
         yaz_log(log_level_rpn, "grep: %d %c %s", ord, name[len], term_tmp);
         zebraExplain_lookup_ord (p->zh->reg->zei,
-                                 ord, 0 /* index_type */, &db, &set, &use);
+                                 ord, 0 /* index_type */, &db, &set, &use, 0);
         yaz_log(log_level_rpn, "grep:  set=%d use=%d db=%s", set, use, db);
         
         resultSetAddTerm(p->zh, p->termset, name[len], db,
@@ -1005,7 +1009,7 @@ static ZEBRA_RES term_limits_APT(ZebraHandle zh,
 
     attr_init(&term_ref_id_attr, zapt, 10);
     term_ref_id_int = attr_find_ex(&term_ref_id_attr, NULL, term_ref_id_str);
-    if (term_ref_id_int != -1)
+    if (term_ref_id_int >= 0)
     {
 	char *res = nmem_malloc(nmem, 20);
 	sprintf(res, "%d", term_ref_id_int);
@@ -1235,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)
@@ -1314,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))
@@ -3122,3 +3127,11 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
     return ZEBRA_OK;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+