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
127 frame .d.mi.csr_0 -bg white -width 1
128 frame .d.mi.csr_1 -bg white -width 1
132 button .d.pe.ok -text OK
133 pack .d.pe.grid .d.pe.ok -side left
135 pack .d.mi .d.ctx -side top
136 pack .d -fill x -padx 2 -pady 2
138 frame .help -bd 2 -relief groove
139 pack .help -pady 2 -padx 2
142 proc resize_widgets_core {} {
143 global mulcols mulrows csrh gotsh ctxh glyphsdone
144 global unk_l unk_contexts
146 foreach w {.d.csr .d.got .d.ctx} {
147 $w configure -width $mulcols
150 eval destroy [winfo children .d.ctx]
157 if {![string compare $t $last_ht]} return
158 eval destroy [grid slaves .help]
159 set y 0; foreach l $t {
160 set x 0; foreach c $l {
161 set w .help.at${x}x${y}
163 grid $w -row $y -column $x -padx 5 -sticky w
171 proc bind_key {k proc} {
173 bind .d <Key-$k> $proc
174 set keybindings($k) [expr {!![string length $proc]}]
175 .d configure -takefocus 1
177 proc unbind_all_keys {} {
179 foreach k [array names keybindings] { bind_key $k {} }
180 .d configure -takefocus 0
183 #---------- database read and write common wrapper ----------
186 if {[gets $f l] < 0} { error "unexpected db eof" }
190 proc read_database {fn} {
191 global reqkind database database_fn
192 upvar #0 database_magic/$reqkind magic
193 catch { unset database }
196 if {![file exists $database_fn]} return
197 set f [open $database_fn r]
198 if {[string compare [db_getsl $f] $magic]} { error "$l $reqkind ?" }
200 read_database_header/$reqkind $f
204 if {![string length $l1]} continue
205 if {[regexp {^\#} $l1]} continue
206 if {![string compare . $l1]} break
208 read_database_entry/$reqkind $f $l1
213 proc write_database {} {
214 global reqkind database_fn database
215 upvar #0 database_magic/$reqkind magic
217 set f [open $database_fn.new w]
220 write_database_header/$reqkind $f
223 foreach bm [array names database] {
224 lappend ol [format_database_entry/$reqkind $bm $database($bm)]
226 foreach o [lsort $ol] {
231 file rename -force $database_fn.new $database_fn
234 proc select_database {dbname_spec} {
236 set dbname $dbname_spec
237 read_database "./#local-$dbname#.txt"
240 proc do_database_update {im def} {
242 maybe_upload_entry $im $def
243 set database($im) $def
247 proc required/char {} {
248 global mulrows glyphsdone unk_l unk_r unk_contexts rows
252 manyset [lrange $l 0 3] unk_l unk_r unk_contexts
253 set glyphsdone [lrange $l 3 end]
260 .d.mi.csr_$w configure -height $mulrows
263 foreach {min max contexts got} $glyphsdone {
264 show_context maxh $min $contexts
267 destroy [winfo children .d.seldict]
268 label .d.seldict.title -text {Select matching context:}
269 pack .d.seldict.title -side left
271 show_context maxh $unk_l $unk_contexts
272 .d.ctx configure -height $maxh
274 pack .d.seldict .d.csr -side top -before .d.mi
275 pack .d.got .d.ctx -side top -after .d.mi
278 select_database char$rows
283 proc approve_showentry_xinfo/char {w def} {
284 set unic [string2unicodenames $def]
288 #========== PIXMAPS ==========
290 #---------- pixmap database read and write ----------
292 set database_magic/pixmap {# ypp-sc-tools pctb pixmaps v1}
294 proc read_database_header/pixmap {f} { }
295 proc read_database_entry/pixmap {f def} {
300 set p3 [db_getsl $f]; append im $p3 "\n"
301 if {[string compare $p3 P3]} { error "$p3 ?" }
303 set wh [db_getsl $f]; append im $wh "\n"; manyset $wh w h
304 set depth [db_getsl $f]; append im $depth "\n"
306 for {set y 0} {$y < $h} {incr y} {
307 set line [db_getsl $f]; append im $line "\n"
309 set database($im) $def
311 proc write_database_header/pixmap {f} { puts $f "" }
312 proc format_database_entry/pixmap {im def} {
316 #---------- pixmap display and input handling ----------
318 proc foreach_pixmap_col {var body} {
321 for {set col 0} {$col < [llength $alloptions]/3} {incr col} {
326 proc pixmap_select {ncol} {
328 debug "PIX SELECT $ncol [llength $alloptions]"
329 foreach_pixmap_col col {
330 if {$col==$ncol} continue
331 .d.pe.grid.l$col selection clear 0 end
335 proc pixmap_maybe_ok {} {
336 global alloptions pixmap_selcol pixmap_selrow
338 foreach_pixmap_col col {
339 set cs [.d.pe.grid.l$col curselection]
340 set lcs [llength $cs]
343 set pixmap_selcol $col
344 set pixmap_selrow [lindex $cs 0]
347 debug "MAYBE_OK YES col=$pixmap_selcol row=$pixmap_selrow."
348 .d.pe.ok configure -state normal -command pixmap_ok
350 .d.pe.ok configure -state disabled -command {}
354 global database ppm pixmap_selcol pixmap_selrow mainkind alloptions
355 foreach_pixmap_col col {
356 .d.pe.grid.l$col configure -state disabled
358 .d.pe.ok configure -state disabled
359 helptext {{{ Processing }}}
360 manyset [lrange $alloptions [expr {$pixmap_selcol*3}] end] \
362 manyset [lrange $rows [expr {$pixmap_selrow*2}] end] \
364 set result "$colname - $rowname"
365 debug "UPDATE PIXMAP AS >$result<"
367 do_database_update $ppm $result
371 proc required/pixmap {} {
372 global unk_what ppm mulcols alloptions
373 must_gets stdin unk_what
374 debug "GOT pixmap $unk_what"
378 if {![string length $ppml]} break
379 append ppm $ppml "\n"
381 set data [exec pnmscale 2 << $ppm]
382 image create photo image/main -data $data
384 set alloptions [exec ./dictionary-pixmap-options $unk_what]
386 select_database pixmap
388 set mulcols [image width image/main]
389 set mulrows [image height image/main]
391 place forget .d.mi.csr_0
392 place forget .d.mi.csr_1
394 pack forget .d.seldict .d.csr .d.got
395 pack .d.pe -side top -before .d.mi -pady 2
396 .d configure -takefocus 0
399 eval destroy [winfo children .d.pe.grid]
400 set col 0; foreach {colname coldesc rows} $alloptions {
401 debug "INIT $col $colname \"$coldesc\""
402 label .d.pe.grid.t$col -text $colname
403 listbox .d.pe.grid.l$col
404 foreach {rowname rowdesc} $rows {
405 debug "INIT $col $colname \"$coldesc\" $rowname \"$rowdesc\""
406 .d.pe.grid.l$col insert end $rowdesc
408 bind .d.pe.grid.l$col <<ListboxSelect>> [list pixmap_select $col]
409 grid .d.pe.grid.t$col -column $col -row 0
410 grid .d.pe.grid.l$col -column $col -row 1
416 {{Indicate the meaning of this image, and click OK.}}
420 proc approve_showentry_xinfo/pixmap {w def} {
421 label $w -image image/empty
424 #========== UPLOADS TO DICTIONARY SERVER ==========
426 proc upload_init {} {
427 global privacy_setting
429 set privacy_setting [upload_status]
431 label .privacy.warn -text " Privacy "
432 if {$privacy_setting} {
433 .privacy.warn configure -background yellow -foreground black
435 label .privacy.overall -text " Upload new dictionary entry:"
436 label .privacy.reference -text " See README.privacy."
438 pack .privacy.warn .privacy.overall -side left
440 foreach {setting string} {
443 2 {Yes, quoting my pirate name.}
445 radiobutton .privacy.o$setting -text $string \
446 -value $setting -variable privacy_setting
447 pack .privacy.o$setting -side left
448 if {$setting > $privacy_setting} {
449 .privacy.o$setting configure -state disabled
452 pack .privacy.reference -side left
454 if {!$privacy_setting} {
455 foreach w [winfo children .privacy] {
456 $w configure -state disabled
459 if {$privacy_setting} {
461 ::http::config -urlencoding utf-8
465 proc upload_status {} {
466 # returns 0, 1, 2 for none, anon, with pirate name
469 if {![info exists env(YPPSC_PCTB_DICT_SUBMIT)]} { debug a; return 0 }
470 if {![string compare 0 $env(YPPSC_PCTB_DICT_SUBMIT)]} { debug b; return 0 }
472 if {![info exists env(YPPSC_PIRATE)]} { return 1 }
473 if {![info exists env(YPPSC_OCEAN)]} { return 1 }
474 if {![string length $env(YPPSC_PIRATE)]} { return 1 }
475 if {![string length $env(YPPSC_OCEAN)]} { return 1 }
480 proc maybe_upload_entry {im def} {
481 global reqkind privacy_setting env dbname quiet
483 debug "DB-UPDATE PRIVACY $privacy_setting"
484 if {!$privacy_setting} return
486 debug "DB-UPDATE UPLOADING"
489 lappend pl dict $dbname
491 if {$privacy_setting>=2} {
492 set pirate [string totitle $env(YPPSC_PIRATE)]
493 set ocean [string totitle $env(YPPSC_OCEAN)]
494 debug "DB-UPDATE NON-ANON $ocean $pirate"
499 lappend pl entry [format_database_entry/$reqkind $im $def]
501 set url $env(YPPSC_PCTB_DICT_SUBMIT)
502 append url dictionary-update-receiver
504 set query [eval ::http::formatQuery $pl]
505 regsub -all {%0d} $query {} query
506 debug "DB-UPDATE QUERY $query"
508 if {[regexp {^\.?/} $url]} {
509 set cmd [list $url $query]
510 debug "SUBMIT CMD [string range $cmd 0 200]..."
511 set body [eval exec $cmd 2>@ stderr]
512 regsub {^Content-Type: text/plain.*\n\n} $body {} body
516 set req [::http::geturl $url -query $query]
519 "\nWARNING: Cannot do dictionary upload: $emsg\n"
523 debug "DB-UPDATE DONE $req $s(status) [array names s]"
524 set ncode [::http::ncode $req]
526 if {!(![string compare ok $s(status)] &&
527 ![string compare 200 $ncode])} {
528 set m "\nWARNING: Dictionary upload failed:"
529 foreach v {status http error posterror} {
530 if {[info exists s($v)]} { append m "\n $v: $s($v)" }
539 if {![string match {OK *} $body]} {
540 set m "\nWARNING: Dictionary upload went wrong:\n"
541 append m "\n " [join [split $body "\n"] "\n "]
548 "Uploaded $dbname dictionary entry `$def': $body"
552 #========== CHARACTER SET ==========
554 #---------- xpm input processor ----------
556 proc char_read_xpm {f} {
557 global glyphsdone mul inter rhsmost_max unk_l unk_r mulcols mulrows
558 global cols rows wordmap
564 if {![regexp {^"(.*)",$} $l dummy l]} {
566 if {[regexp {^\}\;$} $l]} break
570 manyset $l cols rows colours cpp
571 if {$colours!=2 || $cpp!=1} { error "$l ?" }
573 set chop_l [expr {$unk_l - 80}]
574 set chop_r [expr {$cols - $unk_l - 100}]
575 if {$chop_l<0} { set chop_l 0 }
577 set unk_l [expr {$unk_l - $chop_l}]
578 set unk_r [expr {$unk_r - $chop_l}]
580 foreach {min max contexts got} $glyphsdone {
582 [expr {$min-$chop_l}] \
583 [expr {$max-$chop_l}] \
589 set cols [expr {$cols - $chop_l - $chop_r}]
590 debug "NOW cols=$cols chop_l,r=$chop_l,$chop_r rows=$rows\
593 set mulcols [expr {$cols*$mul+$inter}]
594 set mulrows [expr {$rows*$mul+$inter}]
595 append o "\"$mulcols $mulrows 9 1\",\n"
596 for {set x 0} {$x<$cols} {incr x} { set wordmap($x) 0 }
597 } elseif {$y==-2} { # first pixel
608 } elseif {$y==-1} { # 2nd pixel but we've already printed ours
610 set ybit [expr {1<<$y}]
615 set l [string range $l $chop_l end-$chop_r]
617 set l [string range $l $chop_l end]
618 append l [string repeat " " [expr -$chop_r]]
620 foreach c [split $l ""] {
622 if {$x >= $unk_l && $x <= $unk_r} {
626 foreach {min max contexts got} $glyphsdone {
628 if {$x >= $min && $x <= $max} {
629 set how [lindex {a b} $ab]
638 set p [string toupper $how]
639 incr wordmap($x) $ybit
641 default { error "$c ?" }
643 append ol "[string repeat $p [expr {$mul-$inter}]][
644 string repeat + $inter]"
645 append olh [string repeat + $mul]
651 set olhn [string repeat $olh $inter]
652 if {!$y} { append o $olhn }
653 append o [string repeat $ol [expr {$mul-1}]]
658 set data [exec xpmtoppm << $o]
659 image create photo image/main -data $data
662 #---------- character set editor display ----------
664 proc show_context {maxhv x ctxs} {
668 if {[llength $ctxs]==1} { set fg blue } { set fg yellow }
669 label $w -bg black -fg $fg -text [join $ctxs "/\n"] -justify left
670 place $w -x [expr {($x-1)*$mul}] -y 0
671 set wh [winfo reqheight $w]
672 if {$wh > $maxh} { set maxh $wh }
675 proc draw_glyphsdone {} {
676 global glyphsdone mul inter
677 eval destroy [winfo children .d.got]
678 foreach {min max contexts got} $glyphsdone {
679 frame .d.got.m$min -bd 0 -background \#888
680 label .d.got.m$min.l -text "$got" -fg white -bg black -bd 0
681 pack .d.got.m$min.l -padx 1 -pady 1
682 place .d.got.m$min -x [expr {$min*$mul+$inter}] -y 0
686 proc startup_cursor {} {
687 global cur_already cur_mode cur_0 cur_1 last_ht
688 global glyphsdone unk_l unk_r
690 set cur_already [expr {[llength $glyphsdone]/4-1}]
691 set cur_mode 1 ;# one of: 0 1 already text
694 set cur_1 [expr {$unk_r+1}]
699 #---------- character set runtime display and keystroke handling ----------
701 proc recursor/0 {} { recursor//01 0 }
702 proc recursor/1 {} { recursor//01 1 }
703 proc recursor//01 {z1} {
704 global mul rhsmost_max cols glyphsdone
706 .d.csr.csr.l configure -text {adjust}
707 place .d.csr.csr -x [expr {$cur*$mul - 7}]
708 bind_key space { othercursor }
709 bind_leftright_q cur_$z1 0 [expr {$cols-1}]
710 if {[llength $glyphsdone]} {
711 bind_key BackSpace { set cur_mode already; recursor }
713 bind_key BackSpace {}
716 if {$cur_0 != $cur_1} {
717 .d.csr.csr.e delete 0 end
723 {{<- ->} {move cursor, adjusting area to define}}
724 {Space {switch to moving other cursor}}
725 {Return {confirm location, enter letter(s)}}
726 {Backspace {switch to correcting earlier ocr}}
727 {Q {quit and abandon OCR run}}
730 proc othercursor {} {
732 set cur_mode [expr {!$cur_mode}]
736 proc recursor/text {} {
738 {Return {confirm entry of new glyph}}
739 {Escape {abandon entry}}
742 .d.csr.csr.l configure -text {define:}
743 pack .d.csr.csr.e -side left
745 bind .d.csr.csr.e <Key-Return> {
746 set strq [.d.csr.csr.e get]
747 if {[string length $strq]} {
748 RETURN_RESULT DEFINE [list $cur_0 $cur_1 $strq]
751 bind .d.csr.csr.e <Key-Escape> {
753 pack forget .d.csr.csr.e
760 proc recursor/already {} {
763 global cur_already mul
764 global glyphsdone cur_already mul
765 .d.csr.csr.l configure -text {correct}
766 set rmax [lindex $glyphsdone [expr {$cur_already*4}]]
767 place .d.csr.csr -x [expr {$rmax*$mul-3}]
769 bind_leftright_q cur_already 0 [expr {[llength $glyphsdone]/4-1}]
770 bind_key space { bind_key Delete {}; set cur_mode 1; recursor }
772 RETURN_RESULT DELETE [lrange $glyphsdone \
773 [expr $cur_already*4] \
774 [expr $cur_already*4+2]]
777 {{<- ->} {move cursor, selecting glyph to correct}}
778 {Del {clear this glyph from the recognition database}}
779 {Space {switch to selecting area to define as new glyph}}
780 {Q {quit and abandon OCR run}}
784 proc bind_leftright_q {var min max} {
785 bind_key Left [list leftright $var $min $max -1]
786 bind_key Right [list leftright $var $min $max +1]
788 puts stderr "\nCharacter resolver quitting as you requested."
792 proc leftright {var min max inc} {
796 if {$vnew < $min || $vnew > $max} return
802 global csrh cur_mode cur_0 cur_1 mul
804 place .d.mi.csr_$z1 -y 0 -x [expr {[set cur_$z1] * $mul}]
809 #---------- character database read and write ----------
814 # <context> <ncharacters> <hex>...
818 # $database($context 0x<bits> 0x<bits>...) = $hex
820 set database_magic/char {# ypp-sc-tools pctb font v1}
822 proc read_database_header/char {f} {
824 if {([db_getsl $f])+0 != $rows} { error "wrong h ?" }
826 proc read_database_entry/char {f context} {
829 set strq [db_getsl $f]
832 if {![string length $l]} break
833 lappend bm [format %x 0x$l]
835 set database($bm) $strq
838 proc write_database_header/char {f} {
842 proc format_database_entry/char {bm strq} {
844 set o "[lindex $bm 0]\n$strq\n"
845 foreach x [lrange $bm 1 end] { append o "$x\n" }
849 proc dbkey {ctx l r} {
852 for {set x $l} {$x <= $r} {incr x} {
853 lappend bm [format %x $wordmap($x)]
858 proc update_database/DEFINE {c0 c1 strq} {
859 global glyphsdone unk_l unk_contexts wordmap database
860 if {$c0 > $c1} { manyset [list $c0 $c1] c1 c0 }
862 set ncontexts $unk_contexts
864 foreach {l r contexts got} $glyphsdone {
865 if {$l==$c0} { set ncontexts $contexts; break }
867 if {![info exists ncontexts]} {
868 puts stderr "must start at letter LHS!"
873 foreach c $ncontexts {
874 set bm [dbkey $c $c0 $c1]
875 do_database_update $bm $strq
879 proc update_database/DELETE {l r ctxs} {
882 set bm [dbkey $ctx $l $r]
883 catch { unset database($bm) }
888 proc RETURN_RESULT {how what} {
890 place forget .d.csr.csr
891 pack forget .d.csr.csr.e
892 helptext {{{ Processing }}}
896 eval update_database/$how $what
900 #========== server for approving updates ==========
902 proc remote-serv-log {dict pirate caller file event} {
903 global remoteserv_logf
904 set t [clock format [clock seconds] -format {%Y-%m-%d %H:%M:%S %Z}]
905 set s [format "%s %-6s %-31s %-31s %s %s\n" \
906 $t $dict $pirate $caller [file tail $file] $event]
907 puts -nonewline $remoteserv_logf $s
910 proc remote-serv/list {} {
912 foreach file [glob -nocomplain -type f -directory $dropdir _update.*.rdy] {
918 puts_counted stdout d
923 proc remote-serv/take {yesno file dict} {
924 global dropdir dictdir rows reqkind database
926 debug "TAKE [list $yesno $file $dict]"
927 read_counted stdin pirate
928 read_counted stdin caller
929 read_counted stdin key
930 read_counted stdin val
932 must_gets_exactly stdin confirmed
934 manyset [dict2_reqkind_rows reqkind rows]
937 read_database $dictdir/master-$dict.txt
938 set database($key) $val
944 remote-serv-log $dict $pirate $caller $file "$desc $reqkind $rows"
945 file delete -force $file
950 proc remote-serv/noop {} {
954 set remoteserv_banner {ypp-sc-tools pctb remote-server v1}
956 proc main/remoteserv {} {
957 global argv dropdir remoteserv_banner remoteserv_logf dictdir
958 manyset $argv dropdir dictdir
959 puts $remoteserv_banner
960 set remoteserv_logf [open $dropdir/_dict.log a]
961 fconfigure $remoteserv_logf -buffering line
964 if {[gets stdin l] < 0} break
969 #========== updates approver ==========
971 proc puts_server {s} {
976 proc must_gets_server {lv} {
983 proc must_gets_exactly_server {expected} {
985 if {[string compare $expected $got]} { error "$expected $got ?" }
988 proc regsub-data {exp subspec args} {
990 if {![eval regsub $args -- [list $exp $data $subspec data]]} {
991 error "$exp >$data< ?"
995 proc dict2_reqkind_rows {dict} {
996 if {![string compare pixmap $dict]} {
999 } elseif {[regexp {^(char)([1-9]\d*)$} $dict dummy reqkind rows]} {
1000 debug "DICT CHAR rqk=$reqkind r=$rows."
1001 return [list $reqkind rows]
1007 proc chop_counted {var} {
1010 if {![regexp {^(0|[1-9]\d*)\n} $data dummy l]} { error "$data ?" }
1011 regsub-data {^.*\n} {} -line
1012 set val [string range $data 0 [expr {$l-1}]]
1013 set data [string range $data $l end]
1014 debug "CHOP_COUNTED $l $var"
1015 regsub-data {^\n} {}
1018 proc approve_decompose_data {specdata} {
1022 regsub-data {^ypp-sc-tools dictionary update v1\n} {}
1023 uplevel 1 chop_counted pirate
1024 uplevel 1 chop_counted caller
1025 uplevel 1 chop_counted dict
1026 uplevel 1 chop_counted ctx
1027 uplevel 1 chop_counted def
1028 uplevel 1 chop_counted image
1029 uplevel 1 chop_counted key
1030 uplevel 1 chop_counted val
1032 return [uplevel 1 {list $dict $def $image}]
1035 proc approve_compare {fd1 fd2} {
1036 manyset $fd1 file data; set sv1 [approve_decompose_data $data]
1037 manyset $fd2 file data; set sv2 [approve_decompose_data $data]
1038 return [string compare $sv1 $sv2]
1041 proc string2unicodenames {str} {
1042 return [exec perl -e {
1043 use Unicode::CharName qw(uname);
1045 foreach $_ (split //,$ARGV[0]) {
1046 print uname(ord),"\n" or die $!
1051 proc approve_showentry {ix file specdata} {
1052 global approve_ixes reqkind
1054 approve_decompose_data $specdata
1059 label $wb-inf.who -text $pirate
1061 entry $wb-inf.file -font fixed -relief flat
1062 $wb-inf.file insert end [file tail $file]
1063 $wb-inf.file configure -state readonly -width -1
1065 pack $wb-inf.who $wb-inf.file -side top
1068 label $wb-def.scope -text "$dict $ctx"
1069 label $wb-def.def -text $def
1070 pack $wb-def.scope $wb-def.def -side bottom
1072 set ppm [exec pnmscale 2 << $image]
1073 image create photo approve/$ix -data $ppm
1074 label $wb-image -image approve/$ix -bd 2 -relief sunken
1076 manyset [dict2_reqkind_rows $dict] reqkind
1077 approve_showentry_xinfo/$reqkind $wb-xinfo $def
1080 label $wb-div -bd 1 -relief sunken -image image/empty
1081 grid configure $wb-div -columnspan 5 -sticky ew -padx 5
1085 button $wb-act.rej -text Reject -command [list approve_reject $ix]
1088 grid $wb-def $wb-image $wb-xinfo $wb-act $wb-inf -padx 3
1089 grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
1091 lappend approve_ixes $ix
1094 proc approve_approve_reject_one {ix yesno} {
1095 global approve_list server
1096 manyset [lindex $approve_list $ix] file tdata
1097 approve_decompose_data $tdata
1098 puts_server "take $yesno $file $dict"
1099 puts_counted $server pirate
1100 puts_counted $server caller
1101 puts_counted $server key
1102 puts_counted $server val
1103 puts_server confirmed
1105 must_gets_exactly_server done
1108 proc approve_check_server {} {
1112 must_gets_exactly_server ok
1115 proc approve_reject {ix} {
1116 approve_check_server
1117 approve_approve_reject_one $ix 0
1121 proc approve_these {} {
1123 approve_check_server
1124 foreach ix $approve_ixes { approve_approve_reject_one $ix 1 }
1128 proc approve_fetch_list {} {
1129 global server approve_list
1134 must_gets_server more
1135 switch -exact $more {
1138 default { error "$more ?" }
1140 must_gets_server file
1141 read_counted $server data
1142 lappend approve_list [list $file $data]
1145 if {![llength $approve_list]} { puts "Nothing (more) to approve."; exit 0 }
1147 set approve_list [lsort -command approve_compare $approve_list]
1151 proc main/approve {} {
1152 global argv server remoteserv_banner data approve_list approve_page
1153 global userhost directory dictdir debug
1155 if {[llength $argv] != 3} { error "wrong # args" }
1156 manyset $argv userhost directory dictdir
1157 debug "APPROVER FOR $userhost $directory $dictdir"
1159 set cmd [list tclsh $directory/dictionary-manager]
1160 if {$debug} { lappend cmd --debug-server }
1161 lappend cmd --remote-server-1 $directory $dictdir
1162 switch -glob $userhost {
1164 {* *} { set cmd $userhost }
1165 * { set cmd [concat [list ssh $userhost] $cmd] }
1167 debug "APPROVER RUNS $cmd"
1169 lappend cmd 2>@ stderr
1170 set server [open |$cmd r+]
1171 must_gets_exactly_server $remoteserv_banner
1173 button .left -text {<<} -command {approve_show_page -1}
1174 button .right -text {>>} -command {approve_show_page +1}
1176 label .title -text {}
1177 frame .app -bd 2 -relief groove
1178 button .ok -text "Approve These" -command approve_these
1179 pack .title .app -side top
1180 pack .left -side left
1181 pack .right -side right
1182 pack .ok -side bottom
1184 image create bitmap image/empty
1190 proc approve_show_page {delta} {
1191 global approve_page approve_ixes approve_list userhost directory dictdir
1193 eval destroy [winfo children .app]
1197 incr approve_page $delta
1199 set ll [llength $approve_list]
1200 set npages [expr {($ll+$per_page-1)/$per_page}]
1201 if {$approve_page >= $npages} { incr approve_page -1 }
1203 set page_start [expr {$approve_page*$per_page}]
1204 set page_end [expr {$page_start+$per_page-1}]
1206 for {set ix $page_start} {$ix < $ll && $ix <= $page_end} {incr ix} {
1207 set fd [lindex $approve_list $ix]
1208 eval approve_showentry $ix $fd
1211 .title configure -text \
1212 "$userhost\n$directory => $dictdir\nPage [expr {$approve_page+1}]/$npages"
1214 .left configure -state disabled
1215 .right configure -state disabled
1216 if {$approve_page>0} { .left configure -state normal }
1217 if {$approve_page<$npages-1} { .right configure -state normal }
1220 #========== main program ==========
1222 proc main/default {} {
1223 puts stderr "Do not run this program directly."
1226 proc done/default {} {
1232 fileevent stdin readable {}
1233 fconfigure stdin -blocking yes
1235 if {[gets stdin reqkind]<0} {
1236 if {[eof stdin]} { fconfigure stdin -blocking yes; exit 0 }
1244 proc main/automatic {} {
1245 fconfigure stdin -blocking no
1246 fileevent stdin readable required
1248 proc done/automatic {} {
1249 exec sh -c {printf \\0 >&4}
1255 set mainkind default
1261 switch -exact -- $arg {
1262 {--quiet} { set quiet 1 }
1263 {--debug} { set debug 1 }
1264 {--debug-server} { proc debug {m} { puts stderr "DICT-MGR-SVR $m" }}
1266 {--approve-updates} { set mainkind approve; break }
1267 {--automatic-1} { set mainkind automatic; break }
1268 {--remote-server-1} { set mainkind remoteserv; break }
1269 {--automatic*} - {--remote-server}
1270 { error "incompatible versions - install problem" }
1271 default { error "huh $argv ?" }
1275 proc debug {m} { puts stderr "DICT-MGR $m" }
1277 set argv [lrange $argv $ai end]