X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=pctb%2Fdictionary-update-receiver;h=cd1638e22a476e905d2ebecd7975169181fb1358;hp=727b94b47851df7f9e8b1cf04ed11960e3eefe22;hb=a0caaae8722bc8f567b1849c1ba19e13297ce548;hpb=f9e9ccb00d5761e861ead0795c711f595d8db3ff diff --git a/pctb/dictionary-update-receiver b/pctb/dictionary-update-receiver index 727b94b..cd1638e 100755 --- a/pctb/dictionary-update-receiver +++ b/pctb/dictionary-update-receiver @@ -1,24 +1,18 @@ #!/usr/bin/perl -w # -# This script is invoked when the YPP SC PCTB client phones home to -# provide updated character set OCR data or updated screenshot pixmap -# interpretation (island name) data. -# -# The client will also phone home anyway to fetch the latest parsedb -# before -# -# This allows me (the operator of the SC server) to: -# - review the choices made by the user -# - if they are correct, incorporate them in the next client version -# - if they are wrong, incorporate fixes of them, or contradictions of them, -# in +# This script is invoked when the YPP SC PCTB client talks to the +# dictionary server. See README.privacy. -# The information reported -# The SC PCTB client does this so that + +# upload testing runes: +# +# YPPSC_PCTB_DICT_UPDATE=./ YPPSC_PCTB_DICT_SUBMIT=./ ./ypp-commodities --ocean midnight --pirate aristarchus --find-island --same --raw-tsv >raw.tsv +# ./dictionary-manager --debug --approve-updates '' . . use strict (qw(vars)); +use POSIX; -$CGI::POST_MAX= 65536; +$CGI::POST_MAX= 1024*1024; $CGI::DISABLE_UPLOADS= 1; use CGI qw/:standard -private_tempfiles/; @@ -30,7 +24,7 @@ use IO::Handle; sub parseentryin__pixmap ($) { my ($entry_in) = @_; $entry_in =~ - m/^(\w+ \- \w[-+\'\"\#! 0-9a-z]*)\nP3\n([1-9]\d{1,3}) ([1-9]\d{1,3})\n255\n/s or die; + m/^(\S+ \- .*)\nP3\n([1-9]\d{1,3}) ([1-9]\d{1,3})\n255\n/s or die; my ($def,$w,$h)= ($1, $2+0, $3+0); my @d= grep { m/./ } split /\s+/, $'; @d == $w*$h*3 or die "$d[0]|$d[1]|...|$d[$#d-1]|$d[$#d] ?"; @@ -64,17 +58,18 @@ sub parseentryin__pixmap ($) { 'pgmtopbm -threshold', 'pnminvert', 'pbmtoascii'); - + my $entry= "$def\n$ppm"; - return ('',$def,$entry,$icon,$w,$whole); + + return ('',$def,$ppm,$ppm,$def, $w,$icon,$whole,$entry); } #---------- characters ---------- -sub parseentryin__char ($) { - my ($ei) = @_; - $ei =~ m/^([1-9]\d{0,2})\n(Digit|Upper|Lower)\n((?:[-&\'A-F0-9a-f ]|\x20)+)\n/s or die; - my ($h,$ctx,$str)= ($1+0,$2,$3); +sub parseentryin__char ($$) { + my ($ei,$h) = @_; + $ei =~ m/^(Digit|Upper|Lower)\n([^\n]+)\n/s or die; + my ($ctx,$str)= ($1,$2); #print STDERR ">$'<\n"; my @d= grep { m/./ } split /\n/, $'; #print STDERR ">@d<\n"; @@ -88,24 +83,27 @@ sub parseentryin__char ($) { } @d; my $w= @d; my $ppm= "P2\n$w $h\n1\n"; + my $whole=''; for (my $y=0; $y<$h; $y++) { for (my $x=0; $x<$w; $x++) { - $ppm .= sprintf " %d", !!($d[$x] & (1<<$y)); + my $pix= !($d[$x] & (1<<$y)); + $ppm .= sprintf " %d", $pix; + $whole .= $pix ? ' ' : '<>'; } $ppm .= "\n"; + $whole .= "\n"; } - my $entry= sprintf "%d\n%s\n%s\n", $h,$ctx,$str; - map { $entry .= sprintf "%x\n", $_; } @d; - -#print STDERR "[[[[\n$ppm\n]]]]"; + map { $_= sprintf "%x", $_; } @d; + my $key= join ' ', $ctx, @d; - my $icon= pipeval($ppm, -# "pnmscale -xysize 78 $h", - 'pgmtopbm -threshold', - 'pnminvert', - 'pbmtoascii'); +# my $whole= pipeval($ppm, +# "pnmscale 2", +# 'pgmtopbm -threshold', +# 'pbmtoascii'); - return ("$ctx",$str,$entry, '',$w,$icon); + my $entry= "$ctx\n$str\n". join("\n", @d). "\n"; + + return ($ctx,$str,$ppm,$key,$str, $w*2,'',$whole,$entry); } #---------- useful stuff ---------- @@ -151,51 +149,69 @@ sub pipeval ($@) { return $val; } -#---------- main program ---------- +#========== main program ========== + +#---------- determine properties of the submission ---------- -my $path= path_info(); +my $dict= param('dict'); my $entry_in= param('entry'); -defined $entry_in or die; +defined $entry_in or die Dump()." ?"; -my $du=$ENV{'YPPSC_DICTUPDATES'}; -chdir $du or die "$du $!" - if defined $du; +my $ocean= param('ocean'); +my $pirate= param('pirate'); +if (defined $ocean && defined $pirate) { + $pirate= "$ocean - $pirate"; +} else { + $pirate= ''; +} -my $kind; +my $caller= $ENV{'REMOTE_ADDR'}; +$caller= 'LOCAL' unless defined $caller; -if ($path =~ /(pixmap|char)/) { - $kind=$1; -} else { - die "$path ?"; +my $fwdf= $ENV{'HTTP_X_FORWARDED_FOR'}; +if (defined $fwdf) { + $fwdf =~ s/\s//g; + $fwdf =~ s/[^0-9.,]/?/g; + $caller= "$fwdf,$pirate"; } -my ($ctx,$def,$entry,$icon,$width,$whole)= &{"parseentryin__$kind"}($entry_in); +my $kind; +my @xa; -my $fn_t= "_update.$$-xxxxxxxxxxxxxxxx.tmp"; -open F, "> $fn_t" or die "$fn_t $!"; -(stat F) or die $!; -my $fn_i= sprintf "_update.$$-%016x.rdy", (stat _)[1]; +if ($dict =~ m/^pixmap$/) { + $kind= $&; +} elsif ($dict =~ m/^(char)([1-9]\d?)$/) { + ($kind,@xa)= ($1,$2); +} else { + die "$dict ?"; +} +$dict= $&; -print F $whole or die $!; -close F or die $!; -rename $fn_t, $fn_i or die "$fn_t $fn_i $!"; +my ($ctx,$def,$image,$key,$val, $width,$icon,$whole,$entry)= + &{"parseentryin__$kind"}($entry_in, @xa); -__END__ +#---------- compute the email to send ---------- -$icon =~ s/^/ /mg; +my $whoami= `whoami`; $? and die $?; +chomp $whoami; my $email= < $fn_t" or die "$fn_t $!"; +(stat F) or die $!; +my $fn_i= sprintf "_update.$$-%016x.rdy", (stat _)[1]; + +print F "ypp-sc-tools dictionary update v1\n"; + +foreach my $v ($pirate,$caller,$dict,$ctx,$def,$image,$key,$val) { + printf F "%d\n", length($v) or die $!; + print F $v,"\n" or die $!; +} + +close F or die $!; + +my @tm= localtime; +my $tm= strftime "%Y-%m-%d %H:%M:%S %Z", @tm; + +open L, ">> _dict.log" or die $!; +my $ll= sprintf "%s %-6s %-31s %-31s %s", $tm, $dict, $pirate, $caller, $fn_i; + +#---------- commit everything ---------- + +print L "$ll submit\n" or die $!; +L->flush or die $!; + +if (eval { + + open S, "|/usr/lib/sendmail -odb -oee -oi -t" or die $!; + print S $email or die $!; + $!=0; $?=0; close S or die $!; $? and die $?; + + rename $fn_t, $fn_i or die "$fn_t $fn_i $!"; + + 1; +}) { + print L "$ll stored\n" or die $!; +} else { + print L "$ll ERROR! $@\n" or die $!; + exit 1; +} +close L or die $!; + +print header('text/plain'), "OK $fn_i\n" or die $!;