Rename Ship pixmap option to Vessel

[ypp-sc-tools.db-test.git] / pctb / dictionary-manager

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index b6f87a6c856b0259508b2fd5098d3af3d1a7fe14..6ade11380042f7c0e5e2e44067730413c6f5b723 100755 (executable)
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -25,6 +25,10 @@
 # sponsored by Three Rings.
 
 
+# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict-test/pctb /home/ftp/users/ijackson/pctb/test
+# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict/pctb /home/ftp/users/ijackson/pctb
+
+
 # invocation:
 # OUT OF DATE
 #  run this without args
@@ -484,7 +488,7 @@ proc maybe_upload_entry {im def} {
 
     set query [eval ::http::formatQuery $pl]
     regsub -all {%0d} $query {} query
-    debug "DB-UPDATE QUERY [string range $query 0 200]..."
+    debug "DB-UPDATE QUERY $query"
 
     if {[regexp {^\.?/} $url]} {
        set cmd [list $url $query]
@@ -1039,11 +1043,20 @@ proc approve_showentry {ix file specdata} {
     image create photo approve/$ix -data $ppm
     label $wb-image -image approve/$ix -bd 2 -relief sunken
 
+    set unic [exec perl -e {
+       use Unicode::CharName qw(uname);
+       $ARGV[0] =~ s/^ //;
+       foreach $_ (split //,$ARGV[0]) {
+           print uname(ord),"\n" or die $!
+       }
+    } " $def"]
+    label $wb-unicode -text $unic
+
     frame $wb-act
     button $wb-act.rej -text Reject -command [list approve_reject $ix]
     pack $wb-act.rej
 
-    grid $wb-def $wb-image $wb-act $wb-inf -padx 3
+    grid $wb-def $wb-image $wb-unicode $wb-act $wb-inf -padx 3
     grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
 
     lappend approve_ixes $ix
@@ -1112,14 +1125,18 @@ proc main/approve {} {
 
     if {[llength $argv] != 3} { error "wrong # args" }
     manyset $argv userhost directory dictdir
+    debug "APPROVER FOR $userhost $directory $dictdir"
+
     set cmd [list tclsh $directory/dictionary-manager]
     if {$debug} { lappend cmd --debug-server }
     lappend cmd --remote-server-1 $directory $dictdir
     switch -glob $userhost {
        {} { }
        {* *} { set cmd $userhost }
-       * { set cmd [append [list ssh $userhost] $cmd] }
+       * { set cmd [concat [list ssh $userhost] $cmd] }
     }
+    debug "APPROVER RUNS $cmd"
+
     lappend cmd 2>@ stderr
     set server [open |$cmd r+]
     must_gets_exactly_server $remoteserv_banner