X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fdictionary-manager;h=210af064c8d13f7f91447b2fae2d09e6ef942573;hb=579edbc3e615ade4ac65296eeaff383ac19fe9b1;hp=63c096dee04b9a45a733bb554832498b68012233;hpb=c3bdac1bb1e4dd2ac8f7934748232d3cd2e477ad;p=ypp-sc-tools.web-live.git

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index 63c096d..210af06 100755
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -53,6 +53,13 @@ proc must_gets {f lvar} {
     if {[gets $f l] < 0} { error "huh?" }
 }
 
+proc must_gets_imagel {f lvar} {
+    global debug_rect
+    upvar 1 $lvar l
+    must_gets $f l
+    if {$debug_rect} { debug "<< $l" }
+}
+
 proc must_gets_exactly {f expected} {
     must_gets $f got
     if {[string compare $expected $got]} { error "$expected $got ?" }
@@ -246,13 +253,13 @@ proc do_database_update {im def} {
     
 proc required/char {} {
     global mulrows glyphsdone unk_l unk_r unk_contexts rows new_context
-    global all_contexts
+    global all_contexts debug_rect
     
     must_gets stdin l
+    debug "GOT $l"
 
     manyset [lrange $l 0 3] unk_l unk_r unk_contexts
     set glyphsdone [lrange $l 3 end]
-    debug "GOT $l"
 
     char_read_xpm stdin
 
@@ -397,7 +404,7 @@ proc required/pixmap {} {
     debug "GOT pixmap $unk_what"
     set ppm {}
     while 1 {
-	must_gets stdin ppml
+	must_gets_imagel stdin ppml
 	if {![string length $ppml]} break
 	append ppm $ppml "\n"
     }
@@ -568,7 +575,7 @@ proc maybe_upload_entry {im def} {
 
     if {!$quiet} {
 	puts stderr \
-	    "Uploaded $dbname dictionary entry `$def': $body"
+	    "Uploaded $dbname `$def': $body"
     }
 }
 
@@ -583,7 +590,7 @@ proc char_read_xpm {f} {
     set o {}
     set y -3
     while 1 {
-	must_gets $f l
+	must_gets_imagel $f l
 	if {![regexp {^"(.*)",$} $l dummy l]} {
 	    append o "$l\n"
 	    if {[regexp {^\}\;$} $l]} break
@@ -889,7 +896,8 @@ set database_magic/char {# ypp-sc-tools pctb font v1}
     
 proc read_database_header/char {f} {
     global rows
-    if {([db_getsl $f])+0 != $rows} { error "wrong h ?" }
+    set l [db_getsl $f]
+    if {$l+0 != $rows} { error "wrong h $l $rows ?" }
 }
 proc read_database_entry/char {f context} {
     global database
@@ -1035,7 +1043,7 @@ proc remote-serv/take {yesno file dict} {
 
     must_gets_exactly stdin confirmed
 
-    manyset [dict2_reqkind_rows reqkind rows]
+    manyset [dict2_reqkind_rows $dict] reqkind rows
     
     if {$yesno} {
 	read_database $dictdir/master-$dict.txt
@@ -1102,7 +1110,7 @@ proc dict2_reqkind_rows {dict} {
 	debug "DICT PIXMAP"
     } elseif {[regexp {^(char)([1-9]\d*)$} $dict dummy reqkind rows]} {
 	debug "DICT CHAR rqk=$reqkind r=$rows."
-	return [list $reqkind rows]
+	return [list $reqkind $rows]
     } else {
 	error "$dict ?"
     }
@@ -1153,7 +1161,7 @@ proc string2unicodenames {str} {
 }
 
 proc approve_showentry {ix file specdata} {
-    global approve_ixes reqkind
+    global approve_ixes reqkind approve_entryhow
     
     approve_decompose_data $specdata
 
@@ -1185,9 +1193,14 @@ proc approve_showentry {ix file specdata} {
 	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 -bd 2 -relief groove
+    set approve_entryhow($ix) approve
+    foreach how {approve reject defer} {
+	set w $wb-act.$how
+	radiobutton $w -variable approve_entryhow($ix) \
+	    -text [string totitle $how] -value $how
+	pack $w -side left
+    }
 
     grid $wb-def $wb-image $wb-xinfo $wb-act $wb-inf -padx 3
     grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
@@ -1216,16 +1229,18 @@ proc approve_check_server {} {
     must_gets_exactly_server ok
 }
 
-proc approve_reject {ix} {
+proc approve_confirm {} {
+    global approve_ixes approve_entryhow
     approve_check_server
-    approve_approve_reject_one $ix 0
-    approve_fetch_list
-}
-
-proc approve_these {} {
-    global approve_ixes
-    approve_check_server
-    foreach ix $approve_ixes { approve_approve_reject_one $ix 1 }
+    foreach ix $approve_ixes {
+	set how $approve_entryhow($ix)
+	switch -exact $how {
+	    approve { approve_approve_reject_one $ix 1 }
+	    reject  { approve_approve_reject_one $ix 0 }
+	    defer   { }
+	    default { error $how? }
+	}
+    }
     approve_fetch_list
 }
 
@@ -1266,7 +1281,7 @@ proc main/approve {} {
     switch -glob $userhost {
 	{} { }
 	{* *} { set cmd $userhost }
-	* { set cmd [concat [list ssh $userhost] $cmd] }
+	* { set cmd [concat [list ssh -o compression=yes $userhost] $cmd] }
     }
     debug "APPROVER RUNS $cmd"
 
@@ -1279,7 +1294,7 @@ proc main/approve {} {
 
     label .title -text {}
     frame .app -bd 2 -relief groove
-    button .ok -text "Approve These" -command approve_these
+    button .ok -text "Confirm" -command approve_confirm
     pack .title .app -side top
     pack .left -side left
     pack .right -side right
@@ -1369,12 +1384,14 @@ proc debug {m} { }
 set mainkind default
 set ai 0
 set debug 0
+set debug_rect 0
 set quiet 0
 foreach arg $argv {
     incr ai
     switch -exact -- $arg {
 	{--quiet}           { set quiet 1 }
 	{--debug}           { set debug 1 }
+	{--debug-rect}      { set debug_rect 1 }
 	{--debug-server}    { proc debug {m} { puts stderr "DICT-MGR-SVR $m" }}
 	{--noop-arg}        { }
 	{--approve-updates} { set mainkind approve; break }