chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct bugs in new AA table cell structure parsing
[ypp-sc-tools.db-test.git]
/
pctb
/
commod-results-processor
diff --git
a/pctb/commod-results-processor
b/pctb/commod-results-processor
index e3f45d177b190c00ee7451fdf73f66cd99bb8bca..3ea53be79f49b73a36b9be2f592a307a05b2833e 100755
(executable)
--- a/
pctb/commod-results-processor
+++ b/
pctb/commod-results-processor
@@
-244,7
+244,7
@@
sub refresh_commodmap() {
my $incommodmap=0;
my $intag='';
my %got;
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
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 $!;
# 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;
}
our %newcommods;
@@
-491,29
+491,32
@@
sub main__upload () {
die "@forcerls ?" if grep { $_ ne $forcerl } @forcerls;
my $setisland= {
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";
};
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);
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 $!;
}
}