From: Tara L Andrews <tla@mit.edu>
Date: Mon, 10 Sep 2012 19:51:00 +0000 (+0200)
Subject: prevent Tradition from association collation with stemma
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b54c3a5875b344454bb3e3bc667aa027acd32ff4;p=scpubgit%2Fstemmatology.git

prevent Tradition from association collation with stemma
---

diff --git a/lib/Text/Tradition.pm b/lib/Text/Tradition.pm
index ca0c5a4..41e14cc 100644
--- a/lib/Text/Tradition.pm
+++ b/lib/Text/Tradition.pm
@@ -375,7 +375,6 @@ sub add_stemma {
 	# Assume utf-8
 	binmode $stemma_fh, ':utf8';
 	my $stemma = Text::Tradition::Stemma->new( 
-		'collation' => $self->collation,
 		'dot' => $stemma_fh );
 	$self->_add_stemma( $stemma ) if $stemma;
 	return $stemma;
diff --git a/script/group_vars.pl b/script/group_vars.pl
index 229ff79..2fde503 100644
--- a/script/group_vars.pl
+++ b/script/group_vars.pl
@@ -20,10 +20,7 @@ my %args = ( 'input' => $informat,
 my $tradition = Text::Tradition->new( %args );
 
 # Parse the stemma data
-my $stemma = Text::Tradition::Stemma->new(
-	'collation' => $tradition->collation,
-	'dot' => $ARGV[1],
-	);
+my $stemma = Text::Tradition::Stemma->new( 'dot' => $ARGV[1] );
 
 my $wits = {};
 map { $wits->{$_} = 1 } $stemma->witnesses;
diff --git a/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm b/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
index 37c2dea..264cef1 100644
--- a/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
+++ b/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
@@ -5,7 +5,6 @@ use Encode qw/ decode_utf8 /;
 use File::Temp;
 use JSON;
 use Text::Tradition::Analysis qw/ run_analysis wit_stringify /;
-use Text::Tradition::Collation;
 use Text::Tradition::Stemma;
 
 BEGIN { extends 'Catalyst::Controller' }
@@ -132,9 +131,7 @@ sub graphsvg :Local {
 	my @layerwits = $c->request->param('layerwits[]');
 	open my $stemma_fh, '<', \$dot;
 	binmode( $stemma_fh, ':encoding(UTF-8)' );
-	my $emptycoll = Text::Tradition::Collation->new();
-	my $tempstemma = Text::Tradition::Stemma->new( 
-		collation => $emptycoll, 'dot' => $stemma_fh );
+	my $tempstemma = Text::Tradition::Stemma->new( 'dot' => $stemma_fh );
 	my $svgopts = { size => [ 600, 350 ] };
 	if( @layerwits ) {
 		$svgopts->{'layerwits'} = \@layerwits;