simplify Directory and add exceptions;

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

diff --git a/lib/Text/Tradition/Parser/TEI.pm b/lib/Text/Tradition/Parser/TEI.pm
index 9b9088e..3131774 100644 (file)
--- a/lib/Text/Tradition/Parser/TEI.pm
+++ b/lib/Text/Tradition/Parser/TEI.pm
@@ -62,8 +62,8 @@ my $t = Text::Tradition->new(
 
 is( ref( $t ), 'Text::Tradition', "Parsed parallel-segmentation TEI" );
 if( $t ) {
-    is( scalar $t->collation->readings, 319, "Collation has all readings" );
-    is( scalar $t->collation->paths, 374, "Collation has all paths" );
+    is( scalar $t->collation->readings, 311, "Collation has all readings" );
+    is( scalar $t->collation->paths, 361, "Collation has all paths" );
 }
 
 =end testing
@@ -168,16 +168,15 @@ sub parse {
                 my @new = map { _return_rdg( $_ ) } @{$app_ac->{$sig}->{$app}};
                 _replace_sequence( \@uncorrected, $start, $end, @new );
             }
-            my $source = $c->start;
+            my $source = shift @uncorrected; # the start node
+            warn "Something weird!" unless $source eq $c->start;
             foreach my $rdg ( @uncorrected ) {
-                my $has_base = grep { $_ eq $sig } $c->reading_witnesses( $rdg );
-                if( $rdg ne $c->start && !$has_base ) {
-                    # print STDERR sprintf( "Adding path %s from %s -> %s\n",
-                    #     $sig.$c->ac_label, $source->id, $rdg->id );
-                    $c->add_path( $source, $rdg, $sig.$c->ac_label );
-                }
-                $source = $rdg;
+               unless( $c->has_path( $source, $rdg, $sig ) ) {
+                       $c->add_path( $source, $rdg, $sig.$c->ac_label );
+               }
+               $source = $rdg;
             }
+            warn "Something else weird!" unless $source eq $c->end;
             # print STDERR "Adding a.c. version for witness $sig\n";
             $tradition->witness( $sig )->is_layered( 1 );
         }
@@ -189,6 +188,10 @@ sub parse {
     # Now that we have ranks, see if we have distinct nodes with identical
     # text and identical rank that can be merged.
     $tradition->collation->flatten_ranks();
+    
+    # Save the text for each witness so that we can ensure consistency
+    # later on
+       $tradition->collation->text_from_paths();       
 }
 
 sub _clean_sequence {