X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FText%2FTradition%2FAnalysis.pm;h=c74b96d99f8b65fe7ce083b1bafb19d44884e049;hb=9c52877edc72b6e277432b2c5bed47569a626b79;hp=7d1c7aa63e5775eabd8dd80b8340566afbbaaacd;hpb=f978c1b93616afa8b7de522c4b527336cc5d1358;p=scpubgit%2Fstemmatology.git

diff --git a/lib/Text/Tradition/Analysis.pm b/lib/Text/Tradition/Analysis.pm
index 7d1c7aa..c74b96d 100644
--- a/lib/Text/Tradition/Analysis.pm
+++ b/lib/Text/Tradition/Analysis.pm
@@ -104,12 +104,14 @@ sub run_analysis {
 		# For all the groups with more than one member, collect the list of all
 		# contiguous vertices needed to connect them.
 		# TODO: deal with a.c. reading logic
-		my $sc = analyze_variant_location( $group_readings, $groups, $stemma->apsp );
-		$variant_row->{'genealogical'} = keys %$sc ? 1 : undef;
+		my $conflict = analyze_variant_location( 
+		    $group_readings, $groups, $stemma->apsp );
+		$variant_row->{'genealogical'} = keys %$conflict ? undef : 1;
 		foreach my $grp ( sort keys %$group_readings ) {
 			my $rdg = $group_readings->{$grp};
+			my $in_conflict = exists $conflict->{$grp};
 			push( @{$variant_row->{'readings'}}, 
-			      { 'text' => $rdg, 'group' => $grp,
+			      { 'text' => $rdg, 'group' => $grp, 'conflict' => $in_conflict,
 			        'missing' => wit_stringify( $lacunose ) } );
 		}