X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=util%2Fzebramap.c;h=7b38b049e815a9b77d59fb4f16ed61e196624022;hb=4d40f93d2904a26d3e96929f742522c3222ba91e;hp=c46dbbcf63e256cdc29bc1c9fbd6e3fafb97edb5;hpb=49ae06a7901f27cce5657bdc57fd7d147bf59fa1;p=idzebra-moved-to-github.git

diff --git a/util/zebramap.c b/util/zebramap.c
index c46dbbc..7b38b04 100644
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,5 +1,5 @@
-/* $Id: zebramap.c,v 1.30 2003-03-26 16:41:48 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: zebramap.c,v 1.32.2.2 2004-11-26 11:06:13 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -25,7 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include <ctype.h>
 
-#include <yaz/yaz-util.h>
+#include <zebrautl.h>
 #include <charmap.h>
 #include <zebramap.h>
 
@@ -270,6 +270,7 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id)
 	zm->type = ZEBRA_MAP_TYPE_INDEX;
 	zm->completeness = 0;
 	zm->next = zms->map_list;
+	zm->replace_tokens = 0;
 	zms->map_list = zm->next;
 
 	zms->lookup_array[zm->reg_id & 255] = zm;
@@ -290,13 +291,13 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id)
 }
 
 const char **zebra_maps_input (ZebraMaps zms, unsigned reg_id,
-			       const char **from, int len)
+			       const char **from, int len, int first)
 {
     chrmaptab maptab;
 
     maptab = zebra_charmap_get (zms, reg_id);
     if (maptab)
-	return chr_map_input(maptab, from, len);
+	return chr_map_input(maptab, from, len, first);
     
     zms->temp_map_str[0] = **from;
 
@@ -572,7 +573,7 @@ int zebra_replace_sub(ZebraMaps zms, unsigned reg_id, const char *ex_list,
     {
 	struct zm_token *token;
 	char replace_string[128];
-	int replace_out;
+	int replace_out = 0;
 	int replace_in = 0;
 
 	for (token = zm->replace_tokens; !replace_in && token;