chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mode default is --upload so don't mention that in the README top example
[ypp-sc-tools.db-live.git]
/
pctb
/
commod-results-processor
diff --git
a/pctb/commod-results-processor
b/pctb/commod-results-processor
index 3ea53be79f49b73a36b9be2f592a307a05b2833e..4a70ddf7767376ab8b9db5406750c257460e9c3c 100755
(executable)
--- a/
pctb/commod-results-processor
+++ b/
pctb/commod-results-processor
@@
-224,7
+224,7
@@
our ($ua)= LWP::UserAgent->new;
sub load_commodmap() {
undef %commodmap;
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 "$_";
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 $incommodmap=0;
my $intag='';
my %got;
- my $o= new IO::File "
#commodmap#
.tsv.tmp",'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.tmp","#commodmap#
.tsv" or die $!;
+ rename "
_commodmap.tsv.tmp","_commodmap
.tsv" or die $!;
}
our %newcommods;
}
our %newcommods;
@@
-317,7
+317,7
@@
sub refresh_newcommods() {
my $rsync= $ENV{'YPPSC_PCTB_RSYNC'};
$rsync= 'rsync' if !defined $rsync;
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";
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);
die "$? $!" if $! or $?;
}
read_newcommods($local);
- read_newcommods('
#local-newcommods#
.txt');
+ read_newcommods('
_local-newcommods
.txt');
}
our (%stallmap, @stallmap);
}
our (%stallmap, @stallmap);
@@
-430,7
+430,7
@@
sub main__genmarketdata () {
sub save_upload_html ($$) {
my ($which, $resptxt) = @_;
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 $!;
}
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');
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);
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 $!;
print R $resptxt or die $!;
close R or die $!;
@@
-514,7
+514,7
@@
sub main__upload () {
save_upload_html('3', $resptxt);
print "\n" or die $!;
save_upload_html('3', $resptxt);
print "\n" or die $!;
- system('w3m -T text/html -dump <
\#upload-3#
.html');
+ system('w3m -T text/html -dump <
_upload-3
.html');
print "\n" or die $!;
}
print "\n" or die $!;
}