From: Tara L Andrews <tla@mit.edu>
Date: Tue, 17 Apr 2012 11:24:03 +0000 (+0200)
Subject: Merge branch 'master' of github.com:tla/stemmatology
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e59564b451e9129e324b720caa1339bffb739187;p=scpubgit%2Fstemmatology.git

Merge branch 'master' of github.com:tla/stemmatology

Conflicts:
	lib/Text/Tradition/Parser/CTE.pm
---

e59564b451e9129e324b720caa1339bffb739187
diff --cc lib/Text/Tradition/Parser/CTE.pm
index af989c7,fe6ed69..49bcfe2
--- a/lib/Text/Tradition/Parser/CTE.pm
+++ b/lib/Text/Tradition/Parser/CTE.pm
@@@ -48,13 -58,12 +48,13 @@@ sub parse 
  	foreach my $wit_el ( $xpc->findnodes( '//sourceDesc/listWit/witness' ) ) {
  		# The witness xml:id is used internally, and is *not* the sigil name.
  		my $id= $wit_el->getAttribute( 'xml:id' );
 -		my @sig_parts = $xpc->findnodes( './abbr/descendant::text()', $wit_el );
 +		my @sig_parts = $xpc->findnodes( 'descendant::text()', $wit_el );
  		my $sig = _stringify_sigil( @sig_parts );
 +		print STDERR "Adding witness $sig\n";
- 		$tradition->add_witness( sigil => $sig, source => $wit_el->toString() );
+ 		$tradition->add_witness( sigil => $sig, sourcetype => 'collation' );
  		$sigil_for{'#'.$id} = $sig;  # Make life easy by keying on the ID ref syntax
  	}
 -
 +	
  	# Now go through the text and find the base tokens, apparatus tags, and
  	# anchors.  Make a giant array of all of these things in sequence.
  	# TODO consider combining this with creation of graph below