commodity ordering: more comprehensive output

[ypp-sc-tools.db-test.git] / yarrg / Commods.pm

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index a405f75d640348a900ac320076d51c1b8567a095..0d45c5ea70367945bb997c8cdc409ef4caf3afcc 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -92,13 +92,14 @@ 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{'green'}= '30';
+my %colour_ordvals; # $colour_ordvals{'c'}{'green'}= '30';
 my %commodclasses; # $commodclasses{'dye'}= '3';
 
 # IMPORTANT
@@ -120,11 +121,13 @@ sub parse_info1 ($$$) {
        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 $_; });
@@ -189,9 +192,10 @@ sub parse_info1 ($$$) {
        
     %commods= ();
     my $ca;
+    my $lnoix=0;
     $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))?$/
@@ -210,33 +214,34 @@ sub parse_info1 ($$$) {
                } elsif ($prop =~ m/^\*([-a-z]+)$/) {
                    $c->{Class}= $1;
                    die "$1" unless exists $commodclasses{$1};
-                   $ordclassval= $commodclasses{$1} * 10000;
-               } elsif ($prop =~ m/^\@(\d+)$/) {
+                   $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";
                }
            }
            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)
                     ? $ordbase+$ordcolour : undef);
        }
     };
-    foreach (@rawcm) { &$ca($_,$src,0); }
+    foreach (@rawcm) { $lnoix++; &$ca($_,$src,0); }
 }
 
 sub parse_info_clientside () {