X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Fyppedia-chart-parser;h=4ce6bcecd36195da8061b9ff2cf93d0e7f983f3d;hp=228d1e2c4fae0f47cd058df5f1cbad73d5378a8c;hb=697b9c2b3e6472107aa6364cd1d4bed04b5cd633;hpb=2059db0d5a99c9759cc25deab053a7213d396c04

diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser
index 228d1e2..4ce6bce 100755
--- a/yarrg/yppedia-chart-parser
+++ b/yarrg/yppedia-chart-parser
@@ -73,17 +73,26 @@ sub print_messages () {
 }
 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;
 
 
@@ -381,11 +390,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};
@@ -399,10 +410,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");
+	}
     }
 }
 
@@ -423,7 +436,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
@@ -480,6 +494,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);
@@ -544,9 +560,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 () {
@@ -708,7 +729,10 @@ progress("computing shortest paths");       yppedia_graph_shortest_paths();
 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();
+}
 
 db_setocean($ocean);
 db_connect();
@@ -738,15 +762,24 @@ for (;;) {
     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= <STDIN>;  defined $result or die $!;
     $result =~ s/\s//g;
     $result= $default?'y':'n' if !length $result;