X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fyppedia-chart-parser;h=41ef985e6b590801041dfbdcc2635f6d8d15e631;hp=df350a734cc2ffd7ddf47206d1143d368a3726e8;hb=81e8c4f6f7c45ced71617a30e962a4d160e8f4dc;hpb=365471d0477b36ebd31678bbeb8684635ecbadc1 diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser index df350a7..41ef985 100755 --- a/yarrg/yppedia-chart-parser +++ b/yarrg/yppedia-chart-parser @@ -1,6 +1,11 @@ #!/usr/bin/perl - -# Updater for island topology +# +# Normally run from +# update-master-info +# +# usage: ./yppedia-chart-parser +# updates OCEAN-Oceanname.db and _ocean-.txt +# from YPPedia (chart and ocean page) and source-info.txt # This is part of ypp-sc-tools, a set of third-party tools for assisting # players of Yohoho Puzzle Pirates. @@ -24,8 +29,6 @@ # are used without permission. This program is not endorsed or # sponsored by Three Rings. -# usage: ./yppedia-chart-parser OCEAN - use strict (qw(vars)); use warnings; @@ -45,34 +48,55 @@ my %wiccix2arch; my $wialldists; my %wtisland2arch; -my $dbdists= Graph::Undirected->new(); +my $dbdists; my %dbisland2arch; +my @msgkinds= qw(change warning error); my %msgs; -sub pmsg ($$) { push @{ $msgs{$_[0]} }, "$_[0]: $_[1]\n"; } +my %msgprinted; +my %msgkindprinted; +sub pmsg ($$) { + my $m= "$_[0]: $_[1]\n"; + print DEBUG "D $m"; + push @{ $msgs{$_[0]} }, $m; +} sub warning ($) { pmsg("warning",$_[0]); } sub error ($) { pmsg("error", $_[0]); } sub change ($) { pmsg("change", $_[0]); } sub print_messages () { - foreach my $k (qw(change warning error)) { - my $m= $msgs{$k}; - next unless $m; - print sort @$m or die $!; + foreach my $k (@msgkinds) { + my $ms= $msgs{$k}; + next unless $ms; + foreach my $m (sort @$ms) { + next if $msgprinted{$m}; + print $m or die $!; + $msgprinted{$m}++; + $msgkindprinted{$k}++; + } } } sub progress ($) { print "($_[0])\n"; } -if (@ARGV && $ARGV[0] eq '--debug') { - shift @ARGV; - open DEBUG, ">&STDOUT" or die $!; - select(DEBUG); $|=1; -} else { - open DEBUG, ">/dev/null" or die $!; +my $stdin_chart=0; + +open DEBUG, ">/dev/null" or die $!; + +while (@ARGV) { + last unless $ARGV[0] =~ m/^-/; + $_= shift @ARGV; + last if m/^--$/; + if ($_ eq '--debug') { + open DEBUG, ">&STDOUT" or die $!; + select(DEBUG); $|=1; select(STDOUT); + } elsif ($_ eq '--stdin-chart') { + $stdin_chart=1; + } else { + die; + } } -select(STDOUT); $|=1; +$|=1; @ARGV==1 or die; -$ARGV[0] =~ m/^\-/ and die; my $ocean= shift @ARGV; @@ -94,7 +118,7 @@ sub yppedia_chart_parse () { s/\<--.*--\>//g; s/^\s*//; chomp; s/\s+$//; s/\s+/ /g; s/\<\/?(?:b|em)\>//g; - s/\{\{Chart\ style\|[^{}]*\}\}//g; + s/\{\{chart\ style\|[^{}]*\}\}//gi; next unless m/\{\{/; # only interested in chart template stuff my ($x,$y, $arch,$island,$solid,$dirn); @@ -102,9 +126,15 @@ sub yppedia_chart_parse () { if (($x,$y,$arch) = m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .* - \'\[\[ [^][\']* \| (\S+)\ archipelago \]\]\'*\}\}$/xi) { + (?: \<(?: big|center )\>)* \'+ + (?: \[\[ | \{\{ ) + [^][\']* \| ([^][\'|]+)\ archipelago + (?: \]\] | \}\} ) + \'+ (?: \<\/(?: big|center )\>)* \}\}$/xi) { printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch; push @wiarchlabels, [ $x,$y,$arch ]; + } elsif (m/^\{\{ chart\ label \|\d+\|\d+\| + \ \'+ \[\[ .* \b ocean \]\]/xi) { } elsif (($x,$y,$island) = m/^\{\{ chart\ island\ icon \|(\d+)\|(\d+)\| ([^| ][^|]*[^| ]) \| .*\}\}$/xi) { @@ -142,29 +172,6 @@ sub yppedia_chart_parse () { } } -sub database_fetch_ocean () { - my ($row,$sth); - $sth= $dbh->prepare('SELECT islandname, archipelago FROM islands'); - $sth->execute(); - while ($row= $sth->fetchrow_hashref) { - print DEBUG "database-island $row->{'islandname'}". - " $row->{'archipelago'}\n"; - $dbisland2arch{$row->{'islandname'}}= $row->{'archipelago'}; - } - $sth= $dbh->prepare('SELECT dist, a.islandname a, b.islandname b - FROM dists - JOIN islands AS a ON dists.aiid==a.islandid - JOIN islands AS b ON dists.biid==b.islandid'); - $sth->execute(); - while ($row= $sth->fetchrow_hashref) { - $dbdists->add_weighted_edge($row->{'a'}, $row->{'b'}, $row->{'dist'}); - } -} - -sub database_graph_spr () { - $dbspr= shortest_path_reduction('db',$dbdists); -} - sub yppedia_graphs_add_shortcuts () { # We add edges between LPs we know about, as you can chart # between them. Yppedia often lacks these edges. @@ -237,8 +244,7 @@ sub yppedia_archs_chart_labels () { # foreach my $label (@wiarchlabels) { my ($ax,$ay,$arch) = @$label; - my $best_ccmulti= -1; - my $best_d2= 0; + my $best_d2= 9999999; my $best_n; # print DEBUG "$ax,$ay arch-island-search $arch\n"; $ay += 1; $ax += 2; # coords are rather to the top left of label @@ -246,19 +252,16 @@ sub yppedia_archs_chart_labels () { next unless exists $winode2island{$vertex}; my $ccix= $wiarchs->connected_component_by_vertex($vertex); my @cc= $wiarchs->connected_component_by_index($ccix); - my $ccmulti= @cc > 1; my ($vx,$vy) = split /,/, $vertex; my $d2= ($vx-$ax)*($vx-$ax) + ($vy-$ay)*($vy-$ay); - my $cmp= $ccmulti <=> $best_ccmulti - || $best_d2 <=> $d2; + my $cmp= $best_d2 <=> $d2; printf DEBUG "%2d,%-2d arch-island-search %5s d2=%4d cc%-2d". - " #cc=%2d ccmulti=%d cmp=%2d %s\n", - $ax,$ay, $vertex, $d2, $ccix, scalar(@cc), $ccmulti, $cmp, + " #cc=%2d cmp=%2d %s\n", + $ax,$ay, $vertex, $d2, $ccix, scalar(@cc), $cmp, $winode2island{$vertex}; next unless $cmp > 0; $best_n= $vertex; $best_d2= $d2; - $best_ccmulti= $ccmulti; } die 'no island vertices?!' unless defined $best_n; my $ccix= $wiarchs->connected_component_by_vertex($best_n); @@ -393,11 +396,13 @@ sub compare_island_lists () { foreach my $island (sort keys %wiisland2node) { my $wtarch= $wtisland2arch{$island}; my $wiarch= wiisland2arch($island); - if (!defined $wtarch) { - error("island from chart not found on ocean page: $island"); - } elsif (defined $wiarch and $wtarch ne $wiarch) { - error("island in $wtarch on ocean page but". - " concluded $wiarch from chart: $island"); + if (!$stdin_chart) { + if (!defined $wtarch) { + error("island from chart not found on ocean page: $island"); + } elsif (defined $wiarch and $wtarch ne $wiarch) { + error("island in $wtarch on ocean page but". + " concluded $wiarch from chart: $island"); + } } my $dbarch= $dbisland2arch{$island}; @@ -411,10 +416,12 @@ sub compare_island_lists () { change("island new in $wiarch: $island"); } } - foreach my $island (sort keys %wtisland2arch) { - my $node= $wiisland2node{$island}; - next if defined $node; - error("island on ocean page but not in chart: $island"); + if (!$stdin_chart) { + foreach my $island (sort keys %wtisland2arch) { + my $node= $wiisland2node{$island}; + next if defined $node; + error("island on ocean page but not in chart: $island"); + } } } @@ -435,7 +442,8 @@ sub shortest_path_reduction ($$) { 1. F is an undirected weighted graph with positive edge weights. - 2. All graphs we will consider have the same vertices as F. + 2. All graphs we will consider have the same vertices as F + and none have self-edges. 3. G = Closure(F) is the graph of cliques whose edge weights are the shortest paths in F, one clique for each connected @@ -492,6 +500,8 @@ END my $result= Graph::Undirected->new(); foreach my $edge_ac ($g->edges()) { + $result->add_vertex($edge_ac->[0]); # just in case + next if $edge_ac->[0] eq $edge_ac->[1]; my $edgename_ac= join ' .. ', @$edge_ac; printf DEBUG "spr %s edge %s\n", $what, $edgename_ac; my $w_ac= $g->get_edge_weight(@$edge_ac); @@ -556,9 +566,14 @@ sub yppedia_ocean_fetch_done () { } sub yppedia_ocean_fetch_chart () { - yppedia_ocean_fetch_start(1); - yppedia_chart_parse(); - yppedia_ocean_fetch_done(); + if ($stdin_chart) { + open OCEAN, "<& STDIN" or die $!; + yppedia_chart_parse(); + } else { + yppedia_ocean_fetch_start(1); + yppedia_chart_parse(); + yppedia_ocean_fetch_done(); + } } sub yppedia_ocean_fetch_text () { @@ -604,15 +619,112 @@ sub compare_distances () { } } -parse_info_serverside(); +#========== database handling ========== + +sub database_fetch_ocean () { + my ($row,$sth); + $sth= $dbh->prepare('SELECT islandname, archipelago FROM islands'); + $sth->execute(); + undef %dbisland2arch; + $dbdists= Graph::Undirected->new(); + while ($row= $sth->fetchrow_hashref) { + print DEBUG "database-island $row->{'islandname'}". + " $row->{'archipelago'}\n"; + $dbisland2arch{$row->{'islandname'}}= $row->{'archipelago'}; + } + $sth= $dbh->prepare('SELECT dist, a.islandname a, b.islandname b + FROM dists + JOIN islands AS a ON dists.aiid==a.islandid + JOIN islands AS b ON dists.biid==b.islandid'); + $sth->execute(); + while ($row= $sth->fetchrow_hashref) { + $dbdists->add_weighted_edge($row->{'a'}, $row->{'b'}, $row->{'dist'}); + } +} -progress("reading database"); +sub database_graph_spr () { + $dbspr= shortest_path_reduction('db',$dbdists); +} -db_setocean($ocean); -db_connect(); -database_fetch_ocean(); +sub database_do_updates () { + my $addisland= $dbh->prepare(<<'END') + INSERT OR IGNORE INTO islands (islandname, archipelago) VALUES (?, ?); +END + ; + foreach my $island (sort keys %wiisland2node) { + my $wiarch= wiisland2arch($island); + $addisland->execute($island, $wiarch); + } -progress("computing database spr"); database_graph_spr(); + db_doall(<prepare(<<'END') + INSERT INTO dists VALUES + ((SELECT islandid FROM islands WHERE islandname == ?), + (SELECT islandid FROM islands WHERE islandname == ?), + ?); +END + ; + my $addroute= $dbh->prepare(<<'END') + INSERT INTO routes VALUES + ((SELECT islandid FROM islands WHERE islandname == ?), + (SELECT islandid FROM islands WHERE islandname == ?), + ?); +END + ; + foreach my $ia (sort keys %wiisland2node) { + my $na= $wiisland2node{$ia}; + foreach my $ib (sort keys %wiisland2node) { + my $nb= $wiisland2node{$ib}; + my $apdist= $ia eq $ib ? 0 : widist($na,$nb); + die "$ia $ib" unless defined $apdist; + my $sprdist= $wispr->get_edge_weight($ia,$ib); + die "$ia $ib $apdist $sprdist" if + defined($sprdist) && $sprdist != $apdist; + + $adddist->execute($ia,$ib,$apdist); + $addroute->execute($ia,$ib,$sprdist) if defined $sprdist; + } + } + + # select ia.islandname, ib.islandname, d.dist from dists as d, islands as ia on d.aiid = ia.islandid, islands as ib on d.biid = ib.islandid order by ia.islandname, ib.islandname; + +} + +#========== update _ocean-*.txt ========== + +our $localtopo_path; + +sub localtopo_rewrite () { + $localtopo_path= '_ocean-'.(lc $ocean).'.txt'; + my $fh= new IO::File "$localtopo_path.tmp", 'w'; + print $fh "# autogenerated - do not edit\n" or die $!; + print $fh "ocean $ocean\n" or die $!; + my %arches; + foreach my $isle (sort keys %wtisland2arch) { + my $arch= $wtisland2arch{$isle}; + push @{ $arches{$arch} }, $isle; + } + foreach my $arch (sort keys %arches) { + print $fh " $arch\n" or die $!; + foreach my $isle (@{ $arches{$arch} }) { + print $fh " $isle\n" or die $!; + } + } + print $fh "\n" or die $!; + close $fh or die $!; +} + +sub localtopo_commit () { + rename "$localtopo_path.tmp", $localtopo_path or die $!; +} + +#========== main program ========== + +parse_info_serverside(); progress("fetching yppedia chart"); yppedia_ocean_fetch_chart(); progress("adding shortcuts"); yppedia_graphs_add_shortcuts(); @@ -624,9 +736,69 @@ progress("setting archs from labels"); yppedia_archs_chart_labels(); progress("setting archs from nearby"); yppedia_archs_fillbynearest(); progress("computing yppedia spr"); yppedia_graph_spr(); -progress("fetching yppedia ocean text"); yppedia_ocean_fetch_text(); +if (!$stdin_chart) { + progress("fetching yppedia ocean text"); yppedia_ocean_fetch_text(); +} -progress("comparing islands"); compare_island_lists(); -progress("comparing distances"); compare_distances(); +db_setocean($ocean); +db_connect(); +my $iteration=0; +for (;;) { + progress("reading database"); + database_fetch_ocean(); + progress("computing database spr"); database_graph_spr(); + + progress("comparing islands"); compare_island_lists(); + progress("comparing distances"); compare_distances(); + + print "\n"; + print_messages(); + + foreach my $k (@msgkinds) { + my $n= $msgkindprinted{$k}; + next unless $n; + printf STDERR "*** %d%s %ss\n", $n, $iteration?' additional':'', $k; + } + + if ($msgs{'error'}) { + print STDERR "*** errors, aborting update\n"; + exit 1; + } + + if (!%msgkindprinted) { + progress("updating database"); database_do_updates(); + progress("updating _ocean-*.txt"); localtopo_rewrite(); + if ($stdin_chart) { + print STDERR "*** --stdin-chart, aborting!\n"; + exit 1; + } + progress("committing database"); $dbh->commit(); + progress("committing _ocean-*.txt"); localtopo_commit(); + exit 0; + } + $dbh->rollback(); + + my $default= !$msgkindprinted{'warning'}; + printf STDERR "*** confirm update %s ? ", $default?'(y/n)':'(n/y)'; + + if ($stdin_chart) { + printf STDERR "[--stdin-chart]\n"; + exit 1; + } + + $!=0; my $result= ; defined $result or die $!; + $result =~ s/\s//g; + $result= $default?'y':'n' if !length $result; + $result= $result =~ m/^y/i; + + if (!$result) { + printf STDERR "*** updated abandoned at your request\n"; + exit 1; + } + + print "\n"; + undef %msgkindprinted; + $iteration++; +} print_messages();