chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Leave PCTB server text in #upload-1#.html
[ypp-sc-tools.main.git]
/
pctb
/
commod-results-processor
diff --git
a/pctb/commod-results-processor
b/pctb/commod-results-processor
index 36473186a80f242a7a0fcece99f7d8db6c2ba72a..c54a23585a388b6bc7bb018a7be910e11a14a72d 100755
(executable)
--- a/
pctb/commod-results-processor
+++ b/
pctb/commod-results-processor
@@
-387,6
+387,8
@@
sub main__genmarketdata () {
}
sub main__upload () {
}
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();
my $url= "$pctb/upload.php";
die unless $pctb;
my $o= genmarketdata();
my $url= "$pctb/upload.php";
@@
-402,19
+404,22
@@
sub main__upload () {
my $resptxt= $resp->content();
my $resptxt= $resp->content();
+ open R, ">./#upload-1#.html" or die $!;
+ print R $resptxt or die $!;
+ close R or die $!;
+
my @filenames= $resptxt =~
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]+)\"/i
g
;
+ @filenames or die;
my @forcerls= $resptxt =~
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+)\"/i
g
;
+ @forcerls or die;
my $filename= $filenames[0];
my $forcerl= $forcerls[0];
my $filename= $filenames[0];
my $forcerl= $forcerls[0];
- die "$resptxt | @filenames ?" if grep { $_ ne $filename } @filenames;
- die "$resptxt | @forcerls ?" if grep { $_ ne $forcerl } @forcerls;
+#print "[[[ $resptxt ]]]\n";
# my $setsland= {
# 'action' => 'setisland'
# my $setsland= {
# 'action' => 'setisland'
@@
-422,9
+427,9
@@
sub main__upload () {
# 'forcereload' => $forcerl,
# my $url_setisland= "$url
#
# 'forcereload' => $forcerl,
# my $url_setisland= "$url
#
-#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';
}
system 'printenv|grep YPP|sort';
}