Correct bugs in new AA table cell structure parsing

[ypp-sc-tools.db-test.git] / pctb / dictionary-update-receiver

diff --git a/pctb/dictionary-update-receiver b/pctb/dictionary-update-receiver
index 015f051f9a9af996e8d8237c4c68bf7188c0af17..99a580e46888280c1c589a442edff38c6ea662cc 100755 (executable)
--- a/pctb/dictionary-update-receiver
+++ b/pctb/dictionary-update-receiver
@@ -12,7 +12,7 @@
 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/;
@@ -54,7 +54,7 @@ sub parseentryin__pixmap ($) {
 
     my $whole= pipeval($ppm,
                       'ppmtopgm',
-                      'pnmnorm -bpercent 40 -wpercent 20',
+                      'pnmnorm -bpercent 10 -wpercent 5',
                       'pgmtopbm -threshold',
                       'pnminvert',
                       'pbmtoascii');
@@ -68,42 +68,45 @@ sub parseentryin__pixmap ($) {
 
 sub parseentryin__char ($$) {
     my ($ei,$h) = @_;
-    $ei =~ m/^(Digit|Upper|Lower)\n([^\n]+)\n/s or die;
+    $ei =~ m/^(Digit|Upper|Lower|Word)\n([^\n]+)\n/s or die;
     my ($ctx,$str)= ($1,$2);
-#print STDERR ">$'<\n";
+print STDERR ">ctx=$ctx|str=$str|$'<\n";
     my @d= grep { m/./ } split /\n/, $';
-#print STDERR ">@d<\n";
-    die if $h>31;
+print STDERR ">@d<\n";
+    die if $h>100;
     die if @d>400;
-    my $maxval= (1<<$h)-1;
-    map {
-       m/^[0-9a-f]{1,8}$/ or die;
-       $_= hex $_;
-       die "$_ ?" if $_ > $maxval;
-    } @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++) {
-           my $pix= !($d[$x] & (1<<$y));
-           $ppm .= sprintf " %d", $pix;
-           $whole .= $pix ? '  ' : '<>';
-       }
-       $ppm .= "\n";
-       $whole .= "\n";
-    }
-    map { $_= sprintf "%x", $_; } @d;
+
+    my $pgm= "P2\n$h $w\n7\n";
+    map { # x, left to right
+       m/[^0-7]/ and die "$_ ?";
+       my $l= $_;
+       $l =~ s/./ $&/g;
+       $pgm .= "$l\n";
+    } @d;
+
     my $key= join ' ', $ctx, @d;
 
-#    my $whole= pipeval($ppm,
-#                    "pnmscale 2",
-#                    'pgmtopbm -threshold',
-#                    'pbmtoascii');
+    $pgm= pipeval($pgm,
+                 "pnmflip -xy",
+                 "pnmnoraw");
+
+    my $icon= pipeval($pgm,
+                     "pnmscale -xysize 156 ".($h*4),
+                     'pgmtopbm -threshold',
+                     'pnminvert',
+                     'pbmtoascii -2x4');
+
+    my $whole= pipeval($pgm,
+                      "pnmscale 4",
+                      'pgmtopbm -fs',
+                      'pnminvert',
+                      'pbmtoascii');
 
-    my $entry= "$ctx\n$str\n". join("\n", @d). "\n";
+    my $entry= "$ctx\n$str\n$key\n";
     
-    return ($ctx,$str,$ppm,$key,$str, $w*2,'',$whole,$entry);
+    return ($ctx,$str,$pgm,$key,$str, $w*4,$icon,$whole,$entry);
 }
 
 #---------- useful stuff ----------
@@ -155,7 +158,7 @@ sub pipeval ($@) {
 
 my $dict= param('dict');
 my $entry_in= param('entry');
-defined $entry_in or die;
+defined $entry_in or die Dump()." ?";
 
 my $ocean= param('ocean');
 my $pirate= param('pirate');
@@ -190,6 +193,18 @@ $dict= $&;
 my ($ctx,$def,$image,$key,$val, $width,$icon,$whole,$entry)=
     &{"parseentryin__$kind"}($entry_in, @xa);
 
+my $du=$ENV{'YPPSC_DICTUPDATES'};
+chdir $du or die "$du $!"
+    if defined $du;
+
+my $instance= $du;
+$instance =~ s,ypp-sc-tools,,ig;
+$instance =~ s,ypp,,ig;
+$instance =~ s,pctb,,ig;
+$instance =~ s,/\W+/,/,g;
+$instance =~ s,/+$,,;
+$instance =~ s,^.*/,,;
+
 #---------- compute the email to send ----------
 
 my $whoami= `whoami`; $? and die $?;
@@ -197,7 +212,7 @@ chomp $whoami;
 
 my $email= <<END
 To: $whoami
-Subject: pctb $dict $ctx $def [ypp-sc-tools]
+Subject: pctb /$instance/ $dict $ctx $def [ypp-sc-tools]
 
 Pirate:     $pirate
 Caller:     $caller
@@ -209,6 +224,7 @@ END
     ;
 
 if (length $icon) {
+    $icon =~ s/^/ /gm;
     $email .= "$icon\n\n";
 }
 
@@ -236,17 +252,12 @@ $email .= $cutline.$entry.$cutline;
 
 #---------- prepare the database entry ----------
 
-my $du=$ENV{'YPPSC_DICTUPDATES'};
-chdir $du or die "$du $!"
-    if defined $du;
-
-
 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];
 
-print F "ypp-sc-tools dictionary update v1\n";
+print F "ypp-sc-tools dictionary update v2\n";
 
 foreach my $v ($pirate,$caller,$dict,$ctx,$def,$image,$key,$val) {
     printf F "%d\n", length($v) or die $!;