make relationships work, add some hacks for Boodts collation

[scpubgit/stemmatology.git] / lib / Text / Tradition / Witness.pm

diff --git a/lib/Text/Tradition/Witness.pm b/lib/Text/Tradition/Witness.pm
index 2d1996a..656c185 100644 (file)
--- a/lib/Text/Tradition/Witness.pm
+++ b/lib/Text/Tradition/Witness.pm
@@ -2,19 +2,6 @@ package Text::Tradition::Witness;
 use Moose;
 use Moose::Util::TypeConstraints;
 
-subtype 'Correction',
-    => as 'ArrayRef',
-    => where { return 0 unless @$_ == 3;
-              return 0 unless $_->[0] =~ /^\d+$/;
-              return 0 unless $_->[1] =~ /^\d+$/;
-              foreach my $x ( @{$_->[2]} ) {
-                  return $0 unless $x->isa( 'Text::Tradition::Collation::Reading' );
-              }
-              return 1;
-          },
-    => message { "Correction must be ref of [ offset, length, replacement_list ]" };
-
-               
 # Sigil. Required identifier for a witness.
 has 'sigil' => (
     is => 'ro',
@@ -47,12 +34,10 @@ has 'path' => (
     predicate => 'has_path',
     );        
 
-# Uncorrection.  This is an array of sets of reading nodes that show
-# where the witness was corrected.
-has 'uncorrected' => (
+has 'uncorrected_path' => (
     is => 'rw',
-    isa => 'ArrayRef[Correction]',
-    predicate => 'has_uncorrected',
+    isa => 'ArrayRef[Text::Tradition::Collation::Reading]',
+    predicate => 'has_ante_corr',
     );
     
 
@@ -87,15 +72,5 @@ around text => sub {
     $self->$orig( @_ );
 };
 
-sub uncorrected_path {
-    my $self = shift;
-    my @path;
-    push( @path, @{$self->path} );
-    foreach my $corr ( @{$self->uncorrected} ) {
-       splice( @path, $corr->[0], $corr->[1], @{$corr->[2]} );
-    }
-    return \@path;
-}      
-
 no Moose;
 __PACKAGE__->meta->make_immutable;