wip

diff --git a/parse-input-graph b/parse-input-graph
index 36314ffaf5f1f620bddd2ebe50fc3a1dc38c3a29..28178fbd118cfded5ad5e1225dd741397feb3835 100755 (executable)
--- a/parse-input-graph
+++ b/parse-input-graph
@@ -2,6 +2,7 @@
 
 use strict;
 use Carp;
+use Data::Dumper;
 
 our %region;
 # $region{NAME}{Colour}
@@ -22,15 +23,15 @@ sub read_in () {
       $ccolour = $&;
       next;
     }
-    if (my ($name, $water) = m{^\t+(\S.*\S)(?: \[(\d+)\])$}) {
+    if (my ($name, $water) = m{^\t(\S.*\S)(?: \[(\d+)\])?$}) {
       confess unless defined $ccolour;
-      confess if $region{$name};
+      confess "$name ?" if $region{$name};
       $region{$name}{Colour} = $ccolour;
       $region{$name}{Water} = $water;
       $cregion = $name;
       next;
     }
-    if (my ($aref, $adykes) = m{^\t\t(\S.*\S)(?: (\+\+?))$}) {
+    if (my ($aref, $adykes) = m{^\t\t(\S.*\S)(?: (\+\+?))?$}) {
       my $adj = { Dykes => length $adykes };
       if ($aref =~ m{\.}) {
        $aref =~ s{\-}{[^- ]*-};