X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fzebramap.c;h=105c5e1b0a586eaf884dd52d09872734501b54b8;hb=6e88e0163a9e3c23963fcb37fe94c936d65dfcc3;hp=ba301ab9cb559987cf7d9b8d0b601462d5e487de;hpb=cd02e9c5558d2f0db2ab83fcad810a6522fd2319;p=idzebra-moved-to-github.git

diff --git a/util/zebramap.c b/util/zebramap.c
index ba301ab..105c5e1 100644
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1995-2008 Index Data
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -698,6 +698,9 @@ int zebra_map_tokenize_next(zebra_map_t zm,
 int zebra_map_tokenize_start(zebra_map_t zm,
                              const char *buf, size_t len)
 {
+#if YAZ_HAVE_ICU
+    int ret;
+#endif
     assert(zm->use_chain);
 
     wrbuf_rewind(zm->input_str);
@@ -716,10 +719,9 @@ int zebra_map_tokenize_start(zebra_map_t zm,
             yaz_log(YLOG_LOG, "input %s", 
                     wrbuf_cstr(zm->print_str)); 
         }
-        icu_chain_assign_cstr(zm->icu_chain,
-                              wrbuf_cstr(zm->input_str),
-                              &status);
-        if (!U_SUCCESS(status))
+        ret = icu_chain_assign_cstr(zm->icu_chain,
+                                    wrbuf_cstr(zm->input_str), &status);
+        if (!ret && !U_SUCCESS(status))
         {
             if (zm->debug)
             {
@@ -746,6 +748,7 @@ int zebra_maps_is_icu(zebra_map_t zm)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab