From: tla <tla@mit.edu>
Date: Tue, 7 Apr 2015 17:09:34 +0000 (+0200)
Subject: fix rank assignment from JSON parsing. Fixes #34
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e3cbd952ed0a042d35dea1e7f55cb577432fa7ba;p=scpubgit%2Fstemmatology.git

fix rank assignment from JSON parsing. Fixes #34
---

diff --git a/base/lib/Text/Tradition/Parser/JSON.pm b/base/lib/Text/Tradition/Parser/JSON.pm
index aca4d3d..a8c01f7 100644
--- a/base/lib/Text/Tradition/Parser/JSON.pm
+++ b/base/lib/Text/Tradition/Parser/JSON.pm
@@ -96,6 +96,16 @@ foreach my $wit ( $t->witnesses ) {
 	is( $graphtext, $origtext, "Collation matches original for witness " . $wit->sigil );
 }
 
+# Check that the ranks are right
+is( $t->collation->end->rank, 19, "Ending node has the correct rank" );
+foreach my $rdg ( $t->collation->readings ) {
+	next if $rdg->is_meta;
+	my $idrank = $rdg->id;
+	$idrank =~ s/^r(\d+)\..*$/$1/;
+	is( $idrank, $rdg->rank, "Reading $rdg has the correct rank" );
+}
+
+
 =end testing
 
 =cut
@@ -161,10 +171,10 @@ sub parse {
             } # else skip it for empty readings.
         }
     }
-    
+
     # Collapse our lacunae into a single node and
     # push the end node onto all paths.
-    $c->end->rank( $length );
+    $c->end->rank( $length+1 );
     foreach my $wit ( @witnesses ) {
         my $p = $wit->path;
         my $last_rdg = shift @$p;
@@ -220,8 +230,8 @@ sub make_nodes {
 			if( exists( $unique{$word} ) ) {
 				$rdg = $unique{$word};
 			} else {
-				my %args = ( 'id' => 'r' . join( '.', $idx, $j+1 ),
-					'rank' => $idx,
+				my %args = ( 'id' => 'r' . join( '.', $idx+1, $j+1 ),
+					'rank' => $idx+1,
 					'text' => $word,
 					'collation' => $c );
 				if( $word eq '#LACUNA#' ) {
diff --git a/base/t/text_tradition_parser_json.t b/base/t/text_tradition_parser_json.t
index ba96aa6..4ceabcf 100644
--- a/base/t/text_tradition_parser_json.t
+++ b/base/t/text_tradition_parser_json.t
@@ -52,6 +52,15 @@ foreach my $wit ( $t->witnesses ) {
 	my $graphtext = $t->collation->path_text( $wit->sigil );
 	is( $graphtext, $origtext, "Collation matches original for witness " . $wit->sigil );
 }
+
+# Check that the ranks are right
+is( $t->collation->end->rank, 19, "Ending node has the correct rank" );
+foreach my $rdg ( $t->collation->readings ) {
+	next if $rdg->is_meta;
+	my $idrank = $rdg->id;
+	$idrank =~ s/^r(\d+)\..*$/$1/;
+	is( $idrank, $rdg->rank, "Reading $rdg has the correct rank" );
+}
 }