our (%commodmap);
-our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'}; die unless $pctb;
+our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'};
our ($ua)= LWP::UserAgent->new;
}
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;
rename "#commodmap#.tsv.new","#commodmap#.tsv" or die $!;
}
+our %newcommods;
+
+sub read_newcommods ($) {
+ my ($file) = @_;
+ if (!open NC, "< $file") {
+ $!==&ENOENT or die $!;
+ return;
+ }
+ while (<NC>) {
+ chomp; s/^\s*//; s/\s+$//;
+ next if m/^\#/;
+ next unless m/\S/;
+ $newcommods{$_}= 1;
+ }
+ NC->error and die $!;
+ close NC or die $!;
+}
+
+sub refresh_newcommods() {
+ my $rsync= $ENV{'YPPSC_PCTB_RSYNC'};
+ $rsync= 'rsync' if !defined $rsync;
+
+ my $local= "#master-newcommods#.txt";
+ my $src= $ENV{'YPPSC_PCTB_DICT_UPDATE'};
+ if ($src) {
+ my $remote= "$src/master-newcommods.txt";
+ $!=0; system 'rsync','-Lt','--',$remote,$local;
+ die "$? $!" if $! or $?;
+ }
+ read_newcommods($local);
+ read_newcommods('#local-newcommods#.txt');
+}
+
our (%stallmap, @stallmap);
sub bs_gen_md ($$) {
my $count= 0;
my $o= '';
- foreach $commod (sort {
- $commodmap{$a} <=> $commodmap{$b}
- } keys %commod) {
+ foreach $commod (
+ sort { $commodmap{$a} <=> $commodmap{$b} }
+ grep { exists $commodmap{$_} }
+ keys %commod
+ ) {
#print STDERR "COMMOD $commod\n";
$current= $commod{$commod};
my $l= bs_p($commod,$bs,$sortmul);
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';
my @missing= grep { !exists $commodmap{$_} } keys %commod;
if (@missing) {
refresh_commodmap();
+ refresh_newcommods();
my $missing=0;
foreach $commod (sort keys %commod) {
next if exists $commodmap{$commod};
- printf STDERR "Unknown commodity \`%s'!\n", $commod;
- $missing++;
+ if (exists $newcommods{$commod}) {
+ printf STDERR "Ignoring new commodity \`%s'!\n", $commod;
+ } else {
+ printf STDERR "Unknown commodity \`%s'!\n", $commod;
+ $missing++;
+ }
}
- die "$missing unknown commoditi(es). OCR failure?\n"
+ die "$missing unknown commoditi(es).".
+ " See README (search for \`newcommods').\n"
if $missing;
}
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;
}
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';
}
~yarrgweb / ypp-sc-tools.web-live.git / blobdiff