X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fdb-idempotent-populate;h=1d106f2b4f9ef6924cebc6f19b0677ce8352d008;hp=b7743ed9cb1ff3f78ef9b6be379d4635ec467e1e;hb=a9a88c14c5a5bd057932f76ad721b5f0fc845c20;hpb=c68fb80a6bbf7acbcac4b2cb2143f5fea745cd2b

diff --git a/yarrg/db-idempotent-populate b/yarrg/db-idempotent-populate
index b7743ed..1d106f2 100755
--- a/yarrg/db-idempotent-populate
+++ b/yarrg/db-idempotent-populate
@@ -1,5 +1,8 @@
 #!/usr/bin/perl -w
 #
+# Normally run from
+#  update-master-info
+#
 # usage: ./db-idempotent-populate <Oceanname>
 #  creates or updates OCEAN-Oceanname.db
 #  from master-master.txt
@@ -38,10 +41,10 @@ my ($oceanname) = @ARGV;
 
 #---------- setup ----------
 
-parse_masters_ocean($oceanname);
-our $ocean= $oceans{$oceanname};
+parse_info_serverside();
 
 db_setocean($oceanname);
+db_writer();
 db_connect();
 
 #---------- schema ----------
@@ -93,6 +96,19 @@ db_doall(<<END)
 	dist		INTEGER			NOT NULL,
 	PRIMARY KEY (aiid, biid)
  );
+ CREATE TABLE IF NOT EXISTS routes (
+	aiid		INTEGER			NOT NULL,
+	biid		INTEGER			NOT NULL,
+	dist		INTEGER			NOT NULL,
+	PRIMARY KEY (aiid, biid)
+ );
+ CREATE TABLE IF NOT EXISTS vessels (
+	name		TEXT			NOT NULL,
+	mass		INTEGER			NOT NULL,
+	volume		INTEGER			NOT NULL,
+	shot		INTEGER			NOT NULL,
+	PRIMARY KEY (name)
+ );
 END
     ;
 
@@ -101,112 +117,46 @@ $dbh->commit;
 #---------- commodity list ----------
 
 {
-    my $sth= $dbh->prepare(<<'END')
- INSERT OR IGNORE INTO commods (commodname) VALUES (?);
+    my $insert= $dbh->prepare(<<'END')
+ INSERT OR IGNORE INTO commods
+     (unitmass,
+      unitvolume,
+      commodname)
+     VALUES (?,?,?);
 END
     ;
-    foreach my $commod (sort keys %commods) {
-	$sth->execute($commod);
-    }
-    $dbh->commit;
-}
-
-#---------- island list ----------
-
-{
-    my $sth= $dbh->prepare(<<'END')
- INSERT OR IGNORE INTO islands (islandname, archipelago) VALUES (?, ?);
+    my $update= $dbh->prepare(<<'END')
+ UPDATE commods
+     SET unitmass = ?,
+         unitvolume = ?
+     WHERE commodname = ?
 END
     ;
-    foreach my $archname (sort keys %$ocean) {
-	my $arch= $ocean->{$archname};
-	foreach my $islandname (sort keys %$arch) {
-	    $sth->execute($islandname, $archname);
-	}
+    foreach my $commod (sort keys %commods) {
+	my $c= $commods{$commod};
+        die "no mass for $commod" unless defined $c->{Mass};
+        die "no colume for $commod" unless defined $c->{Volume};
+	my @qa= ($c->{Mass}, $c->{Volume}, $commod);
+	$insert->execute(@qa);
+	$update->execute(@qa);
     }
     $dbh->commit;
 }
 
-#---------- routes ----------
-
+#---------- vessel types ----------
 {
-    foreach my $islandname (sort keys %{ $route_mysteries{$oceanname} }) {
-	warn "$route_mysteries{$oceanname}{$islandname} routes".
-	    " for unknown island $islandname\n";
-    }
-
-    my $allroutes= $routes{$oceanname};
-
-    my @propqueue= ();
-
-    sub distance_set_propagate ($$$$) {
-	my ($lev, $start, $upto, $start2upto) = @_;
-	$allroutes->{$start}{$upto}= $start2upto;
-	push @propqueue, [ $lev, $start, $upto ];
-    }
-
-    sub distance_propagate_now {
-	my ($lev, $start, $upto) = @_;
-	my $startref= $allroutes->{$start};
-	my $start2upto= $startref->{$upto};
-	my $uptoref=  $allroutes->{$upto};
-
-	for my $next (keys %$uptoref) {
-	    next if $next eq $upto;
-	    my $unext= $uptoref->{$next};
-	    next unless defined $unext;
-	    distance_update("${lev}p", $start, $next, $start2upto + $unext);
-	}
-    }
-
-    sub distance_update ($$$$) {
-	my ($lev, $x, $y, $newdist) = @_;
-	distance_update_one("${lev}x",$x,$y,$newdist);
-	distance_update_one("${lev}y",$y,$x,$newdist);
-    }
-
-    sub distance_update_one ($$$$) {
-	my ($lev, $x, $y, $newdist) = @_;
-	my $xref= $allroutes->{$x};
-	my $currently= $xref->{$y};
-	return if defined($currently) and $currently <= $newdist;
-	distance_set_propagate("${lev}o",$x,$y,$newdist);
-    }
-
-    foreach my $xn (keys %$allroutes) {
-	my $routes= $allroutes->{$xn};
-	distance_set_propagate('0', $xn, $xn, 0);
-	foreach my $yn (keys %$routes) {
-	    distance_set_propagate('0', $yn, $yn, 0);
-	    distance_set_propagate('X', $xn, $yn, $routes->{$yn});
-	    distance_set_propagate('Y', $yn, $xn, $routes->{$yn});
-	}
-    }
-    my $ref;
-    while ($ref= shift @propqueue) {
-	distance_propagate_now(@$ref);
-    }
-
-    db_doall(<<END)
- DELETE FROM dists;
+    my $idempotent= $dbh->prepare(<<'END')
+ INSERT OR REPLACE INTO vessels (name, shot, mass, volume)
+                         VALUES (?,?,?,?)
 END
     ;
-    my $sth= $dbh->prepare(<<'END')
- INSERT INTO dists VALUES
-	((SELECT islandid FROM islands WHERE islandname == ?),
-	 (SELECT islandid FROM islands WHERE islandname == ?),
-	 ?);
-END
-    ;
-    foreach my $xn (keys %$allroutes) {
-	my $routes= $allroutes->{$xn};
-	foreach my $yn (keys %$routes) {
-	    $sth->execute($xn, $yn, $routes->{$yn});
-	}
+    foreach my $name (sort keys %vessels) {
+	my $v= $vessels{$name};
+	my $shotdamage= $shotname2damage{$v->{Shot}};
+	die "no shot damage for shot $v->{Shot} for vessel $name"
+	    unless defined $shotdamage;
+	my @qa= ($name, $shotdamage, map { $v->{$_} } qw(Mass Volume));
+	$idempotent->execute(@qa);
     }
-    $dbh->commit();
-
-    # select ia.islandname, ib.islandname,dists.dist from dists, islands as ia on dists.aiid = ia.islandid, islands as ib on dists.biid = ib.islandid order by ia.islandname, ib.islandname;
+    $dbh->commit;
 }
-
-__DATA__