}
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
$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";
+ 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); }
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 $!;
$aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
$aref->{"${prefix}fixes"}= 'lastpage';
- my $version= `git-describe --tags HEAD`; $? and die $?;
+ my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?;
chomp($version);
$aref->{"${prefix}version"}= $version;
return $aref;
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;
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();
}
}