X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fcommod-results-processor;h=c3cbe8e1b479447245540556754789863109f453;hb=e8489d4711c4cc773f6e5f315f3799027e824f91;hp=32763293ac705f6128cd88a7312000ce296501ae;hpb=e888c1dd3476ca49bccf82b93b4a3633587d400d;p=ypp-sc-tools.db-test.git

diff --git a/pctb/commod-results-processor b/pctb/commod-results-processor
index 3276329..c3cbe8e 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,8 @@ sub load_commodmap() {
 }
 
 sub refresh_commodmap() {
+    die unless $pctb;
+    $pctb =~ s,/*$,,;
     my $resp= $ua->get("$pctb/commodmap.php?version=2");
     die $resp->status_line unless $resp->is_success;
 
@@ -331,6 +333,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 +367,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;
 }
 
@@ -364,21 +387,92 @@ sub main__genmarketdata () {
     print $o or die $!;
 }
 
+sub save_upload_html ($$) {
+    my ($which, $resptxt) = @_;
+    open R, ">./#upload-$which#.html" or die $!;
+    print R $resptxt or die $!;
+    close R or die $!;
+}
+
 sub main__upload () {
+    my $ocean= $ENV{'YPPSC_OCEAN'};  die unless $ocean;
+    my $island= $ENV{'YPPSC_ISLAND'};  die unless $island;
+    die unless $pctb;
     my $o= genmarketdata();
+    $pctb =~ s,/*$,,;
     my $url= "$pctb/upload.php";
-    $url= "http://www.chiark.greenend.org.uk/ucgi/~ijackson/check/upload.php";
     my $content= {
 	'marketdata' => [ undef, "marketdata.gz",
 			  Content_Type => 'application/gzip',
 			  Content => $o
 			  ]
 		      };
+
+    print STDERR "Uploading data to server...\n";
+
     my $resp= $ua->post("$url", Content => $content,
 			Content_Type => 'form-data');
     die $resp->status_line unless $resp->is_success;
 
-    print "[[ ",$resp->content," ]]\n";
+    my $resptxt= $resp->content();
+    save_upload_html('1', $resptxt);
+
+    open R, ">./#upload-1#.html" or die $!;
+    print R $resptxt or die $!;
+    close R or die $!;
+
+    my @filenames= $resptxt =~
+ m/input\s+type="hidden"\s+name="filename"\s+value=\"([_.0-9a-z]+)\"/ig;
+    @filenames or die;
+
+    my @forcerls= $resptxt =~
+ m/input\s+type="hidden"\s+name="forcereload"\s+value=\"([1-9]\d+)\"/ig;
+    @forcerls or die;
+
+    my $filename= $filenames[0];
+    my $forcerl= $forcerls[0];
+
+    $ocean= ucfirst lc $ocean;
+    my @oceanids= $resptxt =~
+ m/\<option value\=\"(\d+)\"\>$ocean\<\/option\>/;
+    @oceanids==1 or die "@oceanids ?";
+
+    my $islandid;
+    while ($resptxt =~
+ m/^islands\[\d+\]\[\d+\]\=new\s+option\(\"(.*)\"\,(\d+)\)\s*$/mig
+	   ) {
+	next unless $1 eq $island;
+	$islandid= $2;
+    }
+    defined $islandid or die;
+
+    die "@filenames ?" if grep { $_ ne $filename } @filenames;
+    die "@forcerls ?" if grep { $_ ne $forcerl } @forcerls;
+
+    my $setisland= {
+	'action' => 'setisland',
+	'filename' => $filename,
+	'forcereload' => $forcerl,
+	'ocean' => $oceanids[0],
+	'island' => $islandid,
+    };
+
+    print STDERR "Setting ocean and island...\n";
+
+    $resp= $ua->post("${url}IWJTEST", $setisland);
+    die $resp->status_line unless $resp->is_success;
+
+    $resptxt= $resp->content();
+    save_upload_html('2', $resptxt);
+
+    
+    
+#
+#http://pctb.ilk.org/upload.php?&ocean=2&island=48&action=setisland&forcereload=1244748679&filename=PFayDW' >v.html 
+#    
+#    print ">$filename|$forcerl|@oceanids|$islandid<\n";
+
+    system 'printenv|grep YPP|sort';
 }