incorporate user auth functionality

[scpubgit/stemmatology.git] / lib / Text / Tradition / Parser / Tabular.pm

diff --git a/lib/Text/Tradition/Parser/Tabular.pm b/lib/Text/Tradition/Parser/Tabular.pm
index 8783ff1..0048f87 100644 (file)
--- a/lib/Text/Tradition/Parser/Tabular.pm
+++ b/lib/Text/Tradition/Parser/Tabular.pm
@@ -108,6 +108,9 @@ foreach my $k ( keys %seen_wits ) {
        }
 }      
 
+# Check that we only have collation relationships where we need them
+is( scalar $t->collation->relationships, 3, "Redundant collations were removed" );
+
 =end testing
 
 =cut
@@ -248,6 +251,8 @@ sub parse {
        
        # Note that our ranks and common readings are set.
        $c->_graphcalc_done(1);
+       # Remove redundant collation relationships.
+       $c->relations->filter_collations();
 }
 
 sub _make_nodes {
@@ -261,7 +266,7 @@ sub _make_nodes {
     my $ctr = 1;
     foreach my $w ( keys %unique ) {
        my $rargs = {
-               'id' => "$index,$ctr",
+               'id' => "r$index.$ctr",
                'rank' => $index,
                'text' => $w,
                };
@@ -281,6 +286,7 @@ sub _make_nodes {
        my $r = shift @rankrdgs;
        next if $r->is_meta;
        foreach my $nr ( @rankrdgs ) {
+               next if $nr->is_meta;
                if( $collation_rel ) {
                        $collation->add_relationship( $r, $nr, $collation_rel );
                } else {