X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=a405f75d640348a900ac320076d51c1b8567a095;hp=9c8281876f334b99578e73622cf95f00e9ec6259;hb=a7ea2fcf98297e6e9e631082f778d11b17b13620;hpb=166893c6f6bd3e9b382aca095dc5ac80a22f89b7;ds=sidebyside diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm index 9c82818..a405f75 100644 --- a/yarrg/Commods.pm +++ b/yarrg/Commods.pm @@ -24,6 +24,7 @@ package Commods; use IO::File; use HTTP::Request::Common (); use POSIX; +use LWP::UserAgent; use strict; use warnings; @@ -41,7 +42,8 @@ BEGIN { &get_our_version &check_tsv_line &pipethrough_prep &pipethrough_run &pipethrough_run_along &pipethrough_run_finish - &pipethrough_run_gzip + &pipethrough_run_gzip &http_useragent &version_core + &http_useragent_string_map &cgipostform &yarrgpostform &cgi_get_caller &set_ctype_utf8 $masterinfoversion); %EXPORT_TAGS = ( ); @@ -49,7 +51,33 @@ BEGIN { @EXPORT_OK = qw(); } -our $masterinfoversion= 2; # version we understand +our $masterinfoversion= 2; # version we understand. +# +# To extend the source-info.txt format: +# +# * Commods.pm:parse_info1 +# add code to parse new version +# +# * source-info.txt +# add new information +# +# If new data should NOT be in master-info.txt too: +# +# * update-master-info:process_some_info +# check that code for converting source-info to master-info +# removes the extra info; add code to remove it if necessary +# +# * db-idempotent-populate +# if database schema is extended, add code to copy data +# +# If new data DOES need to be in master-info.txt too: +# +# * Commods.pm:$masterinfoversion +# increment +# +# * update-master-info:process_some_info +# add code to convert new version to old, by removing +# extra info conditionally depending on version our %oceans; # eg $oceans{'Midnight'}{'Ruby'}{'Eta Island'}= $sources; our %clients; # eg $clients{'ypp-sc-tools'}= [ qw(last-page) ]; @@ -70,6 +98,9 @@ our (%pctb_commodmap,@pctb_commodmap); my %colours; # eg $colours{'c'}{'black'}= $sources my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth' +my %colour_ordvals; # $colour_ordvals{'green'}= '30'; +my %commodclasses; # $commodclasses{'dye'}= '3'; + # IMPORTANT # when extending the format of source-info in a non-backward # compatible way, be sure to update update-master-info too. @@ -88,11 +119,22 @@ sub parse_info1 ($$$) { s/\s+$//; if (m/^\%(\w+)$/) { my $colourkind= $1; - @ctx= (sub { $colours{$colourkind}{lc $_} .= $src; }); + @ctx= (sub { + m/^(\S[^\t@]+\S)(?:\t+\@(\d+))?$/ or die; + my ($colour,$order)=$1; + $colours{$colourkind}{$colour} .= $src; + $colour_ordvals{$colourkind}{$colour}= $order + if defined $order; + }); } elsif (m/^commods$/) { @ctx= (sub { push @rawcm, lc $_; }); } elsif (m/^nocommods$/) { @ctx= (sub { push @nocm, lc $_; }); + } elsif (m/^commodclasses$/) { + @ctx= (sub { + die unless m/^\*([-a-z]+)$/; + $commodclasses{$1}= scalar keys %commodclasses; + }); } elsif (m/^ocean (\w+)$/) { my $ocean= $1; keys %{ $oceans{$ocean} }; @@ -148,35 +190,53 @@ sub parse_info1 ($$$) { %commods= (); my $ca; $ca= sub { - my ($s,$ss) = @_; + my ($s,$ss,$ordbase) = @_; #print "ca($s)\n"; if ($s !~ m/\%(\w+)/) { my ($name, $props) = $s =~ - /^(\S[^\t]*\S)(?:\t+(\S[^\t]*\S))?$/ + /^(\S[^\t]*\S)(?:\t+(\S.*\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; + my ($ordval, $ordclassval); 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$/) { + } elsif ($prop =~ m/^([1-9]\d*)l$/) { $c->{Volume}= $1 * 1000; + } elsif ($prop =~ m/^\*([-a-z]+)$/) { + $c->{Class}= $1; + die "$1" unless exists $commodclasses{$1}; + $ordclassval= $commodclasses{$1} * 10000; + } elsif ($prop =~ m/^\@(\d+)$/) { + $ordval= $1; } else { die "unknown property $prop for $ucname"; } } + if (defined $ordbase && defined $ordval && defined $ordclassval) { + $ordval += $ordbase + $ordval + $ordclassval; + $c->{Ordval}= $ordval; +#print STDERR "ordval $name $ordval\n"; + } else { +#print STDERR "ordval $name NONE\n"; + } return; } die "unknown $&" unless defined $colours{$1}; my ($lhs,$pctlet,$rhs)= ($`,$1,$'); foreach my $c (keys %{ $colours{$pctlet} }) { - &$ca($lhs.$c.$rhs, $ss .'%'. $colours{$pctlet}{$c}); + my $ordcolour= $colour_ordvals{$c}; + &$ca($lhs.$c.$rhs, + $ss .'%'. $colours{$pctlet}{$c}, + defined($ordbase) && defined($ordcolour) + ? $ordbase+$ordcolour : undef); } }; - foreach (@rawcm) { &$ca($_,$src); } + foreach (@rawcm) { &$ca($_,$src,0); } } sub parse_info_clientside () { @@ -232,7 +292,14 @@ sub get_our_version ($$) { my ($aref,$prefix) = @_; $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg'; $aref->{"${prefix}fixes"}= 'lastpage checkpager'; + $aref->{"${prefix}version"}= version_core(); + return $aref; + # clientname "ypp-sc-tools" + # clientversion 2.1-g2e06a26 [from git-describe --tags HEAD] + # clientfixes "lastpage" [space separated list] +} +sub version_core () { my $version= ` if type -p git-describe >/dev/null 2>&1; then gd=git-describe @@ -242,11 +309,7 @@ sub get_our_version ($$) { \$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] + return $version; } sub pipethrough_prep () { @@ -386,4 +449,22 @@ sub set_ctype_utf8 () { setlocale(LC_CTYPE, "en.UTF-8"); } +sub http_useragent_string_map ($$) { + my ($caller_lib_agent, $reason_style_or_caller) = @_; + $caller_lib_agent =~ y/A-Za-z/N-ZA-Mn-za-m/; + $caller_lib_agent =~ s/\s/_/g; + my $version= version_core(); + return "yarrg/$version ($reason_style_or_caller)". + " $caller_lib_agent". + " (http://yarrg.chiark.net/intro)"; +} + +sub http_useragent ($) { + my ($who) = @_; + my $ua= LWP::UserAgent->new; + my $base= $ua->_agent(); + $ua->agent(http_useragent_string_map($base, $who)); + return $ua; +} + 1;