X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fupdate-master-info;h=893b3677974aa924143a20360dd085341de3175c;hp=1dd432ff895584365fbc7c2aebfbe05193466562;hb=70f23c42b325a1463fe8a9d76cb967b7df1260df;hpb=1478fddc005bdaa1fa3ab731a0bd59613502e90d

diff --git a/yarrg/update-master-info b/yarrg/update-master-info
index 1dd432f..893b367 100755
--- a/yarrg/update-master-info
+++ b/yarrg/update-master-info
@@ -1,15 +1,66 @@
 #!/usr/bin/perl -w
+#
+# MAIN ADMINISTRATIVE DATABASE UPDATE TOOL
+#
+#  Usage:
+#     ./update-master-info [-d RSYNCDESTDIR] [-O OCEAN ... | -a]
+#
+#  Usual usages:
+#
+#    After editing source-info.txt to add commodities, or
+#    changing db-idempotent-update (eg to change the schema):
+#         ./update-master-info -d ~ftp/users/ijackson/yarrg/
+#    This will update everything except the ocean topologies.
+#
+#    To take account of new islands, or to fix a mistake in
+#    assigning island(s) to archipelago(es), or to add support
+#    for a new ocean:
+#         ./update-master-info -d ~ftp/users/ijackson/yarrg/ -O Midnight
+#
+#    After a fix to a mistake on a YPPedia chart page, correcting
+#    only inter-island-distances:
+#         ./update-master-info -O Midnight
+#
+#    After changing the algorithms for topology determination
+#    or YPPedia scraping:
+#         ./update-master-info -a
+#    and check that nothing unexpected changes.
+#
+
+# This is part of ypp-sc-tools, a set of third-party tools for assisting
+# players of Yohoho Puzzle Pirates.
+#
+# Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+# are used without permission.  This program is not endorsed or
+# sponsored by Three Rings.
 
 use strict (qw(vars));
 use DBI;
 use Commods;
 
+$ENV{'LC_CTYPE'}= 'en_GB.UTF-8';
 
 sub full ($) {
     my ($ocean) = @_;
     quick($ocean);
     print "## updating topology of $ocean\n";
-    system('./yppedia-chart-parser',$ocean); die $? if $?;
+    system('./yppedia-chart-parser',$ocean); die "$ocean $?" if $?;
+    print "\n";
 }
 
 sub quick ($) {
@@ -20,39 +71,49 @@ sub quick ($) {
 
 my $rsyncdir;
 
-sub update_master_info () {
-    my $sfn= 'source-info.txt';
+sub process_some_info ($$$) {
+    my ($v,$df,$sfn) = @_;
+    my $sf= new IO::File $sfn or die "$sfn $!";
+
+    my $h;
+    while (<$sf>) {
+	chomp; s/\s+$//;
+	next if m/^\s*\#/ || !m/\S/;
+	if (m/^\S.*/) {
+	    $h= $&;
+	}
+	die "$_ ?" unless defined $h;
+	if ($h =~ m/^commods|^\%[a-z]\b/) {
+	    s/\t.*//;
+	}
+	if ($v<2) {
+	    next if $h =~ m/^nocommods/;
+	}
+	next if $sfn =~ m/source-info/ && $h =~ m/^ocean\b/;
+	next if $h =~ m/^client\b/;
+
+	print $df $_, "\n" or die $!;
+    }
+
+    $sf->error and die $!;
+}
 
+sub update_master_info () {
     foreach my $v (1..$masterinfoversion) {
 	my $dfnl= sprintf "master-info%s.txt", ($v>1 ? "-v$v" : '');
 	print STDERR "installing new $dfnl...\n";
     
 	my $dfn= "$rsyncdir/$dfnl";
-	my $sf= new IO::File $sfn or die "$sfn $!";
 	my $df= new IO::File "$dfn.tmp", 'w' or die "$dfn.tmp $!";
 
-	my $h;
-	while (<$sf>) {
-	    chomp; s/\s+$//;
-	    next if m/^\s*\#/ || !m/\S/;
-	    if (m/^\S.*/) {
-		$h= $&;
-	    }
-	    die "$_ ?" unless defined $h;
-	    if ($h =~ m/^commods|^\%[a-z]\b/) {
-		s/\t.*//;
-	    }
-	    if ($v<2) {
-		next if $h =~ m/^nocommods/;
-	    }
-	    print $df $_, "\n" or die $!;
+	process_some_info($v,$df, 'source-info.txt');
+	foreach my $ocean (sort keys %oceans) {
+	    process_some_info($v,$df, '_ocean-'.(lc $ocean).'.txt');
 	}
 
-	$sf->error and die $!;
 	close $df or die $!;
 	rename "$dfn.tmp", "$dfn" or die $!;
     }
-
 }
 
 
@@ -69,12 +130,20 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     $_= shift @ARGV;
     last if m/^--?$/;
     while (m/^-./) {
-	if (s/^-d//) { $rsyncdir= optarg(); }
-	elsif (s/^-O//) { push @specoceans, optarg(); }
-	elsif (s/^-a//) { $alloceans=1; }
-	else { die "$_ ?"; }
+	if (s/^-d//) {
+	    die if defined $rsyncdir;
+	    $rsyncdir= optarg();
+	} elsif (s/^-O//) {
+	    push @specoceans, optarg();
+	} elsif (s/^-a//) {
+	    die if $alloceans;
+	    $alloceans=1;
+	} else {
+	    die "$_ ?";
+	}
     }
 }
+die if @ARGV;
 
 die if @specoceans && $alloceans;