small fix to compress_readings

[scpubgit/stemmatology.git] / lib / Text / Tradition / Collation / Reading.pm

diff --git a/lib/Text/Tradition/Collation/Reading.pm b/lib/Text/Tradition/Collation/Reading.pm
index 108548b..f445420 100644 (file)
--- a/lib/Text/Tradition/Collation/Reading.pm
+++ b/lib/Text/Tradition/Collation/Reading.pm
@@ -159,7 +159,8 @@ has 'is_nonsense' => (
 has 'normal_form' => (
        is => 'rw',
        isa => 'Str',
-       predicate => 'has_normal_form',
+       predicate => '_has_normal_form',
+       clearer => '_clear_normal_form',
        );
 
 # Holds the lexemes for the reading.
@@ -182,12 +183,14 @@ has 'join_prior' => (
        is => 'ro',
        isa => 'Bool',
        default => undef,
+       writer => '_set_join_prior',
        );
        
 has 'join_next' => (
        is => 'ro',
        isa => 'Bool',
        default => undef,
+       writer => '_set_join_next',
        );
 
 
@@ -203,16 +206,16 @@ around BUILDARGS => sub {
                        
        # If one of our special booleans is set, we change the text and the
        # ID to match.
-       if( exists $args->{'is_lacuna'} && !exists $args->{'text'} ) {
+       if( exists $args->{'is_lacuna'} && $args->{'is_lacuna'} && !exists $args->{'text'} ) {
                $args->{'text'} = '#LACUNA#';
-       } elsif( exists $args->{'is_start'} ) {
+       } elsif( exists $args->{'is_start'} && $args->{'is_start'} ) {
                $args->{'id'} = '__START__';  # Change the ID to ensure we have only one
                $args->{'text'} = '#START#';
                $args->{'rank'} = 0;
-       } elsif( exists $args->{'is_end'} ) {
+       } elsif( exists $args->{'is_end'} && $args->{'is_end'} ) {
                $args->{'id'} = '__END__';      # Change the ID to ensure we have only one
                $args->{'text'} = '#END#';
-       } elsif( exists $args->{'is_ph'} ) {
+       } elsif( exists $args->{'is_ph'} && $args->{'is_ph'} ) {
                $args->{'text'} = $args->{'id'};
        }
        
@@ -236,6 +239,21 @@ sub BUILD {
        }
 }
 
+# Make normal_form default to text, transparently.
+around 'normal_form' => sub {
+       my $orig = shift;
+       my $self = shift;
+       my( $arg ) = @_;
+       if( $arg && $arg eq $self->text ) {
+               $self->_clear_normal_form;
+               return $arg;
+       } elsif( !$arg && !$self->_has_normal_form ) {
+               return $self->text;
+       } else {
+               $self->$orig( @_ );
+       }
+};
+
 =head2 is_meta
 
 A meta attribute (ha ha), which should be true if any of our 'special'
@@ -249,17 +267,6 @@ sub is_meta {
        return $self->is_start || $self->is_end || $self->is_lacuna || $self->is_ph;    
 }
 
-=head2 is_nonrel
-
-Similar to is_meta, but returns false for the start and end readings.
-
-=cut
-
-sub is_nonrel {
-       my $self = shift;
-       return $self->is_lacuna || $self->is_ph;
-}
-
 =head1 Convenience methods
 
 =head2 related_readings
@@ -400,6 +407,12 @@ sub _deserialize_lexemes {
        $self->add_lexeme( @lexemes );
 }
 
+sub disambiguated {
+       my $self = shift;
+       return 0 unless $self->has_lexemes;
+       return !grep { !$_->is_disambiguated } $self->lexemes;
+}
+
 ## Utility methods
 
 sub TO_JSON {