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=91781126d319a32c5f0a5d15f3ec499c82af1fbb;hp=e63126ace25bb25fa65006d4e028bc4c0154969b;hb=7f2e815e66f91398e28e5aacbe58def8b84fd6b0;hpb=1457a9e8d2e5ddda2b05b658e69df1b80a07320d

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index e63126a..9178112 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -37,10 +37,10 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&parse_info_clientside &fetch_with_rsync
 		      &parse_info_serverside &parse_info_serverside_ocean
-		      %oceans %commods %clients
+		      %oceans %commods %clients %commodclasses
 		      %vessels %shotname2damage
 		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
-		      &get_our_version &check_tsv_line
+		      &get_our_version &check_tsv_line &errsan
 		      &pipethrough_prep &pipethrough_run
 		      &pipethrough_run_along &pipethrough_run_finish
 		      &pipethrough_run_gzip &http_useragent &version_core
@@ -94,12 +94,16 @@ 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]
+# eg $commods{'Fine black cloth'}{Ordval}= 203921
 
 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{'c'}{'green'}= '30';
+our %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.
@@ -118,11 +122,24 @@ 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,$2);
+		$colours{$colourkind}{$colour} .= $src;
+		if (defined $order) {
+		    $order =~ s/^(\d+)\+$/ $1  + $. * 10 /e;
+		    $colour_ordvals{$colourkind}{$colour}= $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} };
@@ -177,36 +194,57 @@ sub parse_info1 ($$$) {
 	
     %commods= ();
     my $ca;
+    my $lnoix=0;
     $ca= sub {
-	my ($s,$ss) = @_;
-#print "ca($s)\n";
+	my ($s,$ss,$ordbase) = @_;
+#print STDERR "ca($s,,".(defined $ordbase ? $ordbase : '?').")\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= 1e7 + $commodclasses{$1} * 1e7;
+		} elsif ($prop =~ m/^\@(\d+\+?)$/) {
+		    $ordval= $1;
+		    $ordval =~ s/^(\d+)\+$/ $1 + $lnoix * 10 /e;
 		} else {
 		    die "unknown property $prop for $ucname";
 		}
 	    }
+	    $c->{ClassOrdval}= $ordclassval;
+	    if (defined $ordbase && defined $ordval && defined $ordclassval) {
+		my $ordvalout= $ordbase + $ordval + $ordclassval;
+		$c->{Ordval}= $ordvalout;
+#print STDERR "ordval $ordvalout $name OV=$ordval OB=$ordbase OCV=$ordclassval\n";
+	    } else {
+#print STDERR "ordval NONE $name\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{$pctlet}{$c};
+	    &$ca($lhs.$c.$rhs,
+		 $ss .'%'. $colours{$pctlet}{$c},
+		 defined($ordbase) && defined($ordcolour)
+		     ? $ordbase+$ordcolour : undef);
 	}
     };
-    foreach (@rawcm) { &$ca($_,$src); }
+    foreach (@rawcm) { $lnoix++; &$ca($_,$src,0); }
 }
 
 sub parse_info_clientside () {
@@ -369,6 +407,12 @@ sub cgipostform ($$$) {
 
 our %check_tsv_done;
 
+sub errsan ($) {
+    my ($value) = @_;
+    $value =~ s/[^-+\'. A-Za-z0-9]/ sprintf "\\x%02x",ord $& /ge;
+    return "\"$value\"";
+}
+
 sub check_tsv_line ($$) {
     my ($l, $bad_data_callback) = @_;
     my $bad_data= sub { &$bad_data_callback("bad data: line $.: $_[0]"); };
@@ -382,15 +426,19 @@ sub check_tsv_line ($$) {
 
     !keys %commods or
 	defined $commods{$commod} or
-	&$bad_data("unknown commodity \`$commod'");
+	&$bad_data("unknown commodity ".errsan($commod));
     
-    $stall =~ m/^\p{IsUpper}|^[0-9]/ or &$bad_data("stall not capitalised");
-    !exists $check_tsv_done{$commod,$stall} or &$bad_data("repeated data");
+    $stall =~ m/^\p{IsUpper}|^[0-9]/ or
+	&$bad_data("stall not capitalised ".errsan($stall));
+    !exists $check_tsv_done{$commod,$stall} or
+	&$bad_data("repeated data ".errsan($commod).",".errsan($stall));
     $check_tsv_done{$commod,$stall}= 1;
     foreach my $i (2..5) {
 	my $f= $v[$i];
-	$f =~ m/^(|0|[1-9][0-9]{0,5}|\>1000)$/ or &$bad_data("bad field $i");
-	($i % 2) or ($f !~ m/\>/) or &$bad_data("> in field $i price");
+	$f =~ m/^(|0|[1-9][0-9]{0,5}|\>1000)$/ or
+	    &$bad_data("bad field $i ".errsan($f));
+	($i % 2) or ($f !~ m/\>/) or
+	    &$bad_data("> in field $i price ".errsan($f));
     }
 
     foreach my $i (2,4) {