# 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;
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] ?";
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/, $';
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;
Subject: pctb $dict $ctx $def [ypp-sc-tools]
Pirate: $pirate
+Caller: $caller
Dictionary: $dict
Context: $ctx
Definition: $def
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 $!;
}
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 ----------
}
close L or die $!;
-print header('text/plain'), "$fn_i\n" or die $!;
+print header('text/plain'), "OK $fn_i\n" or die $!;