X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=b58471ce43a9370a74aa8a6ec8eb11f51822ff62;hp=62c1f5e6e94dd21d468d19923d5ea3e4840a7dbd;hb=068b48ca6de5313177773a1a435b2130a56044ef;hpb=a0dfb8222afa87d6fabaa8234da89e2a1b57ea5a diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm index 62c1f5e..b58471c 100644 --- a/yarrg/Commods.pm +++ b/yarrg/Commods.pm @@ -41,28 +41,43 @@ BEGIN { &pipethrough_prep &pipethrough_run &pipethrough_run_along &pipethrough_run_finish &pipethrough_run_gzip - &cgipostform &yarrgpostform); + &cgipostform &yarrgpostform &cgi_get_caller + &set_ctype_utf8 $masterinfoversion); %EXPORT_TAGS = ( ); @EXPORT_OK = qw(); } +our $masterinfoversion= 2; # version we understand + our %oceans; # eg $oceans{'Midnight'}{'Ruby'}{'Eta Island'}= $sources; -our %commods; # eg $commods{'Fine black cloth'}= $sources; our %clients; # eg $clients{'ypp-sc-tools'}= [ qw(last-page) ]; our %routes; # eg $routes{'Midnight'}{'Orca'}{'Tinga'}= $sources NB abbrevs! our %route_mysteries; # eg $route_mysteries{'Midnight'}{'Norse'}= 3 # $sources = 's[l]b'; # 's' = Special Circumstances; 'l' = local ; B = with Bleach +our %commods; +# eg $commods{'Fine black cloth'}{Srcs}= $sources; +# eg $commods{'Fine black cloth'}{Mass}= 700 [g] +# eg $commods{'Fine black cloth'}{Volume}= 1000 [ml] + our (%pctb_commodmap,@pctb_commodmap); my %colours; # eg $colours{'c'}{'black'}= $sources -my @rawcm; # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth' - -sub parse_info1 ($$) { - my ($mmfn,$src)= @_; - my $mm= new IO::File $mmfn, 'r' or die "$mmfn $!"; +my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth' + +# IMPORTANT +# when extending the format of source-info in a non-backward +# compatible way, be sure to update update-master-info too. + +sub parse_info1 ($$$) { + my ($mmfn,$src,$enoentok)= @_; + my $mm= new IO::File $mmfn, 'r'; + if (!$mm) { + return if $enoentok && $!==&ENOENT; + die "$mmfn $!"; + } my @ctx= (); while (<$mm>) { next if m/^\s*\#/; @@ -73,12 +88,16 @@ sub parse_info1 ($$) { @ctx= (sub { $colours{$colourkind}{lc $_} .= $src; }); } elsif (m/^commods$/) { @ctx= (sub { push @rawcm, lc $_; }); + } elsif (m/^nocommods$/) { + @ctx= (sub { push @nocm, lc $_; }); } elsif (m/^ocean (\w+)$/) { my $ocean= $1; + keys %{ $oceans{$ocean} }; @ctx= (sub { $ocean or die; # ref to $ocean needed to work # around a perl bug my $arch= $_; + keys %{ $oceans{$ocean}{$arch} }; $ctx[1]= sub { $oceans{$ocean}{$arch}{$_} .= $src; }; @@ -115,10 +134,30 @@ sub parse_info1 ($$) { $ca= sub { my ($s,$ss) = @_; #print "ca($s)\n"; - if ($s !~ m/\%(\w+)/) { $commods{ucfirst $s} .= $ss; return; } + if ($s !~ m/\%(\w+)/) { + my ($name, $props) = $s =~ + /^(\S[^\t]*\S)(?:\t+(\S[^\t]*\S))?$/ + or die "bad commodspec $s"; + return if grep { $name eq $_ } @nocm; + my $ucname= ucfirst $name; + $commods{$ucname}{Srcs} .= $ss; + my $c= $commods{$ucname}; + $c->{Volume}= 1000; + foreach my $prop (defined $props ? split /\s+/, $props : ()) { + if ($prop =~ m/^([1-9]\d*)(k?)g$/) { + $c->{Mass}= $1 * ($2 ? 1000 : 1); + } elsif ($prop =~m/^([1-9]\d*)l$/) { + $c->{Volume}= $1 * 1000; + } else { + die "unknown property $prop for $ucname"; + } + } + return; + } die "unknown $&" unless defined $colours{$1}; - foreach my $c (keys %{ $colours{$1} }) { - &$ca($`.$c.$', $ss .'%'. $colours{$1}{$c}); + my ($lhs,$pctlet,$rhs)= ($`,$1,$'); + foreach my $c (keys %{ $colours{$pctlet} }) { + &$ca($lhs.$c.$rhs, $ss .'%'. $colours{$pctlet}{$c}); } }; foreach (@rawcm) { &$ca($_,$src); } @@ -141,16 +180,9 @@ sub parse_info1 ($$) { } sub parse_info_clientside () { - my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'}; - return unless $yarrg; - my $master= fetch_with_rsync('info'); - parse_info1($master,'s'); - my $local= '_local-info.txt'; - if (stat $local) { - parse_info1($local,'s'); - } else { - die "$local $!" unless $! == &ENOENT; - } + my $master= fetch_with_rsync("info-v$masterinfoversion"); + parse_info1($master,'s',1); + parse_info1('_local-info.txt','s',1); } sub fetch_with_rsync ($) { @@ -185,26 +217,26 @@ sub parse_info_maproutes ($$$) { } sub parse_info_serverside () { - parse_info1('master-info.txt','s'); + parse_info1('source-info.txt','s',0); } sub parse_info_serverside_ocean ($) { my ($oceanname) = @_; die "unknown ocean $oceanname ?" unless exists $oceans{$oceanname}; - parse_info1("ocean-".(lc $oceanname).".txt",'s'); + parse_info1("_ocean-".(lc $oceanname).".txt", 's',0); } sub parse_pctb_commodmap () { undef %pctb_commodmap; - foreach my $commod (keys %commods) { $commods{$commod} =~ s/b//; } + foreach my $commod (keys %commods) { $commods{$commod}{Srcs} =~ s/b//; } - my $c= new IO::File '_commodmap.tsv' or die $!; + my $c= new IO::File '_commodmap.tsv'; if (!$c) { $!==&ENOENT or die $!; return 0; } while (<$c>) { m/^(\S.*\S)\t(\d+)\n$/ or die "$_"; die if defined $pctb_commodmap{$1}; $pctb_commodmap{$1}= $2; die if defined $pctb_commodmap[$2]; $pctb_commodmap[$2]= $1; - $commods{$1} .= 'b'; + $commods{$1}{Srcs} .= 'b'; } $c->error and die $!; close $c or die $!; @@ -214,12 +246,22 @@ sub parse_pctb_commodmap () { sub get_our_version ($$) { my ($aref,$prefix) = @_; $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg'; - $aref->{"${prefix}fixes"}= 'lastpage'; - - my $version= `git-describe --tags HEAD`; $? and die $?; + $aref->{"${prefix}fixes"}= 'lastpage checkpager'; + + my $version= ` + if type -p git-describe >/dev/null 2>&1; then + gd=git-describe + else + gd="git describe" + fi + \$gd --tags HEAD || echo 0unknown + `; $? and die $?; chomp($version); $aref->{"${prefix}version"}= $version; return $aref; + # clientname "ypp-sc-tools" + # clientversion 2.1-g2e06a26 [from git-describe --tags HEAD] + # clientfixes "lastpage" [space separated list] } sub pipethrough_prep () { @@ -229,6 +271,7 @@ sub pipethrough_prep () { sub pipethrough_run_along ($$$@) { my ($tf, $childprep, $cmd, @a) = @_; + $tf->error and die $!; $tf->flush or die $!; $tf->seek(0,0) or die $!; my $fh= new IO::File; @@ -299,7 +342,8 @@ sub cgipostform ($$$) { return $'; } else { my $resp= $ua->request($req); - die $resp->status_line unless $resp->is_success; + die $resp->status_line."\n".$resp->content."\n " + unless $resp->is_success; return $resp->content(); } } @@ -340,4 +384,21 @@ sub check_tsv_line ($$) { return @v; } +sub cgi_get_caller () { + 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"; + } + return $caller; +} + +sub set_ctype_utf8 () { + setlocale(LC_CTYPE, "en.UTF-8"); +} + 1;