Omit CVS Id. Update copyright year.

[idzebra-moved-to-github.git] / util / zebramap.c

diff --git a/util/zebramap.c b/util/zebramap.c
index 4361fda..c6f3da9 100644 (file)
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,23 +1,20 @@
-/* $Id: zebramap.c,v 1.75 2007-12-13 18:08:26 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-   This file is part of the Zebra server.
-
-   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
-   Software Foundation; either version 2, or (at your option) any later
-   version.
-
-   Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Zebra; see the file LICENSE.zebra.  If not, write to the
-   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+/* This file is part of the Zebra server.
+   Copyright (C) 1995-2008 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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <assert.h>
@@ -662,7 +659,8 @@ int zebra_map_tokenize_next(zebra_map_t zm,
         UErrorCode status;
         while (icu_chain_next_token(zm->icu_chain, &status))
         {
-            assert(U_SUCCESS(status));
+            if (!U_SUCCESS(status))
+                return 0;
             *result_buf = icu_chain_token_sortkey(zm->icu_chain);
             assert(*result_buf);
 
@@ -684,7 +682,6 @@ int zebra_map_tokenize_next(zebra_map_t zm,
             if (**result_buf != '\0')
                 return 1;
         }
-        assert(U_SUCCESS(status));
     }
     return 0;
 #else
@@ -716,77 +713,22 @@ int zebra_map_tokenize_start(zebra_map_t zm,
         icu_chain_assign_cstr(zm->icu_chain,
                               wrbuf_cstr(zm->input_str),
                               &status);
-        assert(U_SUCCESS(status));
-    }
-#endif
-    return 0;
-}
-
-#if 0
-int zebra_map_tokenize(zebra_map_t zm,
-                       const char *buf, size_t len,
-                       const char **result_buf, size_t *result_len)
-{
-    assert(zm->use_chain);
-
-    if (buf)
-    {
-        wrbuf_rewind(zm->input_str);
-        wrbuf_write(zm->input_str, buf, len);
-        zm->simple_off = 0;
-    }
-
-#if YAZ_HAVE_ICU
-    if (!zm->icu_chain)
-        return tokenize_simple(zm, result_buf, result_len);
-    else
-    {
-        UErrorCode status;
-        if (buf)
+        if (!U_SUCCESS(status))
         {
             if (zm->debug)
             {
-                wrbuf_rewind(zm->print_str);
-                wrbuf_write_escaped(zm->print_str, wrbuf_buf(zm->input_str),
-                                    wrbuf_len(zm->input_str));
-                
-                yaz_log(YLOG_LOG, "input %s", 
-                        wrbuf_cstr(zm->print_str)); 
+                yaz_log(YLOG_WARN, "bad encoding for input");
             }
-            icu_chain_assign_cstr(zm->icu_chain,
-                                  wrbuf_cstr(zm->input_str),
-                                  &status);
-            assert(U_SUCCESS(status));
-        }
-        while (icu_chain_next_token(zm->icu_chain, &status))
-        {
-            assert(U_SUCCESS(status));
-            *result_buf = icu_chain_token_sortkey(zm->icu_chain);
-            assert(*result_buf);
-
-            *result_len = strlen(*result_buf);
-
-            if (zm->debug)
-            {
-                wrbuf_rewind(zm->print_str);
-                wrbuf_write_escaped(zm->print_str, *result_buf, *result_len);
-                yaz_log(YLOG_LOG, "output %s", wrbuf_cstr(zm->print_str));
-            }
-
-            if (**result_buf != '\0')
-                return 1;
+            return -1;
         }
-        assert(U_SUCCESS(status));
     }
-    return 0;
-#else
-    return tokenize_simple(zm, result_buf, result_len);
 #endif
+    return 0;
 }
-#endif
 
 int zebra_maps_is_icu(zebra_map_t zm)
 {
+    assert(zm);
 #if YAZ_HAVE_ICU
     return zm->use_chain;
 #else