X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fcharmap.c;h=3f5abdf97c074e6aa6b6b03445a01827b7382806;hb=b8844c65622c12fb105bf7fc6bab2fc237af7c14;hp=51552f75842687a604fca6b8111c609ae4ab3a3f;hpb=7247993b5d35aa9c8f249f6340bc59d87a1f08cd;p=idzebra-moved-to-github.git

diff --git a/util/charmap.c b/util/charmap.c
index 51552f7..3f5abdf 100644
--- a/util/charmap.c
+++ b/util/charmap.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: charmap.c,v $
- * Revision 1.3  1996-06-03 15:17:46  quinn
+ * Revision 1.6  1996-06-04 13:28:00  quinn
+ * More work on charmapping
+ *
+ * Revision 1.5  1996/06/04  08:32:15  quinn
+ * Moved default keymap to keychars.c
+ *
+ * Revision 1.4  1996/06/03  16:32:13  quinn
+ * Temporary bug-fix
+ *
+ * Revision 1.3  1996/06/03  15:17:46  quinn
  * Fixed bug.
  *
  * Revision 1.2  1996/06/03  10:15:09  quinn
@@ -23,12 +32,16 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <assert.h>
 
 #include <alexutil.h>
 #include <yaz-util.h>
 #include <charmap.h>
 #include <tpath.h>
 
+#define CHR_MAXSTR 1024
+#define CHR_MAXEQUIV 32
+
 const char *CHR_UNKNOWN = "\001";
 const char *CHR_SPACE   = "\002";
 const char *CHR_BASE    = "\003";
@@ -43,7 +56,16 @@ struct chr_t_entry
     chr_t_entry **children; /* array of children */
     unsigned char *target;  /* target for this node, if any */
     unsigned char *equiv;   /* equivalent to, or sumthin */
-} t_entry;
+};
+
+/*
+ * General argument structure for callback functions (internal use only)
+ */
+typedef struct chrwork 
+{
+    chrmaptab *map;
+    char string[CHR_MAXSTR+1];
+} chrwork;
 
 /*
  * Add an entry to the character map.
@@ -63,10 +85,7 @@ static chr_t_entry *set_map_string(chr_t_entry *root, char *from, int len,
 	    (char*) root->target == CHR_UNKNOWN)
 	    root->target = (unsigned char *) xstrdup(to);
 	else if ((char*) to != CHR_SPACE)
-	{
-	    logf(LOG_FATAL, "Character map overlap");
-	    return 0;
-	}
+	    logf(LOG_WARN, "Character map overlap");
     }
     else
     {
@@ -134,22 +153,9 @@ static chr_t_entry *find_entry(chr_t_entry *t, char **from, int len)
 
 char **chr_map_input(chr_t_entry *t, char **from, int len)
 {
-    static char *buf[2] = {0, 0}, str[2] = {0, 0};
+    static char *buf[2] = {0, 0};
     chr_t_entry *res;
 
-    if (!t) /* no table loaded. Null mapping */
-    {
-	if (isalnum(**from))
-	{
-	    str[0] = **from;
-	    buf[0] = str;
-	}
-	else
-	    buf[0] = (char*) CHR_SPACE;
-	(*from)++;
-	return buf;
-    }
-    /* no children match. use our target string */
     if (!(res = find_entry(t, from, len)))
 	abort();
     buf[0] = (char *) res->target;
@@ -246,6 +252,32 @@ static void fun_addspace(char *s, void *data, int num)
     tab->input = set_map_string(tab->input, s, strlen(s), (char*) CHR_SPACE);
 }
 
+/*
+ * Create a string containing the mapped characters provided.
+ */
+static void fun_mkstring(char *s, void *data, int num)
+{
+    chrwork *arg = data;
+    char **res, *p = s;
+
+    res = chr_map_input(arg->map->input, &s, strlen(s));
+    if (*res == (char*) CHR_UNKNOWN)
+	logf(LOG_WARN, "Map: '%s' has no mapping", p);
+    strncat(arg->string, *res, CHR_MAXSTR - strlen(arg->string));
+    arg->string[CHR_MAXSTR] = '\0';
+}
+
+/*
+ * Add a map to the string contained in the argument.
+ */
+static void fun_addmap(char *s, void *data, int num)
+{
+    chrwork *arg = data;
+
+    assert(arg->map->input);
+    set_map_string(arg->map->input, s, strlen(s), arg->string);
+}
+
 static int scan_string(char *s, void (*fun)(char *c, void *data, int num),
     void *data, int *num)
 {
@@ -387,13 +419,38 @@ chrmaptab *chr_read_maptab(char *name)
 		fclose(f);
 		return 0;
 	    }
-	    if (scan_string(argv[1], fun_addspace, res, 0))
+	    if (scan_string(argv[1], fun_addspace, res, 0) < 0)
 	    {
 		logf(LOG_FATAL, "Bad space specification");
 		fclose(f);
 		return 0;
 	    }
 	}
+	else if (!yaz_matchstr(argv[0], "map"))
+	{
+	    chrwork buf;
+
+	    if (argc != 3)
+	    {
+		logf(LOG_FATAL, "charmap MAP directive requires 2 args");
+		fclose(f);
+		return 0;
+	    }
+	    buf.map = res;
+	    buf.string[0] = '\0';
+	    if (scan_string(argv[2], fun_mkstring, &buf, 0) < 0)
+	    {
+		logf(LOG_FATAL, "Bad map target");
+		fclose(f);
+		return 0;
+	    }
+	    if (scan_string(argv[1], fun_addmap, &buf, 0) < 0)
+	    {
+		logf(LOG_FATAL, "Bad map source");
+		fclose(f);
+		return 0;
+	    }
+	}
 	else
 	{
 #if 0