X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fzebramap.c;h=42c57e674b7e7e703050d2698bdcf0836a138246;hb=886253fb90810e512cacf4f02694645ead7a22e0;hp=e05bdcefdde6c78f46ae9ad826209eedc3664001;hpb=83533000f9456dcab2fc171abafd84d6104d4087;p=idzebra-moved-to-github.git

diff --git a/util/zebramap.c b/util/zebramap.c
index e05bdce..42c57e6 100644
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebramap.c,v $
- * Revision 1.20  2000-03-02 14:35:19  adam
+ * Revision 1.23  2001-11-15 08:41:24  adam
+ * Fix for weight (bug introduced by previous commit).
+ *
+ * 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
@@ -495,36 +504,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;
@@ -534,10 +555,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