abbreviate stall types; allow some commod-results-processor modes to work without...

diff --git a/pctb/TODO b/pctb/TODO
index a89029416c91947b244edec5b3067f51e98790cc..b51ee694ee75381cdfdd87d5362ae89ce784693c 100644 (file)
--- a/pctb/TODO
+++ b/pctb/TODO
@@ -1,4 +1,3 @@
-abbreviate stall types

 fix delay thing when looking for answer from /w
 write real uploader
 test real uploader
 fix delay thing when looking for answer from /w
 write real uploader
 test real uploader

diff --git a/pctb/commod-results-processor b/pctb/commod-results-processor
index 32763293ac705f6128cd88a7312000ce296501ae..b604419db6cf7c3e43531fda9350fbd0eb9affea 100755 (executable)
--- a/pctb/commod-results-processor
+++ b/pctb/commod-results-processor
@@ -218,7 +218,7 @@ sub main__tsv () {
 
 
 our (%commodmap);
 
 
 our (%commodmap);

-our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'};  die unless $pctb;
+our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'};

 
 our ($ua)= LWP::UserAgent->new;
 
 
 our ($ua)= LWP::UserAgent->new;
 


@@ -235,6 +235,7 @@ sub load_commodmap() {
 }
 
 sub refresh_commodmap() {
 }
 
 sub refresh_commodmap() {

+    die unless $pctb;

     my $resp= $ua->get("$pctb/commodmap.php?version=2");
     die $resp->status_line unless $resp->is_success;
 
     my $resp= $ua->get("$pctb/commodmap.php?version=2");
     die $resp->status_line unless $resp->is_success;
 


@@ -331,6 +332,16 @@ sub bs_gen_md ($$) {
 
 sub writeint { return pack 'v*', @_; }
 
 
 sub writeint { return pack 'v*', @_; }
 

+our (%stalltypetoabbrevmap)= qw(
+                               Apothecary    A
+                               Distilling    D
+                               Furnishing    F
+                               Ironworking   I
+                               Shipbuilding  S
+                               Tailoring     T
+                               Weaving       W
+                               );
+

 sub genmarketdata () {
     our $version= '005b';
 
 sub genmarketdata () {
     our $version= '005b';
 


@@ -355,7 +366,18 @@ sub genmarketdata () {
     my $ot= sprintf("$version\n".
                    "%d\n",
                    scalar(@stallmap));
     my $ot= sprintf("$version\n".
                    "%d\n",
                    scalar(@stallmap));

-    foreach $stall (@stallmap) { $ot .= "$stall\n"; }
+    foreach $stall (@stallmap) {
+       my $st= $stall;
+       if ($st =~ m/^(\S+)\'s (\S+) Stall$/) {
+           my $stkind= $stalltypetoabbrevmap{$2};
+           if (defined $stkind) {
+               $st= "$1^$stkind";
+           } else {
+               warn "unknown stall type $2 in $st\n";
+           }
+       }
+       $ot .= "$st\n";
+    }

     return $ot.$ob;
 }
 
     return $ot.$ob;
 }
 


@@ -365,6 +387,7 @@ sub main__genmarketdata () {
 }
 
 sub main__upload () {
 }
 
 sub main__upload () {

+    die unless $pctb;

     my $o= genmarketdata();
     my $url= "$pctb/upload.php";
     $url= "http://www.chiark.greenend.org.uk/ucgi/~ijackson/check/upload.php";
     my $o= genmarketdata();
     my $url= "$pctb/upload.php";
     $url= "http://www.chiark.greenend.org.uk/ucgi/~ijackson/check/upload.php";