X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fcommod-results-processor;h=4a70ddf7767376ab8b9db5406750c257460e9c3c;hb=64063c86071bbfc2de0fe032e372e1321c4b34e5;hp=e3f45d177b190c00ee7451fdf73f66cd99bb8bca;hpb=17d7ef99b6c9283a0a576febd07c5ebf32b34978;p=ypp-sc-tools.db-live.git

diff --git a/pctb/commod-results-processor b/pctb/commod-results-processor
index e3f45d1..4a70ddf 100755
--- a/pctb/commod-results-processor
+++ b/pctb/commod-results-processor
@@ -224,7 +224,7 @@ our ($ua)= LWP::UserAgent->new;
 
 sub load_commodmap() {
     undef %commodmap;
-    my $c= new IO::File "#commodmap#.tsv";
+    my $c= new IO::File "_commodmap.tsv";
     if (!$c) { $!==&ENOENT or die $!; return; }
     while (<$c>) {
 	m/^(\S.*\S)\t(\d+)\n$/ or die "$_";
@@ -244,7 +244,7 @@ sub refresh_commodmap() {
     my $incommodmap=0;
     my $intag='';
     my %got;
-    my $o= new IO::File "#commodmap#.tsv.new",'w' or die $!;
+    my $o= new IO::File "_commodmap.tsv.tmp",'w' or die $!;
     undef %commodmap;
 
     my $xp= new XML::Parser
@@ -292,7 +292,7 @@ sub refresh_commodmap() {
 #    print STDERR "[[[$content]]]\n";
     $xp->parse($content);
     close $o or die $!;
-    rename "#commodmap#.tsv.new","#commodmap#.tsv" or die $!;
+    rename "_commodmap.tsv.tmp","_commodmap.tsv" or die $!;
 }
 
 our %newcommods;
@@ -317,7 +317,7 @@ sub refresh_newcommods() {
     my $rsync= $ENV{'YPPSC_PCTB_RSYNC'};
     $rsync= 'rsync' if !defined $rsync;
 
-    my $local= "#master-newcommods#.txt";
+    my $local= "_master-newcommods.txt";
     my $src= $ENV{'YPPSC_PCTB_DICT_UPDATE'};
     if ($src) {
 	my $remote= "$src/master-newcommods.txt";
@@ -325,7 +325,7 @@ sub refresh_newcommods() {
 	die "$? $!" if $! or $?;
     }
     read_newcommods($local);
-    read_newcommods('#local-newcommods#.txt');
+    read_newcommods('_local-newcommods.txt');
 }
 
 our (%stallmap, @stallmap);
@@ -430,7 +430,7 @@ sub main__genmarketdata () {
 
 sub save_upload_html ($$) {
     my ($which, $resptxt) = @_;
-    open R, ">./#upload-$which#.html" or die $!;
+    open R, ">./_upload-$which.html" or die $!;
     print R $resptxt or die $!;
     close R or die $!;
 }
@@ -449,7 +449,7 @@ sub main__upload () {
 			  ]
 		      };
 
-    print STDERR "Uploading data to server...\n";
+    print STDERR "Uploading data to $pctb...\n";
 
     my $resp= $ua->post("$url", Content => $content,
 			Content_Type => 'form-data');
@@ -458,7 +458,7 @@ sub main__upload () {
     my $resptxt= $resp->content();
     save_upload_html('1', $resptxt);
 
-    open R, ">./#upload-1#.html" or die $!;
+    open R, ">./_upload-1.html" or die $!;
     print R $resptxt or die $!;
     close R or die $!;
 
@@ -491,29 +491,32 @@ sub main__upload () {
     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);
+    my $siurl= ($url . "?action=setisland".
+		"&filename=$filename".
+		"&forcereload=$forcerl".
+		"&ocean=$oceanids[0]".
+		"&island=$islandid");
+    $resp= $ua->get($siurl);
+
     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";
+    die unless $resptxt =~ m/your uploaded data has been processed/i;
+    die unless $resptxt =~ m/your data has been integrated into the database/i;
+
+    $resptxt =~ s/\<a href=\"about:\w+\"\>[^<>]+\<\/a\>//g;
+    save_upload_html('3', $resptxt);
 
-    system 'printenv|grep YPP|sort';
+    print "\n" or die $!;
+    system('w3m -T text/html -dump < _upload-3.html');
+    
+    print "\n" or die $!;
 }