appears to make a marketdata file

[ypp-sc-tools.db-test.git] / pctb / yppsc-commod-processor

diff --git a/pctb/yppsc-commod-processor b/pctb/yppsc-commod-processor
index 911242c82a5f3a6963e22a7079ce5e2ab86808d4..2083be17221c1037db72151526b999b9b310ea88 100755 (executable)
--- a/pctb/yppsc-commod-processor
+++ b/pctb/yppsc-commod-processor
@@ -92,8 +92,6 @@ sub bs_p_bestprice ($) {
     }
 }
 
-our $arbitrage_only= 0;
-
 sub main__arbitrage () {
     my @arbs= ();
     foreach $commod (sort keys %commod) {
@@ -186,8 +184,6 @@ sub main__bestprices () {
        $current= $commod{$commod};
        my $buys=  bs_p($commod,Buy, -1);
        my $sells= bs_p($commod,Sell,+1);
-       if ($arbitrage_only) {
-       }
        printf("%-15.15s", $commod) or die $!;
        bs_p_bestprice($buys);
        bs_p_bestprice($sells);
@@ -247,27 +243,28 @@ sub refresh_commodmap() {
     my $intag='';
     my %got;
     my $o= new IO::File "#commodmap#.tsv.new",'w' or die $!;
+    undef %commodmap;
 
     my $xp= new XML::Parser
        (Handlers =>
         {
             Start => sub {
                 $_=$_[1];
-print STDERR "START [$_] intag=$intag icm=$incommodmap\n";
+#print STDERR "START [$_] intag=$intag icm=$incommodmap\n";
                 if (m/^commodmap$/i) {
                     $incommodmap++;
                     undef %got;
                 } elsif (m/^(?:name|index)$/i) {
                     $cdata='';
                     $intag=lc($_) if $incommodmap;
-                    print STDERR "START RECOGNISED $intag icm=$incommodmap\n";
-                } else {
-                    print STDERR "START UNRECOGNISED\n";
+#print STDERR "START RECOGNISED $intag icm=$incommodmap\n";
+#               } else {
+#print STDERR "START UNRECOGNISED\n";
                 }
             },
             End => sub {
                 $_=$_[1];
-print STDERR "END [$_] intag=$intag icm=$incommodmap\n";
+#print STDERR "END [$_] intag=$intag icm=$incommodmap\n";
                 if (m/^commodmap$/i) {
                     $incommodmap--;
                     die unless exists $got{'name'};
@@ -276,7 +273,7 @@ print STDERR "END [$_] intag=$intag icm=$incommodmap\n";
                     my $index= $1;
                     $_= $got{'name'};
                     s/^\s+//; s/\s+$//; s/\n/ /g; s/\s+/ /;
-                    die if exists $commodmap{$_};
+                    die "$_ ?" if exists $commodmap{$_};
                     $commodmap{$_}= $index;
                     print $o "$_\t$index\n" or die $!;
                 } elsif (lc $_ eq $intag) {
@@ -284,7 +281,7 @@ print STDERR "END [$_] intag=$intag icm=$incommodmap\n";
                 }
             },
             Char => sub {
-print STDERR "CHAR [$_[1]] intag=$intag icm=$incommodmap\n";
+#print STDERR "CHAR [$_[1]] intag=$intag icm=$incommodmap\n";
                 $cdata .= $_[1];
             }
         }) or die;
@@ -293,16 +290,48 @@ print STDERR "CHAR [$_[1]] intag=$intag icm=$incommodmap\n";
     # hacks to strip off drivel that seems to have been added!
     $content =~ s/^.*\n(\<\?xml)/$1/s;
     $content =~ s/\<\/body\>.*//s;
-    print STDERR "[[[$content]]]\n";
+#    print STDERR "[[[$content]]]\n";
     $xp->parse($content);
     close $o or die $!;
     rename "#commodmap#.tsv.new","#commodmap#.tsv" or die $!;
 }
-       
-#
-#sub bs_gen_md ($) {
-#    my ($bs) = @_;
-       
+
+our (%stallmap, @stallmap);
+
+sub bs_gen_md ($$) {
+    my ($bs,$sortmul) = @_;
+    my $count= 0;
+    my $o= '';
+    
+    foreach $commod (sort {
+       $commodmap{$a} <=> $commodmap{$b}
+    } keys %commod) {
+#print STDERR "COMMOD $commod\n";
+        $current= $commod{$commod};
+       my $l= bs_p($commod,$bs,$sortmul);
+       next unless @$l;
+#print STDERR "COMMOD $commod @$l\n";
+
+       $o .= writeint(scalar @$l);
+       foreach my $cs (@$l) {
+           $stall= $cs->{Stall};
+           my $stallix= $stallmap{$stall};
+           if (!defined $stallix) {
+               push @stallmap, $stall;
+               $stallmap{$stall}= $stallix= @stallmap;
+           }
+           my $qty= $cs->{Qty};
+           $qty =~ s/^\>\s*//;
+           $o .= writeint($stallix, $cs->{Price}, $qty+0);
+       }
+       $count++;
+    }
+#print STDERR "COMMOD $commod COUNT WAS $count\n";
+    return
+       writeint($count).$o;
+}
+
+sub writeint { return pack 'v*', @_; }
 
 sub main__genmarketdata () {
     our $version= '005b';
@@ -314,19 +343,24 @@ sub main__genmarketdata () {
        my $missing=0;
        foreach $commod (sort keys %commod) {
            next if exists $commodmap{$commod};
-           print STDERR "Unknown commodity \`%s'!\n";
+           printf STDERR "Unknown commodity \`%s'!\n", $commod;
            $missing++;
        }
-       die "$missing unknown commodities.  OCR failure?\n"
+       die "$missing unknown commoditi(es).  OCR failure?\n"
            if $missing;
     }    
-    
- #   foreach $commod (sort keys %commod) {
-#      next if 
-       
 
-#    bs_gen_md(Buy);
-#    bs_gen_md(Sell);
+    my $o='';
+    $o .= bs_gen_md(Buy, -1);
+    $o .= bs_gen_md(Sell,+1);
+
+    printf("$version\n".
+          "%d\n",
+          scalar(@stallmap))
+       or die $!;
+    foreach $stall (@stallmap) { print "$stall\n" or die $!; }
+
+    print $o or die$!;
 }