X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fdictionary-update-receiver;fp=pctb%2Fdictionary-update-receiver;h=0ce85934d1948d23a02b47ef321cbcbce387a5f8;hb=3d80a86a8c77e29a26e70aa810ebb2dea607208e;hp=8f53438d4fe1a040a6766363dcc49e6a446f5991;hpb=f8488ba218ce448dc5c02c8d83e85b6c551332eb;p=ypp-sc-tools.web-live.git

diff --git a/pctb/dictionary-update-receiver b/pctb/dictionary-update-receiver
index 8f53438..0ce8593 100755
--- a/pctb/dictionary-update-receiver
+++ b/pctb/dictionary-update-receiver
@@ -3,6 +3,12 @@
 # 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;
 
@@ -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/, $';
@@ -156,13 +162,17 @@ 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 ----------
 
@@ -271,4 +282,4 @@ if (eval {
 }
 close L or die $!;
 
-print header('text/plain'), "$fn_i\n" or die $!;
+print header('text/plain'), "OK $fn_i\n" or die $!;