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

diff --git a/pctb/commod-results-processor b/pctb/commod-results-processor
index 3647318..c3cbe8e 100755
--- a/pctb/commod-results-processor
+++ b/pctb/commod-results-processor
@@ -236,6 +236,7 @@ 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;
 
@@ -386,9 +387,19 @@ 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";
     my $content= {
 	'marketdata' => [ undef, "marketdata.gz",
@@ -396,35 +407,70 @@ sub main__upload () {
 			  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;
 
     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]+)\"/i;
-    @filenames or die "$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+)\"/i;
-    @forcerls or die "$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];
 
-    die "$resptxt | @filenames ?" if grep { $_ ne $filename } @filenames;
-    die "$resptxt | @forcerls ?" if grep { $_ ne $forcerl } @forcerls;
+    $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 $setsland= {
-#	'action' => 'setisland'
-#	'filename' => $filename,
-#	'forcereload' => $forcerl,
-#    my $url_setisland= "$url
+    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?topisland=560&ocean=2&island=48&action=setisland&forcereload=1244748679&filename=PFayDW' >v.html 
+#http://pctb.ilk.org/upload.php?&ocean=2&island=48&action=setisland&forcereload=1244748679&filename=PFayDW' >v.html 
 #    
-    print ">$filename|$forcerl<\n";
+#    print ">$filename|$forcerl|@oceanids|$islandid<\n";
 
     system 'printenv|grep YPP|sort';
 }