# 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);
if (m/^\%(\w+)$/) {
my $colourkind= $1;
@ctx= (sub {
- m/^(\S[^\t@]+\S)(?:\t+\@(\d+))?$/ or die;
+ 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 $_; });
} elsif ($prop =~ m/^\*([-a-z]+)$/) {
$c->{Class}= $1;
die "$1" unless exists $commodclasses{$1};
- $ordclassval= $commodclasses{$1} * 1000000;
+ $ordclassval= 1e7 + $commodclasses{$1} * 1e7;
} elsif ($prop =~ m/^\@(\d+)$/) {
$ordval= $1;
} else {
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";
+#print STDERR "ordval $ordvalout $name OV=$ordval OB=$ordbase OCV=$ordclassval\n";
} else {
-print STDERR "ordval NONE $name\n";
+#print STDERR "ordval NONE $name\n";
}
return;
}