X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fdictionary-update-receiver;h=cd1638e22a476e905d2ebecd7975169181fb1358;hp=8f53438d4fe1a040a6766363dcc49e6a446f5991;hb=2d4936689fb9f77e34412dd4169e025a6e364477;hpb=cde017ed6b76840ce2ae1aa5fc740a6e06352f92

diff --git a/pctb/dictionary-update-receiver b/pctb/dictionary-update-receiver
index 8f53438..cd1638e 100755
--- a/pctb/dictionary-update-receiver
+++ b/pctb/dictionary-update-receiver
@@ -3,10 +3,16 @@
 # This script is invoked when the YPP SC PCTB client talks to the
 # dictionary server.  See README.privacy.
 
+
+# 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/;
@@ -18,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] ?";
@@ -62,7 +68,7 @@ sub parseentryin__pixmap ($) {
 
 sub parseentryin__char ($$) {
     my ($ei,$h) = @_;
-    $ei =~ m/^(Digit|Upper|Lower)\n((?:[-&\'A-F0-9a-f ]|\x20)+)\n/s or die;
+    $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/, $';
@@ -149,20 +155,24 @@ 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');
 if (defined $ocean && defined $pirate) {
     $pirate= "$ocean - $pirate";
 } else {
-    $pirate= $ENV{'REMOTE_ADDR'};
-    my $fwdf= $ENV{'HTTP_X_FORWARDED_FOR'};
-    if (defined $fwdf) {
-	$fwdf =~ s/\s//g;
-	$fwdf =~ s/[^0-9.,]/?/g;
-	$pirate= "$fwdf,$pirate";
-    }
+    $pirate= '';
+}
+
+my $caller= $ENV{'REMOTE_ADDR'};
+$caller= 'LOCAL' unless defined $caller;
+
+my $fwdf= $ENV{'HTTP_X_FORWARDED_FOR'};
+if (defined $fwdf) {
+    $fwdf =~ s/\s//g;
+    $fwdf =~ s/[^0-9.,]/?/g;
+    $caller= "$fwdf,$pirate";
 }
 
 my $kind;
@@ -190,6 +200,7 @@ To: $whoami
 Subject: pctb $dict $ctx $def [ypp-sc-tools]
 
 Pirate:     $pirate
+Caller:     $caller
 Dictionary: $dict
 Context:    $ctx
 Definition: $def
@@ -237,7 +248,7 @@ my $fn_i= sprintf "_update.$$-%016x.rdy", (stat _)[1];
 
 print F "ypp-sc-tools dictionary update v1\n";
 
-foreach my $v ($pirate,$dict,$ctx,$def,$image,$key,$val) {
+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 $!;
 }
@@ -248,7 +259,7 @@ 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 %s", $tm, $dict, $pirate, $fn_i;
+my $ll= sprintf "%s %-6s %-31s %-31s %s", $tm, $dict, $pirate, $caller, $fn_i;
 
 #---------- commit everything ----------
 
@@ -257,7 +268,7 @@ L->flush or die $!;
 
 if (eval {
 
-    open S, "|sendmail -odb -oee -oi -t" or die $!;
+    open S, "|/usr/lib/sendmail -odb -oee -oi -t" or die $!;
     print S $email or die $!;
     $!=0; $?=0; close S or die $!; $? and die $?;
 
@@ -268,7 +279,8 @@ if (eval {
     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'), "$fn_i\n" or die $!;
+print header('text/plain'), "OK $fn_i\n" or die $!;