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

diff --git a/src/charconv.tcl b/src/charconv.tcl
index 7876f93..dc494b1 100755
--- a/src/charconv.tcl
+++ b/src/charconv.tcl
@@ -2,7 +2,7 @@
 # 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.18 2006-12-17 15:34:11 adam Exp $
+# $Id: charconv.tcl,v 1.19 2007-09-17 19:18:27 adam Exp $
 
 proc usage {} {
     puts {charconv.tcl: [-p prefix] [-s split] [-o ofile] file ... }
@@ -282,22 +282,12 @@ proc readfile {fname ofilehandle prefix omits reverse} {
         if {$cnt < 0} {
             break
         }
-	if {[regexp {<entitymap>} $line s]} {
-	    reset_trie
-	    set trie(prefix) "${prefix}"
-	} elseif {[regexp {</entitymap>} $line s]} {
+	if {[regexp {</characterSet>} $line s]} {
 	    dump_trie $ofilehandle
-	} elseif {[regexp {<character hex="([^\"]*)".*<unientity>([0-9A-Fa-f]*)</unientity>} $line s hex ucs]} {
-	    ins_trie $hex $ucs $combining {}
-	    unset hex
-	} elseif {[regexp {<codeTable .*number="([0-9]+)"} $line s tablenumber]} {
+	} elseif {[regexp {<characterSet .*ISOcode="([0-9A-Fa-f]+)"} $line s tablenumber]} {
 	    reset_trie
 	    set trie(prefix) "${prefix}_$tablenumber"
 	    set combining 0
-	} elseif {[regexp {</codeTable>} $line s]} {
-	    if {[lsearch $omits $tablenumber] == -1} {
-		dump_trie $ofilehandle
-	    }
 	} elseif {[regexp {</code>} $line s]} {
 	    if {[string length $ucs]} {
 		if {$reverse} {