X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fzebramap.c;h=4116e529847651d553ed435cbfed7e8dcc9a7831;hb=191ceffa0af0cc1048ef11a1bf92fece3210c879;hp=e12b445673f00b91e6300275179e3d260b76057c;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/util/zebramap.c b/util/zebramap.c
index e12b445..4116e52 100644
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,5 +1,5 @@
-/* $Id: zebramap.c,v 1.27 2002-08-02 19:26:57 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zebramap.c,v 1.33 2004-09-14 14:38:08 quinn Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -225,7 +225,8 @@ ZebraMaps zebra_maps_open (Res res, const char *base)
 
     zms->nmem = nmem_create ();
     zms->tabpath = nmem_strdup (zms->nmem,
-				res_get_def (res, "profilePath", "."));
+				res_get_def (res, "profilePath",
+                                             DEFAULT_PROFILE_PATH));
     zms->tabroot = 0;
     if (base)
         zms->tabroot = nmem_strdup (zms->nmem, base);
@@ -269,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;
@@ -289,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;
 
@@ -303,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)
 {
@@ -404,13 +372,8 @@ static int attr_find (AttrType *src, oid_value *attributeSetP)
 
 static void attr_init_APT (AttrType *src, Z_AttributesPlusTerm *zapt, int type)
 {
-#ifdef ASN_COMPILED
     src->attributeList = zapt->attributes->attributes;
     src->num_attributes = zapt->attributes->num_attributes;
-#else
-    src->attributeList = zapt->attributeList;
-    src->num_attributes = zapt->num_attributes;
-#endif
     src->type = type;
     src->major = 0;
     src->minor = 0;
@@ -476,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;
@@ -507,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)
     {
@@ -606,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;