Using the new ylog.h everywhere, and fixing what that breaks!

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

diff --git a/util/zebramap.c b/util/zebramap.c
index b89aae2..df1a50c 100644 (file)
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,5 +1,5 @@
-/* $Id: zebramap.c,v 1.29 2002-12-16 22:59:34 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zebramap.c,v 1.35 2004-11-19 10:27:18 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -27,7 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/yaz-util.h>
 #include <charmap.h>
-#include <zebramap.h>
+#include <idzebra/zebramap.h>
 
 #define ZEBRA_MAP_TYPE_SORT  1
 #define ZEBRA_MAP_TYPE_INDEX 2
@@ -97,7 +97,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
 
     if (!(f = yaz_fopen(zms->tabpath, name, "r", zms->tabroot)))
     {
-       logf(LOG_WARN|LOG_ERRNO, "%s", name);
+       yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", name);
        return ;
     }
     while ((argc = readconf_line(f, &lineno, line, 512, argv, 10)))
@@ -156,7 +156,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
            token->next = (*zm)->replace_tokens;
            (*zm)->replace_tokens = token;
 #if 0
-           logf (LOG_LOG, "replace %s", argv[1]);
+           yaz_log (YLOG_LOG, "replace %s", argv[1]);
 #endif
            token->token_from = 0;
             if (argc >= 2)
@@ -179,7 +179,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
                    {
                        *dp++ = zebra_prim(&cp);
 #if 0
-                       logf (LOG_LOG, "  char %2X %c", dp[-1], dp[-1]);
+                       yaz_log (YLOG_LOG, "  char %2X %c", dp[-1], dp[-1]);
 #endif
                    }
                *dp = '\0';
@@ -262,7 +262,7 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id)
     if (!zm)
     {
        zm = (struct zebra_map *) nmem_malloc (zms->nmem, sizeof(*zm));
-       logf (LOG_WARN, "Unknown register type: %c", reg_id);
+       yaz_log (YLOG_WARN, "Unknown register type: %c", reg_id);
 
        zm->reg_id = reg_id;
        zm->maptab_name = nmem_strdup (zms->nmem, "@");
@@ -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;
@@ -281,22 +282,22 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id)
        if (!(zm->maptab = chrmaptab_create (zms->tabpath,
                                             zm->maptab_name, 0,
                                              zms->tabroot)))
-           logf(LOG_WARN, "Failed to read character table %s",
+           yaz_log(YLOG_WARN, "Failed to read character table %s",
                 zm->maptab_name);
        else
-           logf(LOG_DEBUG, "Read character table %s", zm->maptab_name);
+           yaz_log(YLOG_DEBUG, "Read character table %s", zm->maptab_name);
     }
     return zm->maptab;
 }
 
 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;
 
@@ -304,40 +305,6 @@ const char **zebra_maps_input (ZebraMaps zms, unsigned reg_id,
     return zms->temp_map_ptr;
 }
 
-#if 0
-int zebra_maps_input_tokens (ZebraMaps zms, unsigned reg_id,
-                            const char *input_str, int input_len,
-                            WRBUF wrbuf)
-{
-    chrmaptab maptab = zebra_charmap_get (zms, reg_id);
-    int len[4];
-    char *str[3];
-    int input_i = 0;
-    int first = 1;
-    const char **out;
-       
-    if (!maptab)
-    {
-       wrbuf_write (wrbuf, input_str, input_len);
-       return -1;
-    }
-    str[0] = " ";
-    len[0] = 1;
-    str[1] = input_str;
-    len[1] = input_len;
-    str[2] = " ";
-    len[2] = 1;
-    len[3] = -1;
-    
-    out = chr_map_input (maptab, str, len);
-    while (len[1] > 0)
-    {
-       while (out && *out && **out == *CHR_SPACE)
-           out = chr_map_input (maptab, str, len);
-    }
-}
-#endif
-
 const char *zebra_maps_output(ZebraMaps zms, unsigned reg_id,
                              const char **from)
 {
@@ -472,23 +439,27 @@ int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt,
     AttrType relation;
     AttrType sort_relation;
     AttrType weight;
+    AttrType use;
     int completeness_value;
     int structure_value;
     int relation_value;
     int sort_relation_value;
     int weight_value;
+    int use_value;
 
     attr_init_APT (&structure, zapt, 4);
     attr_init_APT (&completeness, zapt, 6);
     attr_init_APT (&relation, zapt, 2);
     attr_init_APT (&sort_relation, zapt, 7);
     attr_init_APT (&weight, zapt, 9);
+    attr_init_APT (&use, zapt, 1);
 
     completeness_value = attr_find (&completeness, NULL);
     structure_value = attr_find (&structure, NULL);
     relation_value = attr_find (&relation, NULL);
     sort_relation_value = attr_find (&sort_relation, NULL);
     weight_value = attr_find (&weight, NULL);
+    use_value = attr_find(&use, NULL);
 
     if (completeness_value == 2 || completeness_value == 3)
        *complete_flag = 1;
@@ -503,7 +474,7 @@ int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt,
     {
         if (weight_value == -1)
             weight_value = 34;
-        sprintf (rank_type, "rank,%d", weight_value);
+        sprintf (rank_type, "rank,w=%d,u=%d", weight_value, use_value);
     }
     if (relation_value == 103)
     {
@@ -575,7 +546,7 @@ WRBUF zebra_replace(ZebraMaps zms, unsigned reg_id, const char *ex_list,
        return zms->wrbuf_1;
   
 #if 0
-    logf (LOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1),
+    yaz_log (YLOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1),
          wrbuf_buf(zms->wrbuf_1));
 #endif
     for (;;)
@@ -602,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;
@@ -662,7 +633,7 @@ int zebra_replace_sub(ZebraMaps zms, unsigned reg_id, const char *ex_list,
        }
     }
 #if 0
-    logf (LOG_LOG, "out:%.*s:", wrbuf_len(wrbuf), wrbuf_buf(wrbuf));
+    yaz_log (YLOG_LOG, "out:%.*s:", wrbuf_len(wrbuf), wrbuf_buf(wrbuf));
 #endif
     return no_replaces;
 }