changed interface for Tradition init

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

diff --git a/lib/Text/Tradition/Witness.pm b/lib/Text/Tradition/Witness.pm
index 2d1996a..161cfa4 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,22 @@ 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',
+    );
+
+# Manuscript name or similar
+has 'identifier' => (
+    is => 'ro',
+    isa => 'Str',
+    );
+
+# Any other info we have
+has 'other_info' => (
+    is => 'ro',
+    isa => 'Str',
     );
     
 
@@ -60,16 +57,19 @@ sub BUILD {
     my $self = shift;
     if( $self->has_source ) {
        # Read the file and initialize the text.
-       open( WITNESS, $self->source ) or die "Could not open " 
-           . $self->file . "for reading";
-       # TODO support TEI as well as plaintext, sometime
-       my @words;
-       while(<WITNESS>) {
-           chomp;
-           push( @words, split( /\s+/, $_ ) );
-       }
-       close WITNESS;
-       $self->text( \@words );
+       my $rc;
+       eval { no warnings; $rc = open( WITNESS, $self->source ); };
+       # If we didn't open a file, assume it is a string.
+       if( $rc ) {
+           my @words;
+           while(<WITNESS>) {
+               chomp;
+               push( @words, split( /\s+/, $_ ) );
+           }
+           close WITNESS;
+           $self->text( \@words );
+       } # else the text is in the source string, probably
+         # XML, and we are doing nothing with it.
     }
 }
 
@@ -87,15 +87,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;