From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Fri, 26 Jun 2009 23:12:06 +0000 (+0100)
Subject: abbreviate stall types; allow some commod-results-processor modes to work without... 
X-Git-Tag: 1.9.2~90^2~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=12b118fd416fb96309d9e4ef65336e08441594c1

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

diff --git a/pctb/TODO b/pctb/TODO
index a890294..b51ee69 100644
--- 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
diff --git a/pctb/commod-results-processor b/pctb/commod-results-processor
index 3276329..b604419 100755
--- a/pctb/commod-results-processor
+++ b/pctb/commod-results-processor
@@ -218,7 +218,7 @@ sub main__tsv () {
 
 
 our (%commodmap);
-our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'};  die unless $pctb;
+our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'};
 
 our ($ua)= LWP::UserAgent->new;
 
@@ -235,6 +235,7 @@ sub load_commodmap() {
 }
 
 sub refresh_commodmap() {
+    die unless $pctb;
     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*', @_; }
 
+our (%stalltypetoabbrevmap)= qw(
+				Apothecary    A
+				Distilling    D
+				Furnishing    F
+				Ironworking   I
+				Shipbuilding  S
+				Tailoring     T
+				Weaving       W
+				);
+
 sub genmarketdata () {
     our $version= '005b';
 
@@ -355,7 +366,18 @@ sub genmarketdata () {
     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;
 }
 
@@ -365,6 +387,7 @@ sub main__genmarketdata () {
 }
 
 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";