Rearrange and tidy up innards of yppsc-ocr-resolver

[ypp-sc-tools.db-live.git] / pctb / yppsc-parsedb-updatereceiver

diff --git a/pctb/yppsc-parsedb-updatereceiver b/pctb/yppsc-parsedb-updatereceiver
index 1bce6c5c53dd54f0bfe03b93afd27b2ab364f3ae..9132c4e9d22036ab35a249ffbe8e54d388666662 100755 (executable)
--- a/pctb/yppsc-parsedb-updatereceiver
+++ b/pctb/yppsc-parsedb-updatereceiver
@@ -22,9 +22,8 @@ $CGI::POST_MAX= 65536;
 $CGI::DISABLE_UPLOADS= 1;
 
 use CGI qw/:standard -private_tempfiles/;
-use IPC::Open2;
+use IO::Pipe;
 use IO::Handle;
-use File::Temp;
 
 #---------- pixmaps ----------
 
@@ -51,56 +50,100 @@ sub parseentryin__pixmap ($) {
        $ppm .= "\n";
     }
 
-    my $summary= pipeval($ppm,
-                        'set -x; cat >&2',
+    my $icon= pipeval($ppm,
                         'ppmtopgm',
-                        'pnmscale -width 79',
-                        'pnmnorm -bpercent 40 -wpercent 10',
-                        'pgmtopbm -threshold');
-    print STDERR ">$summary<\n";
+                        'pnmscale -xysize 156 80',
+                        'pnmnorm -bpercent 40 -wpercent 20',
+                        'pgmtopbm -threshold',
+                        'pnminvert',
+                        'pbmtoascii -2x4');
+
+    my $whole= pipeval($ppm,
+                      'ppmtopgm',
+                      'pnmnorm -bpercent 40 -wpercent 20',
+                      'pgmtopbm -threshold',
+                      'pnminvert',
+                      'pbmtoascii');
     
-
-# <ship-ahoy.ppm ppmtopgm | pnmscale -width 79 | pnmnorm -bpercent 40 -wpercent 10 | pgmtopbm -threshold | pbmtoascii | cut -c1-79
-       
     my $entry= "$def\n$ppm";
-    return ('',$def,$entry);
+    return ('',$def,$entry,$icon,$w,$whole);
 }
 
 #---------- 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);
+#print STDERR ">$'<\n";
+    my @d= grep { m/./ } split /\n/, $';
+#print STDERR ">@d<\n";
+    die if $h>31;
+    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";
+    for (my $y=0; $y<$h; $y++) {
+       for (my $x=0; $x<$w; $x++) {
+           $ppm .= sprintf " %d", !!($d[$x] & (1<<$y));
+       }
+       $ppm .= "\n";
+    }
+    my $entry= sprintf "%d\n%s\n%s\n", $h,$ctx,$str;
+    map { $entry .= sprintf "%x\n", $_; } @d;
+    
+#print STDERR "[[[[\n$ppm\n]]]]";
+
+    my $icon= pipeval($ppm,
+#                    "pnmscale -xysize 78 $h",
+                     'pgmtopbm -threshold',
+                     'pnminvert',
+                     'pbmtoascii');
+
+    return ("$ctx",$str,$entry, '',$w,$icon);
+}
+
 #---------- useful stuff ----------
 
 sub pipeval ($@) {
     my ($val, @cmds) = @_;
     my (@pids);
 
-    my $paste_child= open PIPEVAL_PASTE, "-|";
-    defined $paste_child or die $!;
-    if (!$paste_child) { print $val or die $!; exit 0; }
-
-    my $f= 'PIPEVAL_PASTE';
-
-$_=<$f>;
-print STDERR ">$_<\n";
-
-    foreach my $cmd (@cmds) {
-       my $newf;
-print STDERR "$cmd | $f\n";
-       push @pids, open2($newf, "<& $f", $cmd);
-#      if (@pids>1) { close $f or die $!; }
-print STDERR "$cmd | $f $newf @pids\n";
-       $f= $newf;
+    my $lastpipe;
+    
+    foreach my $cmd ('',@cmds) {
+       my $pipe= new IO::Pipe or die $!;
+       my $pid= fork();  defined $pid or die $!;
+
+       if (!$pid) {
+           $pipe->writer();
+           if (!$lastpipe) {
+                print $pipe $val or die $!;
+                exit 0;
+            } else {
+                open STDIN, '<&', $lastpipe or die $!;
+                open STDOUT, '>&', $pipe or die $!;
+                close $lastpipe or die $!;
+                close $pipe or die $!;
+                exec $cmd; die $!;
+            }
+       }
+       $pipe->reader();
+       if ($lastpipe) { close $lastpipe or die $!; }
+       $lastpipe= $pipe;
+       push @pids, $pid;
     }
 
-    $!=0; { local ($/)=undef; $val= <$f>; }
+    $!=0; { local ($/)=undef; $val= <$lastpipe>; }
     defined $val or die $!;
-    $f->error and die $!;  close $f or die $!;
+    $lastpipe->error and die $!;  close $lastpipe or die $!;
 
-    waitpid($paste_child,0) == $paste_child or die "paste $? $!";
-    $?==0 or $?==13 or die "paste $?";
-    close PIPEVAL_PASTE or die $!;
-
-    foreach my $cmd (@cmds) {
+    foreach my $cmd ('(paste)', @cmds) {
        my $pid= shift @pids;
        waitpid($pid,0) == $pid or die "$pid $? $!";
        $?==0 or $?==13 or die "$cmd $?";
@@ -115,6 +158,7 @@ my $entry_in= param('entry');
 defined $entry_in or die;
 
 my $owner= `whoami`; $? and die $?;
+chomp $owner;
 
 my $kind;
 
@@ -124,14 +168,42 @@ if ($path =~ /(pixmap|char)/) {
     die "$path ?";
 }
 
-my ($ctx,$def,$entry)= &{"parseentryin__$kind"}($entry_in);
+my ($ctx,$def,$entry,$icon,$width,$whole)= &{"parseentryin__$kind"}($entry_in);
+
+$icon =~ s/^/ /mg;
 
-my $summary= <<END
+my $email= <<END
 To: $owner
 Subject: yppsc dictionary update
 
 Context:    $kind $ctx
 Definition: $def
 
+$icon
+
+END
+    ;
+
+$whole =~ s/(.*)\n/ sprintf "%-${width}s\n", $1 /mge;
+$whole =~ s/^/|/mg;
+$whole =~ s/\n/|\n/mg;
+$whole =~ s/^(.*)/ ",".('_' x $width).".\n".$1 /e;
+$whole =~ s/(.*)$/ $1."\n\`".('~' x $width)."'\n" /e;
+
+my $lw= 79;
+
+while ($whole =~ m/../) {
+    my $lhs= $whole;
+    $lhs =~ s/^(.{0,$lw}).*$/$1/mg;
+    $whole =~ s/^.{1,$lw}//mg;
+#print STDERR "[[[[[$lhs########$whole]]]]]\n";
+    $email .= $lhs;
+}
+
 END
     ;
+
+my $cutline= "-8<-\n";
+$email .= $cutline.$entry.$cutline;
+
+print $email or die $!;