Merge ijackson@chiark:/home/ijackson/things/ypp-sc-tools.pctb-dict-test

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

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index 7284b374cc666852e7d4562372562f4ebe4c258d..81a480ef476a0278f84f6a7bd6a1f85e66899efa 100755 (executable)
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -488,7 +488,7 @@ proc maybe_upload_entry {im def} {
 
     set query [eval ::http::formatQuery $pl]
     regsub -all {%0d} $query {} query
 
     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]
 
     if {[regexp {^\.?/} $url]} {
        set cmd [list $url $query]


@@ -1043,11 +1043,25 @@ proc approve_showentry {ix file specdata} {
     image create photo approve/$ix -data $ppm
     label $wb-image -image approve/$ix -bd 2 -relief sunken
 
     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
+
+    if {$ix} {
+       label $wb-div -bd 1 -relief sunken -image image/empty
+       grid configure $wb-div -columnspan 5 -sticky ew -padx 5
+    }
+

     frame $wb-act
     button $wb-act.rej -text Reject -command [list approve_reject $ix]
     pack $wb-act.rej
 
     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
     grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
 
     lappend approve_ixes $ix


@@ -1143,6 +1157,8 @@ proc main/approve {} {
     pack .right -side right
     pack .ok -side bottom
 
     pack .right -side right
     pack .ok -side bottom
 

+    image create bitmap image/empty
+

     set approve_page 0
     approve_fetch_list
 }
     set approve_page 0
     approve_fetch_list
 }