X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcharconv.tcl;h=7876f9309434ed2180e276d8586a82423fb8a48b;hb=db93359f0cbf9a1e9dc81ea05f7b8662f843ae3d;hp=b43f12b67f3a810ae8894a16db553b24199ebc49;hpb=abd3118d2280ffe01b4ff3a7b36428b7b5c91827;p=yaz-moved-to-github.git

diff --git a/src/charconv.tcl b/src/charconv.tcl
index b43f12b..7876f93 100755
--- a/src/charconv.tcl
+++ b/src/charconv.tcl
@@ -1,8 +1,8 @@
 #!/bin/sh
-# the next line restats using tclsh \
-exec tclsh "$0" "$@"
+# the next line restarts using tclsh \
+if [ -f /usr/local/bin/tclsh8.4 ]; then exec tclsh8.4 "$0" "$@"; else exec tclsh "$0" "$@"; fi
 #
-# $Id: charconv.tcl,v 1.13 2006-04-20 20:50:51 adam Exp $
+# $Id: charconv.tcl,v 1.18 2006-12-17 15:34:11 adam Exp $
 
 proc usage {} {
     puts {charconv.tcl: [-p prefix] [-s split] [-o ofile] file ... }
@@ -165,9 +165,11 @@ proc ins_trie_r {from to combining codename this} {
             }
             ins_trie_r $rest $to $combining $codename $trie($this,ptr,$ch)
         } else {
-            set trie($this,to,$ch) $to
-            set trie($this,combining,$ch) $combining
-            set trie($this,codename,$ch) $codename
+	    if {![info exist trie($this,to,$ch)]} {
+                set trie($this,to,$ch) $to
+                set trie($this,combining,$ch) $combining
+                set trie($this,codename,$ch) $codename
+	    }
         }
     }
 }
@@ -266,12 +268,14 @@ proc readfile {fname ofilehandle prefix omits reverse} {
     set marc_lines 0
     set ucs_lines 0
     set utf_lines 0
+    set altutf_lines 0
     set codename_lines 0
     set lineno 0
     set f [open $fname r]
     set tablenumber x
     set combining 0
     set codename {}
+    set altutf {}
     while {1} {
         incr lineno
         set cnt [gets $f line]
@@ -303,6 +307,7 @@ proc readfile {fname ofilehandle prefix omits reverse} {
 		    # puts "ins_trie $hex $marc
 		    ins_trie $hex $marc $combining $codename
 		    unset hex
+
 		} else {
 		    for {set i 0} {$i < [string length $marc]} {incr i 2} {
 			lappend hex [string range $marc $i [expr $i+1]]
@@ -312,10 +317,20 @@ proc readfile {fname ofilehandle prefix omits reverse} {
 		    unset hex
 		}
 	    }
+	    if {$reverse && [string length $marc]} {
+		for {set i 0} {$i < [string length $altutf]} {incr i 2} {
+		    lappend hex [string range $altutf $i [expr $i+1]]
+		}
+		if {[info exists hex]} {
+		    ins_trie $hex $marc $combining $codename
+		    unset hex
+		}
+	    }
 	    set marc {}
 	    set uni {}
 	    set codename {}
 	    set combining 0
+	    set altutf {}
 	} elseif {[regexp {<marc>([0-9A-Fa-f]*)</marc>} $line s marc]} {
 	    incr marc_lines
 	} elseif {[regexp {<name>(.*)</name>} $line s codename]} {
@@ -336,6 +351,8 @@ proc readfile {fname ofilehandle prefix omits reverse} {
 	    incr ucs_lines
 	} elseif {[regexp {<utf-8>([0-9A-Fa-f]*)</utf-8>} $line s utf]} {
 	    incr utf_lines
+	} elseif {[regexp {<altutf-8>([0-9A-Fa-f]*)</altutf-8>} $line s altutf]} {
+	    incr altutf_lines
 	}
     }
     close $f