X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=pctb%2Fdictionary-manager;h=49156adc1786115c5f432e6f54c46e47d8eddd58;hp=a2a82a442de973eff2497b8885c6525145911228;hb=0487d41d9c7796c6efebb8235c9aa39fe580ccf9;hpb=ebff4279347400f87f24bd9dbf7f655f425c132e

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index a2a82a4..49156ad 100755
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -237,7 +237,7 @@ proc required/char {} {
     pack .d.csr -side top -before .d.mi
     pack .d.got .d.ctx -side top -after .d.mi
 
-    read_database ./charset-$rows.txt
+    read_database "./#local-char$rows#.txt"
     draw_glyphsdone
     startup_cursor
 }
@@ -294,11 +294,14 @@ proc pixmap_maybe_ok {} {
     set nsel 0
     foreach_pixmap_col col {
 	set cs [.d.pe.grid.l$col curselection]
-	incr nsel [llength $cs]
+	set lcs [llength $cs]
+	if {!$lcs} continue
+	incr nsel $lcs
 	set pixmap_selcol $col
 	set pixmap_selrow [lindex $cs 0]
     }
     if {$nsel==1} {
+	debug "MAYBE_OK YES col=$pixmap_selcol row=$pixmap_selrow."
 	.d.pe.ok configure -state normal -command pixmap_ok
     } else {
 	.d.pe.ok configure -state disabled -command {}
@@ -335,9 +338,9 @@ proc required/pixmap {} {
     set data [exec pnmscale 2 << $ppm]
     image create photo image/main -data $data
 
-    set alloptions [exec ./yppsc-resolver-pixoptions $unk_what]
+    set alloptions [exec ./dictionary-pixmap-options $unk_what]
 
-    read_database ./pixmaps.txt
+    read_database "./#local-pixmap#.txt"
 
     set mulcols [image width image/main]
     set mulrows [image height image/main]
@@ -1051,7 +1054,7 @@ foreach arg $argv {
 	{--debug-server}    { proc debug {m} { puts stderr "DICT-MGR-SVR $m" }}
 	{--noop-arg}        { }
 	{--approve-updates} { set mainkind approve; break }
-	{--automatic-1}     { set mainkind automatic }
+	{--automatic-1}     { set mainkind automatic; break }
 	{--remote-server-1} { set mainkind remoteserv; break }
 	{--automatic*} - {--remote-server}
 	                    { error "incompatible versions - install problem" }
@@ -1063,4 +1066,5 @@ if {$debug} {
 }
 set argv [lrange $argv $ai end]
 
+debug [exec printenv]
 main/$mainkind