X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcharconv.tcl;h=b509a8de57f7e08691dc22b5e386e7b8b512bece;hb=99d342b33ff48e94f97d631b127279f2face6124;hp=f43c8152eaadaa6d19077844a299e16bf9b36ba5;hpb=8626b7019b5d3d9c9594f20025e97d06a2d590fc;p=yaz-moved-to-github.git

diff --git a/src/charconv.tcl b/src/charconv.tcl
index f43c815..b509a8d 100755
--- a/src/charconv.tcl
+++ b/src/charconv.tcl
@@ -1,19 +1,24 @@
 #!/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.12 2006-04-19 23:15:39 adam Exp $
+# $Id: charconv.tcl,v 1.17 2006-08-30 20:40:18 adam Exp $
 
 proc usage {} {
     puts {charconv.tcl: [-p prefix] [-s split] [-o ofile] file ... }
     exit 1
 }
 
-proc preamble_trie {ofilehandle} {
+proc preamble_trie {ofilehandle ifiles ofile} {
     set f $ofilehandle
 
     set totype {unsigned }
 
+    puts $f "/** \\file $ofile"
+    puts $f "    \\brief Character conversion, generated from [lindex $ifiles 0]"
+    puts $f ""
+    puts $f "    Generated automatically by charconv.tcl"
+    puts $f "*/"
     puts $f "\#include <string.h>"
     puts $f "
         struct yaz_iconv_trie_flat {
@@ -160,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
+	    }
         }
     }
 }
@@ -390,7 +397,7 @@ if {![info exists ifiles]} {
 }
 
 set ofilehandle [open $ofile w]
-preamble_trie $ofilehandle
+preamble_trie $ofilehandle $ifiles $ofile
 
 foreach ifile $ifiles {
     readfile $ifile $ofilehandle $prefix $omits $reverse_map