Fixups to new Upper/Lower/Digit/Word ocr arrangements; make dictionary-manager only...

[ypp-sc-tools.main.git] / pctb / commod-results-processor

diff --git a/pctb/commod-results-processor b/pctb/commod-results-processor
index 32763293ac705f6128cd88a7312000ce296501ae..36473186a80f242a7a0fcece99f7d8db6c2ba72a 100755 (executable)
--- a/pctb/commod-results-processor
+++ b/pctb/commod-results-processor
@@ -218,7 +218,7 @@ sub main__tsv () {
 
 
 our (%commodmap);
-our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'};  die unless $pctb;
+our ($pctb) = $ENV{'YPPSC_PCTB_PCTB'};
 
 our ($ua)= LWP::UserAgent->new;
 
@@ -235,6 +235,7 @@ sub load_commodmap() {
 }
 
 sub refresh_commodmap() {
+    die unless $pctb;
     my $resp= $ua->get("$pctb/commodmap.php?version=2");
     die $resp->status_line unless $resp->is_success;
 
@@ -331,6 +332,16 @@ sub bs_gen_md ($$) {
 
 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';
 
@@ -355,7 +366,18 @@ sub genmarketdata () {
     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;
 }
 
@@ -365,9 +387,9 @@ sub main__genmarketdata () {
 }
 
 sub main__upload () {
+    die unless $pctb;
     my $o= genmarketdata();
     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',
@@ -378,7 +400,33 @@ sub main__upload () {
                        Content_Type => 'form-data');
     die $resp->status_line unless $resp->is_success;
 
-    print "[[ ",$resp->content," ]]\n";
+    my $resptxt= $resp->content();
+
+    my @filenames= $resptxt =~
+ m/input\s+type="hidden"\s+name="filename"\s+value=\"([_.0-9a-z]+)\"/i;
+    @filenames or die "$resptxt ?";
+
+    my @forcerls= $resptxt =~
+ m/input\s+type="hidden"\s+name="forcereload"\s+value=\"([1-9]\d+)\"/i;
+    @forcerls or die "$resptxt ?";
+
+    my $filename= $filenames[0];
+    my $forcerl= $forcerls[0];
+
+    die "$resptxt | @filenames ?" if grep { $_ ne $filename } @filenames;
+    die "$resptxt | @forcerls ?" if grep { $_ ne $forcerl } @forcerls;
+
+#    my $setsland= {
+#      'action' => 'setisland'
+#      'filename' => $filename,
+#      '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 
+#    
+    print ">$filename|$forcerl<\n";
+
+    system 'printenv|grep YPP|sort';
 }