Added rsisamd.h

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

diff --git a/util/zebramap.c b/util/zebramap.c
index 629d842..04446fb 100644 (file)
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebramap.c,v $
- * Revision 1.17  1999-09-08 12:13:21  adam
+ * 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
  * Fixed minor bug "replace"-mappings. Removed some logging messages.
  *
  * Revision 1.16  1999/09/07 07:19:21  adam
@@ -66,7 +78,7 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include <yaz-util.h>
+#include <yaz/yaz-util.h>
 #include <charmap.h>
 #include <zebramap.h>
 
@@ -195,6 +207,9 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
            struct zm_token *token = nmem_malloc (zms->nmem, sizeof(*token));
            token->next = (*zm)->replace_tokens;
            (*zm)->replace_tokens = token;
+#if 0
+           logf (LOG_LOG, "replace %s", argv[1]);
+#endif
            token->token_from = 0;
             if (argc >= 2)
             {
@@ -213,7 +228,12 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
                         cp++;
                     }
                     else
+                   {
                        *dp++ = zebra_prim(&cp);
+#if 0
+                       logf (LOG_LOG, "  char %2X %c", dp[-1], dp[-1]);
+#endif
+                   }
                *dp = '\0';
            }
            if (argc >= 3)
@@ -292,7 +312,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;
@@ -478,11 +498,19 @@ 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);
 }
 
@@ -558,6 +586,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;
     }
@@ -574,10 +610,10 @@ 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 
+#if 0
     logf (LOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1),
          wrbuf_buf(zms->wrbuf_1));
 #endif
@@ -627,7 +663,7 @@ int zebra_replace_sub(ZebraMaps zms, unsigned reg_id, const char *ex_list,
                if (i+j < 0 || j+i >= input_len)
                    c = ' ';
                else
-                   c = tolower(input_str[j+i]);
+                   c = input_str[j+i] & 255;
                if (token->token_from[j] == ZEBRA_REPLACE_ANY)
                {
                    if (c == ' ')
@@ -637,7 +673,9 @@ int zebra_replace_sub(ZebraMaps zms, unsigned reg_id, const char *ex_list,
                else
                {
                    if (c != token->token_from[j])
+                   {
                        break;
+                   }
                    if (!replace_done)
                    {
                        const char *cp = token->token_to;