From: Tara L Andrews <tla\@mit.edu>
Date: Mon, 16 Jan 2012 15:05:03 +0000 (+0100)
Subject: make lacuna nodes lacunae from the beginning
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9f213786702444faa51200e495d496cdb87d4154;p=scpubgit%2Fstemmatology.git

make lacuna nodes lacunae from the beginning
---

diff --git a/lib/Text/Tradition/Parser/Tabular.pm b/lib/Text/Tradition/Parser/Tabular.pm
index 22e3aea..46fcbea 100644
--- a/lib/Text/Tradition/Parser/Tabular.pm
+++ b/lib/Text/Tradition/Parser/Tabular.pm
@@ -146,28 +146,13 @@ sub parse {
         my $last_rdg = shift @$p;
         my $new_p = [ $last_rdg ];
         foreach my $rdg ( @$p ) {
-            if( $rdg->text eq '#LACUNA#' ) {
+            if( $rdg->is_lacuna && $last_rdg->is_lacuna ) {
                 # If we are in a lacuna already, drop this node.
-                # Otherwise make a lacuna node and drop this node.
-                unless( $last_rdg->is_lacuna ) {
-                	my $l_id = 'l' . $rdg->id;
-                	my $l;
-                	if( $c->has_reading( $l_id ) ) {
-                		$l = $c->reading( $l_id );
-                	} else {
-                    	$l = $c->add_reading( {
-							'id' => $l_id,
-							'is_lacuna' => 1,
-							'rank' => $rdg->rank,
-							} );
-					}
-                    push( @$new_p, $l );
-                    $last_rdg = $l;
-                }
-                $c->del_reading( $rdg );
+				$c->del_reading( $rdg );
             } else {
-                # No lacuna, save the reading.
+                # Save the reading, lacuna or no.
                 push( @$new_p, $rdg );
+                $last_rdg = $rdg;
             }
         }
         push( @$new_p, $c->end );
@@ -201,6 +186,7 @@ sub make_nodes {
     		'rank' => $index,
     		'text' => $w,
     		};
+    	$rargs->{'is_lacuna'} = 1 if $w eq '#LACUNA#';
         my $r = $collation->add_reading( $rargs );
         $unique{$w} = $r;
         $ctr++;