X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fzebramap.c;h=976f5b43e28629257ecf3cc88a9fd6087bd3ca76;hb=89d059a3e4541ff00bbb4193ba34c1dbe1e21928;hp=0dc705ee0656e336d37a483ae3f5f39f0a4d4590;hpb=deec5ea01546cfdbc2d7a2b9e85c8eeeace21d11;p=idzebra-moved-to-github.git

diff --git a/util/zebramap.c b/util/zebramap.c
index 0dc705e..976f5b4 100644
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebramap.c,v $
- * Revision 1.18  1999-10-15 08:27:46  adam
+ * Revision 1.22  2001-11-14 22:06:27  adam
+ * Rank-weight may be controlled via query.
+ *
+ * Revision 1.21  2001/01/22 10:42:56  adam
+ * Added numerical sort.
+ *
+ * Revision 1.20  2000/03/02 14:35:19  adam
+ * Added structure year and date.
+ *
+ * Revision 1.19  1999/11/30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.18  1999/10/15 08:27:46  adam
  * Fixed replace handler. 8-bit fix.
  *
  * Revision 1.17  1999/09/08 12:13:21  adam
@@ -69,7 +81,7 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include <yaz-util.h>
+#include <yaz/yaz-util.h>
 #include <charmap.h>
 #include <zebramap.h>
 
@@ -303,7 +315,7 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id)
 	logf (LOG_WARN, "Unknown register type: %c", reg_id);
 
 	zm->reg_id = reg_id;
-	zm->maptab_name = NULL;
+	zm->maptab_name = nmem_strdup (zms->nmem, "@");
 	zm->maptab = NULL;
 	zm->type = ZEBRA_MAP_TYPE_INDEX;
 	zm->completeness = 0;
@@ -489,36 +501,48 @@ int zebra_maps_is_sort (ZebraMaps zms, unsigned reg_id)
     return 0;
 }
 
-int zebra_maps_sort (ZebraMaps zms, Z_SortAttributes *sortAttributes)
+int zebra_maps_sort (ZebraMaps zms, Z_SortAttributes *sortAttributes,
+                     int *numerical)
 {
     AttrType use;
+    AttrType structure;
+    int structure_value;
     attr_init_AttrList (&use, sortAttributes->list, 1);
+    attr_init_AttrList (&structure, sortAttributes->list, 4);
 
+    *numerical = 0;
+    structure_value = attr_find (&structure, 0);
+    if (structure_value == 109)
+        *numerical = 1;
     return attr_find (&use, NULL);
 }
 
 int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt,
-		     unsigned *reg_id, char **search_type, char **rank_type,
+		     unsigned *reg_id, char **search_type, char *rank_type,
 		     int *complete_flag, int *sort_flag)
 {
     AttrType completeness;
     AttrType structure;
     AttrType relation;
     AttrType sort_relation;
+    AttrType weight;
     int completeness_value;
     int structure_value;
     int relation_value;
     int sort_relation_value;
+    int weight_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);
 
     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);
 
     if (completeness_value == 2 || completeness_value == 3)
 	*complete_flag = 1;
@@ -528,10 +552,13 @@ int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt,
 
     *sort_flag = (sort_relation_value > 0) ? 1 : 0;
     *search_type = "phrase";
-    *rank_type = "void";
+    strcpy (rank_type, "void");
     if (relation_value == 102)
-	*rank_type = "rank";
-    
+    {
+        if (weight_value == -1)
+            weight_value == 34;
+        sprintf (rank_type, "rank,%d", weight_value);
+    }    
     if (*complete_flag)
 	*reg_id = 'p';
     else
@@ -569,6 +596,14 @@ int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt,
         *reg_id = '0';
         *search_type = "phrase";
         break;
+    case 4:  /* year */
+        *reg_id = 'y';
+        *search_type = "phrase";
+        break;
+    case 5:  /* date */
+        *reg_id = 'd';
+        *search_type = "phrase";
+        break;
     default:
 	return -1;
     }
@@ -585,7 +620,7 @@ WRBUF zebra_replace(ZebraMaps zms, unsigned reg_id, const char *ex_list,
 
     wrbuf_rewind(zms->wrbuf_1);
     wrbuf_write(zms->wrbuf_1, input_str, input_len);
-    if (!zm->replace_tokens)
+    if (!zm || !zm->replace_tokens)
 	return zms->wrbuf_1;
   
 #if 0