3 # helper program for OCR in PCTB upload client
5 # This is part of ypp-sc-tools, a set of third-party tools for assisting
6 # players of Yohoho Puzzle Pirates.
8 # Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
10 # This program is free software: you can redistribute it and/or modify
11 # it under the terms of the GNU General Public License as published by
12 # the Free Software Foundation, either version 3 of the License, or
13 # (at your option) any later version.
15 # This program is distributed in the hope that it will be useful,
16 # but WITHOUT ANY WARRANTY; without even the implied warranty of
17 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 # GNU General Public License for more details.
20 # You should have received a copy of the GNU General Public License
21 # along with this program. If not, see <http://www.gnu.org/licenses/>.
23 # Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
24 # are used without permission. This program is not endorsed or
25 # sponsored by Three Rings.
28 # ./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
29 # ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict/pctb /home/ftp/users/ijackson/pctb
34 # run this without args
36 # one line which is a Tcl list for unk_{l,r} unk_contexts glyphsdone etc.
37 # the xpm in the format expected
38 # then expect child to exit 0, or write a single 0 byte to fd 4
39 # if it wrote a byte to fd 4, it can take another question
42 #---------- library routines ----------
44 proc manyset {list args} {
45 foreach val $list var $args {
51 proc must_gets {f lvar} {
53 if {[gets $f l] < 0} { error "huh?" }
56 proc must_gets_exactly {f expected} {
58 if {[string compare $expected $got]} { error "$expected $got ?" }
61 proc read_counted {f var} {
64 set val [read $f $count]
66 if {[string length $eol]} { error "$eol ?" }
67 debug "READ_COUNTED $count $var"
70 proc puts_counted {f dvar} {
72 set count [string length $d]
75 debug "PUTS_COUNTED $count $dvar"
79 global errorCode errorInfo
80 puts stderr "ERROR: $m\n[list $errorCode]\n$errorInfo\n";
84 #---------- display core ----------
93 proc init_widgets {} {
95 global csrh gotsh ctxh
97 if {[winfo exists .d]} return
99 frame .privacy -bd 2 -relief groove
100 pack .privacy -side top -padx 2 -pady 2 -fill x
104 frame .d -bd 2 -relief groove -pady 2 -padx 2
106 image create bitmap image/main
107 label .d.mi -image image/main -borderwidth 0
109 frame .d.csr -bg black -height $csrh
110 frame .d.got -bg black -height $gotsh
111 frame .d.ctx -bg black
113 image create bitmap image/cursor -data \
114 {#define csr_width 11
115 #define csr_height 11
116 static unsigned char csr_bits[] = {
117 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x21, 0x04, 0x22, 0x02, 0x25, 0x05,
118 0xaa, 0x02, 0x74, 0x01, 0xa8, 0x00, 0x70, 0x00, 0x20, 0x00};
122 label .d.csr.csr.l -image image/cursor -compound left
123 entry .d.csr.csr.e -bd 0
124 pack .d.csr.csr.l -side left
126 frame .d.mi.csr_0 -bg white -width 1
127 frame .d.mi.csr_1 -bg white -width 1
131 button .d.pe.ok -text OK
132 pack .d.pe.grid .d.pe.ok -side left
134 pack .d.mi .d.ctx -side top
135 pack .d -fill x -padx 2 -pady 2
137 frame .help -bd 2 -relief groove
138 pack .help -pady 2 -padx 2
141 proc resize_widgets_core {} {
142 global mulcols mulrows csrh gotsh ctxh glyphsdone
143 global unk_l unk_contexts
145 foreach w {.d.csr .d.got .d.ctx} {
146 $w configure -width $mulcols
149 eval destroy [winfo children .d.ctx]
156 if {![string compare $t $last_ht]} return
157 eval destroy [grid slaves .help]
158 set y 0; foreach l $t {
159 set x 0; foreach c $l {
160 set w .help.at${x}x${y}
162 grid $w -row $y -column $x -padx 5 -sticky w
170 proc bind_key {k proc} {
172 bind .d <Key-$k> $proc
173 set keybindings($k) [expr {!![string length $proc]}]
174 .d configure -takefocus 1
176 proc unbind_all_keys {} {
178 foreach k [array names keybindings] { bind_key $k {} }
179 .d configure -takefocus 0
182 #---------- database read and write common wrapper ----------
185 if {[gets $f l] < 0} { error "unexpected db eof" }
189 proc read_database {fn} {
190 global reqkind database database_fn
191 upvar #0 database_magic/$reqkind magic
192 catch { unset database }
195 if {![file exists $database_fn]} return
196 set f [open $database_fn r]
197 if {[string compare [db_getsl $f] $magic]} { error "$l $reqkind ?" }
199 read_database_header/$reqkind $f
203 if {![string length $l1]} continue
204 if {[regexp {^\#} $l1]} continue
205 if {![string compare . $l1]} break
207 read_database_entry/$reqkind $f $l1
212 proc write_database {} {
213 global reqkind database_fn database
214 upvar #0 database_magic/$reqkind magic
216 set f [open $database_fn.new w]
219 write_database_header/$reqkind $f
222 foreach bm [array names database] {
223 lappend ol [format_database_entry/$reqkind $bm $database($bm)]
225 foreach o [lsort $ol] {
230 file rename -force $database_fn.new $database_fn
233 proc select_database {dbname_spec} {
235 set dbname $dbname_spec
236 read_database "./#local-$dbname#.txt"
239 proc do_database_update {im def} {
241 maybe_upload_entry $im $def
242 set database($im) $def
246 proc required/char {} {
247 global mulrows glyphsdone unk_l unk_r unk_contexts rows
251 manyset [lrange $l 0 3] unk_l unk_r unk_contexts
252 set glyphsdone [lrange $l 3 end]
259 .d.mi.csr_$w configure -height $mulrows
262 foreach {min max contexts got} $glyphsdone {
263 show_context maxh $min $contexts
265 show_context maxh $unk_l $unk_contexts
266 .d.ctx configure -height $maxh
268 pack .d.csr -side top -before .d.mi
269 pack .d.got .d.ctx -side top -after .d.mi
272 select_database char$rows
277 #========== PIXMAPS ==========
279 #---------- pixmap database read and write ----------
281 set database_magic/pixmap {# ypp-sc-tools pctb pixmaps v1}
283 proc read_database_header/pixmap {f} { }
284 proc read_database_entry/pixmap {f def} {
289 set p3 [db_getsl $f]; append im $p3 "\n"
290 if {[string compare $p3 P3]} { error "$p3 ?" }
292 set wh [db_getsl $f]; append im $wh "\n"; manyset $wh w h
293 set depth [db_getsl $f]; append im $depth "\n"
295 for {set y 0} {$y < $h} {incr y} {
296 set line [db_getsl $f]; append im $line "\n"
298 set database($im) $def
300 proc write_database_header/pixmap {f} { puts $f "" }
301 proc format_database_entry/pixmap {im def} {
305 #---------- pixmap display and input handling ----------
307 proc foreach_pixmap_col {var body} {
310 for {set col 0} {$col < [llength $alloptions]/3} {incr col} {
315 proc pixmap_select {ncol} {
317 debug "PIX SELECT $ncol [llength $alloptions]"
318 foreach_pixmap_col col {
319 if {$col==$ncol} continue
320 .d.pe.grid.l$col selection clear 0 end
324 proc pixmap_maybe_ok {} {
325 global alloptions pixmap_selcol pixmap_selrow
327 foreach_pixmap_col col {
328 set cs [.d.pe.grid.l$col curselection]
329 set lcs [llength $cs]
332 set pixmap_selcol $col
333 set pixmap_selrow [lindex $cs 0]
336 debug "MAYBE_OK YES col=$pixmap_selcol row=$pixmap_selrow."
337 .d.pe.ok configure -state normal -command pixmap_ok
339 .d.pe.ok configure -state disabled -command {}
343 global database ppm pixmap_selcol pixmap_selrow mainkind alloptions
344 foreach_pixmap_col col {
345 .d.pe.grid.l$col configure -state disabled
347 .d.pe.ok configure -state disabled
348 helptext {{{ Processing }}}
349 manyset [lrange $alloptions [expr {$pixmap_selcol*3}] end] \
351 manyset [lrange $rows [expr {$pixmap_selrow*2}] end] \
353 set result "$colname - $rowname"
354 debug "UPDATE PIXMAP AS >$result<"
356 do_database_update $ppm $result
360 proc required/pixmap {} {
361 global unk_what ppm mulcols alloptions
362 must_gets stdin unk_what
363 debug "GOT pixmap $unk_what"
367 if {![string length $ppml]} break
368 append ppm $ppml "\n"
370 set data [exec pnmscale 2 << $ppm]
371 image create photo image/main -data $data
373 set alloptions [exec ./dictionary-pixmap-options $unk_what]
375 select_database pixmap
377 set mulcols [image width image/main]
378 set mulrows [image height image/main]
380 place forget .d.mi.csr_0
381 place forget .d.mi.csr_1
383 pack forget .d.csr .d.got
384 pack .d.pe -side top -before .d.mi -pady 2
385 .d configure -takefocus 0
388 eval destroy [winfo children .d.pe.grid]
389 set col 0; foreach {colname coldesc rows} $alloptions {
390 debug "INIT $col $colname \"$coldesc\""
391 label .d.pe.grid.t$col -text $colname
392 listbox .d.pe.grid.l$col
393 foreach {rowname rowdesc} $rows {
394 debug "INIT $col $colname \"$coldesc\" $rowname \"$rowdesc\""
395 .d.pe.grid.l$col insert end $rowdesc
397 bind .d.pe.grid.l$col <<ListboxSelect>> [list pixmap_select $col]
398 grid .d.pe.grid.t$col -column $col -row 0
399 grid .d.pe.grid.l$col -column $col -row 1
405 {{Indicate the meaning of this image, and click OK.}}
409 #========== UPLOADS TO DICTIONARY SERVER ==========
411 proc upload_init {} {
412 global privacy_setting
414 set privacy_setting [upload_status]
416 label .privacy.warn -text " Privacy "
417 if {$privacy_setting} {
418 .privacy.warn configure -background yellow -foreground black
420 label .privacy.overall -text " Upload new dictionary entry:"
421 label .privacy.reference -text " See README.privacy."
423 pack .privacy.warn .privacy.overall -side left
425 foreach {setting string} {
428 2 {Yes, quoting my pirate name.}
430 radiobutton .privacy.o$setting -text $string \
431 -value $setting -variable privacy_setting
432 pack .privacy.o$setting -side left
433 if {$setting > $privacy_setting} {
434 .privacy.o$setting configure -state disabled
437 pack .privacy.reference -side left
439 if {!$privacy_setting} {
440 foreach w [winfo children .privacy] {
441 $w configure -state disabled
444 if {$privacy_setting} {
446 ::http::config -urlencoding utf-8
450 proc upload_status {} {
451 # returns 0, 1, 2 for none, anon, with pirate name
454 if {![info exists env(YPPSC_PCTB_DICT_SUBMIT)]} { debug a; return 0 }
455 if {![string compare 0 $env(YPPSC_PCTB_DICT_SUBMIT)]} { debug b; return 0 }
457 if {![info exists env(YPPSC_PIRATE)]} { return 1 }
458 if {![info exists env(YPPSC_OCEAN)]} { return 1 }
459 if {![string length $env(YPPSC_PIRATE)]} { return 1 }
460 if {![string length $env(YPPSC_OCEAN)]} { return 1 }
465 proc maybe_upload_entry {im def} {
466 global reqkind privacy_setting env dbname quiet
468 debug "DB-UPDATE PRIVACY $privacy_setting"
469 if {!$privacy_setting} return
471 debug "DB-UPDATE UPLOADING"
474 lappend pl dict $dbname
476 if {$privacy_setting>=2} {
477 set pirate [string totitle $env(YPPSC_PIRATE)]
478 set ocean [string totitle $env(YPPSC_OCEAN)]
479 debug "DB-UPDATE NON-ANON $ocean $pirate"
484 lappend pl entry [format_database_entry/$reqkind $im $def]
486 set url $env(YPPSC_PCTB_DICT_SUBMIT)
487 append url dictionary-update-receiver
489 set query [eval ::http::formatQuery $pl]
490 regsub -all {%0d} $query {} query
491 debug "DB-UPDATE QUERY [string range $query 0 200]..."
493 if {[regexp {^\.?/} $url]} {
494 set cmd [list $url $query]
495 debug "SUBMIT CMD [string range $cmd 0 200]..."
496 set body [eval exec $cmd 2>@ stderr]
497 regsub {^Content-Type: text/plain.*\n\n} $body {} body
501 set req [::http::geturl $url -query $query]
504 "\nWARNING: Cannot do dictionary upload: $emsg\n"
508 debug "DB-UPDATE DONE $req $s(status) [array names s]"
509 set ncode [::http::ncode $req]
511 if {!(![string compare ok $s(status)] &&
512 ![string compare 200 $ncode])} {
513 set m "\nWARNING: Dictionary upload failed:"
514 foreach v {status http error posterror} {
515 if {[info exists s($v)]} { append m "\n $v: $s($v)" }
524 if {![string match {OK *} $body]} {
525 set m "\nWARNING: Dictionary upload went wrong:\n"
526 append m "\n " [join [split $body "\n"] "\n "]
533 "Uploaded $dbname dictionary entry `$def': $body"
537 #========== CHARACTER SET ==========
539 #---------- xpm input processor ----------
541 proc char_read_xpm {f} {
542 global glyphsdone mul inter rhsmost_max unk_l unk_r mulcols mulrows
543 global cols rows wordmap
549 if {![regexp {^"(.*)",$} $l dummy l]} {
551 if {[regexp {^\}\;$} $l]} break
555 manyset $l cols rows colours cpp
556 if {$colours!=2 || $cpp!=1} { error "$l ?" }
558 set chop_l [expr {$unk_l - 80}]
559 set chop_r [expr {$cols - $unk_l - 100}]
560 if {$chop_l<0} { set chop_l 0 }
562 set unk_l [expr {$unk_l - $chop_l}]
563 set unk_r [expr {$unk_r - $chop_l}]
565 foreach {min max contexts got} $glyphsdone {
567 [expr {$min-$chop_l}] \
568 [expr {$max-$chop_l}] \
574 set cols [expr {$cols - $chop_l - $chop_r}]
575 debug "NOW cols=$cols chop_l,r=$chop_l,$chop_r rows=$rows\
578 set mulcols [expr {$cols*$mul+$inter}]
579 set mulrows [expr {$rows*$mul+$inter}]
580 append o "\"$mulcols $mulrows 9 1\",\n"
581 for {set x 0} {$x<$cols} {incr x} { set wordmap($x) 0 }
582 } elseif {$y==-2} { # first pixel
593 } elseif {$y==-1} { # 2nd pixel but we've already printed ours
595 set ybit [expr {1<<$y}]
600 set l [string range $l $chop_l end-$chop_r]
602 set l [string range $l $chop_l end]
603 append l [string repeat " " [expr -$chop_r]]
605 foreach c [split $l ""] {
607 if {$x >= $unk_l && $x <= $unk_r} {
611 foreach {min max contexts got} $glyphsdone {
613 if {$x >= $min && $x <= $max} {
614 set how [lindex {a b} $ab]
623 set p [string toupper $how]
624 incr wordmap($x) $ybit
626 default { error "$c ?" }
628 append ol "[string repeat $p [expr {$mul-$inter}]][
629 string repeat + $inter]"
630 append olh [string repeat + $mul]
636 set olhn [string repeat $olh $inter]
637 if {!$y} { append o $olhn }
638 append o [string repeat $ol [expr {$mul-1}]]
643 set data [exec xpmtoppm << $o]
644 image create photo image/main -data $data
647 #---------- character set editor display ----------
649 proc show_context {maxhv x ctxs} {
653 if {[llength $ctxs]==1} { set fg blue } { set fg yellow }
654 label $w -bg black -fg $fg -text [join $ctxs "/\n"] -justify left
655 place $w -x [expr {($x-1)*$mul}] -y 0
656 set wh [winfo reqheight $w]
657 if {$wh > $maxh} { set maxh $wh }
660 proc draw_glyphsdone {} {
661 global glyphsdone mul inter
662 eval destroy [winfo children .d.got]
663 foreach {min max contexts got} $glyphsdone {
664 frame .d.got.m$min -bd 0 -background \#888
665 label .d.got.m$min.l -text "$got" -fg white -bg black -bd 0
666 pack .d.got.m$min.l -padx 1 -pady 1
667 place .d.got.m$min -x [expr {$min*$mul+$inter}] -y 0
671 proc startup_cursor {} {
672 global cur_already cur_mode cur_0 cur_1 last_ht
673 global glyphsdone unk_l unk_r
675 set cur_already [expr {[llength $glyphsdone]/4-1}]
676 set cur_mode 1 ;# one of: 0 1 already text
679 set cur_1 [expr {$unk_r+1}]
684 #---------- character set runtime display and keystroke handling ----------
686 proc recursor/0 {} { recursor//01 0 }
687 proc recursor/1 {} { recursor//01 1 }
688 proc recursor//01 {z1} {
689 global mul rhsmost_max cols glyphsdone
691 .d.csr.csr.l configure -text {adjust}
692 place .d.csr.csr -x [expr {$cur*$mul - 7}]
693 bind_key space { othercursor }
694 bind_leftright_q cur_$z1 0 [expr {$cols-1}]
695 if {[llength $glyphsdone]} {
696 bind_key BackSpace { set cur_mode already; recursor }
698 bind_key BackSpace {}
701 if {$cur_0 != $cur_1} {
702 .d.csr.csr.e delete 0 end
708 {{<- ->} {move cursor, adjusting area to define}}
709 {Space {switch to moving other cursor}}
710 {Return {confirm location, enter letter(s)}}
711 {Backspace {switch to correcting earlier ocr}}
712 {Q {quit and abandon OCR run}}
715 proc othercursor {} {
717 set cur_mode [expr {!$cur_mode}]
721 proc recursor/text {} {
723 {Return {confirm entry of new glyph}}
724 {Escape {abandon entry}}
727 .d.csr.csr.l configure -text {define:}
728 pack .d.csr.csr.e -side left
730 bind .d.csr.csr.e <Key-Return> {
731 set strq [.d.csr.csr.e get]
732 if {[regexp -line {^(?:[!-[]|[]-~]|\\\\|\\x[0-9a-f]{2})+} $strq]} {
733 RETURN_RESULT DEFINE "$cur_0 $cur_1 $strq"
736 bind .d.csr.csr.e <Key-Escape> {
738 pack forget .d.csr.csr.e
745 proc recursor/already {} {
748 global cur_already mul
749 global glyphsdone cur_already mul
750 .d.csr.csr.l configure -text {correct}
751 set rmax [lindex $glyphsdone [expr {$cur_already*4}]]
752 place .d.csr.csr -x [expr {$rmax*$mul-3}]
754 bind_leftright_q cur_already 0 [expr {[llength $glyphsdone]/4-1}]
755 bind_key space { bind_key Delete {}; set cur_mode 1; recursor }
757 RETURN_RESULT DELETE [lrange $glyphsdone \
758 [expr $cur_already*4] \
759 [expr $cur_already*4+2]]
762 {{<- ->} {move cursor, selecting glyph to correct}}
763 {Del {clear this glyph from the recognition database}}
764 {Space {switch to selecting area to define as new glyph}}
765 {Q {quit and abandon OCR run}}
769 proc bind_leftright_q {var min max} {
770 bind_key Left [list leftright $var $min $max -1]
771 bind_key Right [list leftright $var $min $max +1]
773 puts stderr "\nCharacter resolver quitting as you requested."
777 proc leftright {var min max inc} {
781 if {$vnew < $min || $vnew > $max} return
787 global csrh cur_mode cur_0 cur_1 mul
789 place .d.mi.csr_$z1 -y 0 -x [expr {[set cur_$z1] * $mul}]
794 #---------- character database read and write ----------
799 # <context> <ncharacters> <hex>...
803 # $database($context 0x<bits> 0x<bits>...) = $hex
805 set database_magic/char {# ypp-sc-tools pctb font v1}
807 proc read_database_header/char {f} {
809 if {([db_getsl $f])+0 != $rows} { error "wrong h ?" }
811 proc read_database_entry/char {f context} {
814 set strq [db_getsl $f]
817 if {![string length $l]} break
818 lappend bm [format %x 0x$l]
820 set database($bm) $strq
823 proc write_database_header/char {f} {
827 proc format_database_entry/char {bm strq} {
829 set o "[lindex $bm 0]\n$strq\n"
830 foreach x [lrange $bm 1 end] { append o "$x\n" }
834 proc dbkey {ctx l r} {
837 for {set x $l} {$x <= $r} {incr x} {
838 lappend bm [format %x $wordmap($x)]
843 proc update_database/DEFINE {c0 c1 strq} {
844 global glyphsdone unk_l unk_contexts wordmap database
845 if {$c0 > $c1} { manyset [list $c0 $c1] c1 c0 }
847 set ncontexts $unk_contexts
849 foreach {l r contexts got} $glyphsdone {
850 if {$l==$c0} { set ncontexts $contexts; break }
852 if {![info exists ncontexts]} {
853 puts stderr "must start at letter LHS!"
858 foreach c $ncontexts {
859 set bm [dbkey $c $c0 $c1]
860 do_database_update $bm $strq
864 proc update_database/DELETE {l r ctxs} {
867 set bm [dbkey $ctx $l $r]
868 catch { unset database($bm) }
873 proc RETURN_RESULT {how what} {
875 place forget .d.csr.csr
876 pack forget .d.csr.csr.e
877 helptext {{{ Processing }}}
881 eval update_database/$how $what
885 #========== server for approving updates ==========
887 proc remote-serv-log {dict pirate caller file event} {
888 global remoteserv_logf
889 set t [clock format [clock seconds] -format {%Y-%m-%d %H:%M:%S %Z}]
890 set s [format "%s %-6s %-31s %-31s %s %s\n" \
891 $t $dict $pirate $caller [file tail $file] $event]
892 puts -nonewline $remoteserv_logf $s
895 proc remote-serv/list {} {
897 foreach file [glob -nocomplain -type f -directory $dropdir _update.*.rdy] {
903 puts_counted stdout d
908 proc remote-serv/take {yesno file dict} {
909 global dropdir dictdir rows reqkind database
911 debug "TAKE [list $yesno $file $dict]"
912 read_counted stdin pirate
913 read_counted stdin caller
914 read_counted stdin key
915 read_counted stdin val
917 must_gets_exactly stdin confirmed
919 if {![string compare pixmap $dict]} {
922 } elseif {[regexp {^(char)([1-9]\d*)$} $dict dummy reqkind rows]} {
923 debug "DICT CHAR rqk=$reqkind r=$rows."
929 read_database $dictdir/master-$dict.txt
930 set database($key) $val
936 remote-serv-log $dict $pirate $caller $file "$desc $reqkind $rows"
937 file delete -force $file
942 proc remote-serv/noop {} {
946 set remoteserv_banner {ypp-sc-tools pctb remote-server v1}
948 proc main/remoteserv {} {
949 global argv dropdir remoteserv_banner remoteserv_logf dictdir
950 manyset $argv dropdir dictdir
951 puts $remoteserv_banner
952 set remoteserv_logf [open $dropdir/_dict.log a]
953 fconfigure $remoteserv_logf -buffering line
956 if {[gets stdin l] < 0} break
961 #========== updates approver ==========
963 proc puts_server {s} {
968 proc must_gets_server {lv} {
975 proc must_gets_exactly_server {expected} {
977 if {[string compare $expected $got]} { error "$expected $got ?" }
980 proc regsub-data {exp subspec args} {
982 if {![eval regsub $args -- [list $exp $data $subspec data]]} {
983 error "$exp >$data< ?"
987 proc chop_counted {var} {
990 if {![regexp {^(0|[1-9]\d*)\n} $data dummy l]} { error "$data ?" }
991 regsub-data {^.*\n} {} -line
992 set val [string range $data 0 [expr {$l-1}]]
993 set data [string range $data $l end]
994 debug "CHOP_COUNTED $l $var"
998 proc approve_decompose_data {specdata} {
1002 regsub-data {^ypp-sc-tools dictionary update v1\n} {}
1003 uplevel 1 chop_counted pirate
1004 uplevel 1 chop_counted caller
1005 uplevel 1 chop_counted dict
1006 uplevel 1 chop_counted ctx
1007 uplevel 1 chop_counted def
1008 uplevel 1 chop_counted image
1009 uplevel 1 chop_counted key
1010 uplevel 1 chop_counted val
1012 return [uplevel 1 {list $dict $def $image}]
1015 proc approve_compare {fd1 fd2} {
1016 manyset $fd1 file data; set sv1 [approve_decompose_data $data]
1017 manyset $fd2 file data; set sv2 [approve_decompose_data $data]
1018 return [string compare $sv1 $sv2]
1021 proc approve_showentry {ix file specdata} {
1024 approve_decompose_data $specdata
1029 label $wb-inf.who -text $pirate
1031 entry $wb-inf.file -font fixed -relief flat
1032 $wb-inf.file insert end [file tail $file]
1033 $wb-inf.file configure -state readonly -width -1
1035 pack $wb-inf.who $wb-inf.file -side top
1038 label $wb-def.scope -text "$dict $ctx"
1039 label $wb-def.def -text $def
1040 pack $wb-def.scope $wb-def.def -side bottom
1042 set ppm [exec pnmscale 2 << $image]
1043 image create photo approve/$ix -data $ppm
1044 label $wb-image -image approve/$ix -bd 2 -relief sunken
1047 button $wb-act.rej -text Reject -command [list approve_reject $ix]
1050 grid $wb-def $wb-image $wb-act $wb-inf -padx 3
1051 grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
1053 lappend approve_ixes $ix
1056 proc approve_approve_reject_one {ix yesno} {
1057 global approve_list server
1058 manyset [lindex $approve_list $ix] file tdata
1059 approve_decompose_data $tdata
1060 puts_server "take $yesno $file $dict"
1061 puts_counted $server pirate
1062 puts_counted $server caller
1063 puts_counted $server key
1064 puts_counted $server val
1065 puts_server confirmed
1067 must_gets_exactly_server done
1070 proc approve_check_server {} {
1074 must_gets_exactly_server ok
1077 proc approve_reject {ix} {
1078 approve_check_server
1079 approve_approve_reject_one $ix 0
1083 proc approve_these {} {
1085 approve_check_server
1086 foreach ix $approve_ixes { approve_approve_reject_one $ix 1 }
1090 proc approve_fetch_list {} {
1091 global server approve_list
1096 must_gets_server more
1097 switch -exact $more {
1100 default { error "$more ?" }
1102 must_gets_server file
1103 read_counted $server data
1104 lappend approve_list [list $file $data]
1107 if {![llength $approve_list]} { puts "Nothing (more) to approve."; exit 0 }
1109 set approve_list [lsort -command approve_compare $approve_list]
1113 proc main/approve {} {
1114 global argv server remoteserv_banner data approve_list approve_page
1115 global userhost directory dictdir debug
1117 if {[llength $argv] != 3} { error "wrong # args" }
1118 manyset $argv userhost directory dictdir
1119 debug "APPROVER FOR $userhost $directory $dictdir"
1121 set cmd [list tclsh $directory/dictionary-manager]
1122 if {$debug} { lappend cmd --debug-server }
1123 lappend cmd --remote-server-1 $directory $dictdir
1124 switch -glob $userhost {
1126 {* *} { set cmd $userhost }
1127 * { set cmd [concat [list ssh $userhost] $cmd] }
1129 debug "APPROVER RUNS $cmd"
1131 lappend cmd 2>@ stderr
1132 set server [open |$cmd r+]
1133 must_gets_exactly_server $remoteserv_banner
1135 button .left -text {<<} -command {approve_show_page -1}
1136 button .right -text {>>} -command {approve_show_page +1}
1138 label .title -text {}
1139 frame .app -bd 2 -relief groove
1140 button .ok -text "Approve These" -command approve_these
1141 pack .title .app -side top
1142 pack .left -side left
1143 pack .right -side right
1144 pack .ok -side bottom
1150 proc approve_show_page {delta} {
1151 global approve_page approve_ixes approve_list userhost directory dictdir
1153 eval destroy [winfo children .app]
1157 incr approve_page $delta
1159 set ll [llength $approve_list]
1160 set npages [expr {($ll+$per_page-1)/$per_page}]
1161 if {$approve_page >= $npages} { incr approve_page -1 }
1163 set page_start [expr {$approve_page*$per_page}]
1164 set page_end [expr {$page_start+$per_page-1}]
1166 for {set ix $page_start} {$ix < $ll && $ix <= $page_end} {incr ix} {
1167 set fd [lindex $approve_list $ix]
1168 eval approve_showentry $ix $fd
1171 .title configure -text \
1172 "$userhost\n$directory => $dictdir\nPage [expr {$approve_page+1}]/$npages"
1174 .left configure -state disabled
1175 .right configure -state disabled
1176 if {$approve_page>0} { .left configure -state normal }
1177 if {$approve_page<$npages-1} { .right configure -state normal }
1180 #========== main program ==========
1182 proc main/default {} {
1183 puts stderr "Do not run this program directly."
1186 proc done/default {} {
1192 fileevent stdin readable {}
1193 fconfigure stdin -blocking yes
1195 if {[gets stdin reqkind]<0} {
1196 if {[eof stdin]} { fconfigure stdin -blocking yes; exit 0 }
1204 proc main/automatic {} {
1205 fconfigure stdin -blocking no
1206 fileevent stdin readable required
1208 proc done/automatic {} {
1209 exec sh -c {printf \\0 >&4}
1215 set mainkind default
1221 switch -exact -- $arg {
1222 {--quiet} { set quiet 1 }
1223 {--debug} { set debug 1 }
1224 {--debug-server} { proc debug {m} { puts stderr "DICT-MGR-SVR $m" }}
1226 {--approve-updates} { set mainkind approve; break }
1227 {--automatic-1} { set mainkind automatic; break }
1228 {--remote-server-1} { set mainkind remoteserv; break }
1229 {--automatic*} - {--remote-server}
1230 { error "incompatible versions - install problem" }
1231 default { error "huh $argv ?" }
1235 proc debug {m} { puts stderr "DICT-MGR $m" }
1237 set argv [lrange $argv $ai end]