our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
$VERSION = 1.00;
@ISA = qw(Exporter);
- @EXPORT = qw(&parse_masters &parse_masters_ocean
+ @EXPORT = qw(&parse_info1 &rsync_master
+ &parse_info_serverside &parse_info_serverside_ocean
%oceans %commods %clients %routes %route_mysteries
&parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
&get_our_version &check_tsv_line
my %colours; # eg $colours{'c'}{'black'}= $sources
my @rawcm; # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
-sub parse_master_master1 ($$) {
+sub parse_info1 ($$) {
my ($mmfn,$src)= @_;
my $mm= new IO::File $mmfn, 'r' or die "$mmfn $!";
my @ctx= ();
my $arch= $ocean->{$an};
push @allislands, sort keys %$arch;
}
- parse_master_map_route_islands($on, \@allislands, $routes);
+ parse_info_maproutes($on, \@allislands, $routes);
foreach my $route (values %$routes) {
- parse_master_map_route_islands($on, \@allislands, $route);
+ parse_info_maproutes($on, \@allislands, $route);
}
}
}
-sub parse_master_map_route_islands ($$$) {
+sub parse_info_clientside () {
+ my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
+ return unless $yarrg;
+ my $master= fetch_with_rsync('info');
+ parse_info1($master,'s');
+ parse_info1('_local-info.txt','s');
+}
+
+sub fetch_with_rsync ($) {
+ my ($stem) = @_;
+
+ my $rsync= $ENV{'YPPSC_YARRG_RSYNC'};
+ $rsync= 'rsync' if !defined $rsync;
+
+ my $local= "_master-$stem.txt";
+ my $src= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
+ if ($src) {
+ my $remote= "$src/master-$stem.txt";
+ $!=0; system 'rsync','-Lt','--',$remote,$local;
+ die "$? $!" if $! or $?;
+ }
+}
+
+sub parse_info_maproutes ($$$) {
my ($on, $allislands, $routemap) = @_;;
foreach my $k (sort keys %$routemap) {
my @ok= grep { index($_,$k) >= 0 } @$allislands;
}
}
-sub parse_masters () {
- parse_master_master1('master-master.txt','s');
+sub parse_info_serverside () {
+ parse_info1('master-info.txt','s');
}
-sub parse_masters_ocean ($) {
+sub parse_info_serverside_ocean ($) {
my ($oceanname) = @_;
- parse_master_master1('master-master.txt','s');
die "unknown ocean $oceanname ?" unless exists $oceans{$oceanname};
- parse_master_master1("ocean-".(lc $oceanname).".txt",'s');
+ parse_info1("ocean-".(lc $oceanname).".txt",'s');
}
sub parse_pctb_commodmap () {
}
sub refresh_newcommods() {
- my $rsync= $ENV{'YPPSC_YARRG_RSYNC'};
- $rsync= 'rsync' if !defined $rsync;
-
- my $local= "_master-newcommods.txt";
- my $src= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
- if ($src) {
- my $remote= "$src/master-newcommods.txt";
- $!=0; system 'rsync','-Lt','--',$remote,$local;
- die "$? $!" if $! or $?;
- }
- read_newcommods($local);
+ my $master= fetch_with_rsync('newcommods');
+ read_newcommods($master);
read_newcommods('_local-newcommods.txt');
}
sub main__uploadyaarg () {
my %o;
+
+ parse_info_clientside();
+
$o{'ocean'}= $ENV{'YPPSC_OCEAN'} or die;
$o{'island'}= $ENV{'YPPSC_ISLAND'} or die;
$o{'timestamp'}= 10;
Content_Type => 'application/octet-stream',
Content => $oz ];
- my $dest= $ENV{'YPPSC_YAARG_SUBMIT'};
+ my $dest= $ENV{'YPPSC_YARRG_YARRG'};
my $respcontent= cgipostform($ua, "$dest/commod-update-receiver", \%o);
$respcontent =~ m/^OK\b/ or die "$respcontent ?";
--- /dev/null
+#!/usr/bin/perl -w
+
+use strict (qw(vars));
+
+use DBI;
+
+use Commods;
+
+@ARGV==1 or die;
+my ($rsyncdir) = @ARGV;
+
+parse_info_serverside();
+
+foreach my $oceanname (sort keys %oceans) {
+ print STDERR "updating ocean $oceanname...\n";
+ system('./db-idempotent-populate',$oceanname); die $? if $?;
+}
+
+print STDERR "installing new master-info...\n";
+my $df= "$rsyncdir/master-info.txt";
+system('cp','--','master-info.txt',"$df.tmp"); die $? if $?;
+system('mv','--',"$df.tmp",$df); die $? if $?