# 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{'green'}= '30';
+my %colour_ordvals; # $colour_ordvals{'c'}{'green'}= '30';
my %commodclasses; # $commodclasses{'dye'}= '3';
# IMPORTANT
if (m/^\%(\w+)$/) {
my $colourkind= $1;
@ctx= (sub {
- m/^(\S[^\t@]+\S)(?:\t+\@(\d+))?$/ or die;
- my ($colour,$order)=$1;
+ m/^(\S[^\t@]*\S)(?:\t+\@(\d+\+?))?$/ or die "$_ ?";
+ my ($colour,$order)=($1,$2);
$colours{$colourkind}{$colour} .= $src;
- $colour_ordvals{$colourkind}{$colour}= $order
- if defined $order;
+ if (defined $order) {
+ $order =~ s/^(\d+)\+$/ $1 + $. * 10 /e;
+ $colour_ordvals{$colourkind}{$colour}= $order;
+ }
});
} elsif (m/^commods$/) {
@ctx= (sub { push @rawcm, lc $_; });
my $ca;
$ca= sub {
my ($s,$ss,$ordbase) = @_;
-#print "ca($s)\n";
+#print STDERR "ca($s,,".(defined $ordbase ? $ordbase : '?').")\n";
if ($s !~ m/\%(\w+)/) {
my ($name, $props) = $s =~
/^(\S[^\t]*\S)(?:\t+(\S.*\S))?$/
} elsif ($prop =~ m/^\*([-a-z]+)$/) {
$c->{Class}= $1;
die "$1" unless exists $commodclasses{$1};
- $ordclassval= $commodclasses{$1} * 10000;
+ $ordclassval= 1e7 + $commodclasses{$1} * 1e7;
} elsif ($prop =~ m/^\@(\d+)$/) {
$ordval= $1;
} else {
}
}
if (defined $ordbase && defined $ordval && defined $ordclassval) {
- $ordval += $ordbase + $ordval + $ordclassval;
- $c->{Ordval}= $ordval;
-#print STDERR "ordval $name $ordval\n";
+ my $ordvalout= $ordbase + $ordval + $ordclassval;
+ $c->{Ordval}= $ordvalout;
+#print STDERR "ordval $ordvalout $name OV=$ordval OB=$ordbase OCV=$ordclassval\n";
} else {
-#print STDERR "ordval $name NONE\n";
+#print STDERR "ordval NONE $name\n";
}
return;
}
die "unknown $&" unless defined $colours{$1};
my ($lhs,$pctlet,$rhs)= ($`,$1,$');
foreach my $c (keys %{ $colours{$pctlet} }) {
- my $ordcolour= $colour_ordvals{$c};
+ my $ordcolour= $colour_ordvals{$pctlet}{$c};
&$ca($lhs.$c.$rhs,
$ss .'%'. $colours{$pctlet}{$c},
defined($ordbase) && defined($ordcolour)