From: Tara L Andrews <tla\@mit.edu>
Date: Wed, 14 Mar 2012 16:41:05 +0000 (+0100)
Subject: reverting accidental file commits
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ef2c9703ba8e4d459fe75520c3bd80bdc778dca7;p=scpubgit%2Fstemmatology.git

reverting accidental file commits
---

diff --git a/lib/Text/Tradition/Analysis.pm b/lib/Text/Tradition/Analysis.pm
index fda5137..8bfaf1a 100644
--- a/lib/Text/Tradition/Analysis.pm
+++ b/lib/Text/Tradition/Analysis.pm
@@ -56,8 +56,6 @@ is 0 (i.e. the first).
 =item * merge_types - Specify a list of relationship types, where related readings 
 should be treated as identical for the purposes of analysis.
 
-=item * exclude_type1 - Exclude those ranks whose groupings have only type-1 variants.
-
 =back
 
 =begin testing
@@ -152,13 +150,7 @@ sub run_analysis {
 	my %lacunae;
 	foreach my $rank ( @ranks ) {
 		my $missing = [ @lacunose ];
-		my $rankgroup = group_variants( $tradition, $rank, $missing, \@collapse );
-		if( $opts{'exclude_type1'} ) {
-			# Check to see whether this is a "useful" group.
-			my( $rdgs, $grps ) = _useful_variant( $rankgroup );
-			next unless @$rdgs;
-		}
-		push( @groups, $rankgroup );
+		push( @groups, group_variants( $tradition, $rank, $missing, \@collapse ) );
 		$lacunae{$rank} = $missing;
 	}
 	$DB::single = 1;
@@ -195,8 +187,8 @@ relationships in @merge_relationship_types as equivalent.  $lacunose should
 be a reference to an array, to which the sigla of lacunose witnesses at this 
 rank will be appended.
 
-Returns a hash $group_readings where $rdg is attested by the witnesses listed 
-in $group_readings->{$rdg}.
+Returns two ordered lists $readings, $groups, where $readings->[$n] is attested
+by the witnesses listed in $groups->[$n].
 
 =cut
 
diff --git a/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm b/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
index cb9990f..1449ad2 100644
--- a/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
+++ b/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
@@ -37,7 +37,7 @@ sub index :Path :Args(1) {
 		$c->stash->{text_title} = $tradition->name;
 		$c->stash->{template} = 'stexaminer.tt'; 
 		# TODO Run the analysis as AJAX from the loaded page.
-		my $t = run_analysis( $tradition, 'exclude_type1' => 1 );
+		my $t = run_analysis( $tradition );
 		# Stringify the reading groups
 		foreach my $loc ( @{$t->{'variants'}} ) {
 			my $mst = wit_stringify( $loc->{'missing'} );
diff --git a/stemmaweb/root/css/relationship.css b/stemmaweb/root/css/relationship.css
index e2e2f25..0d85213 100644
--- a/stemmaweb/root/css/relationship.css
+++ b/stemmaweb/root/css/relationship.css
@@ -74,15 +74,6 @@ span.apimore {
     padding-top: 5px;
     padding-bottom: 5px;    
 }
-#loading_overlay {
-	display: none;
-	position: absolute;
-	height: 500px;
-	width: 89%;
-	z-index: 2;
-	opacity: 0.7;
-	background-color: #c5c5c5;
-}
 #dialog_overlay {
     display: none;
     position: absolute;
diff --git a/stemmaweb/root/js/relationship.js b/stemmaweb/root/js/relationship.js
index 64bd041..414b78c 100644
--- a/stemmaweb/root/js/relationship.js
+++ b/stemmaweb/root/js/relationship.js
@@ -21,8 +21,6 @@ function getRelationshipURL() {
 }
 
 function svgEnlargementLoaded() {
-	//Give some visual evidence that we are working
-	$('#loading_overlay').show();
     //Set viewbox widht and height to widht and height of $('#svgenlargement svg').
     //This is essential to make sure zooming and panning works properly.
     $('#svgenlargement ellipse').attr( {stroke:'green', fill:'#b3f36d'} );
@@ -44,7 +42,6 @@ function svgEnlargementLoaded() {
     //used to calculate min and max zoom level:
     start_element_height = $("#svgenlargement .node title:contains('#START#')").siblings('ellipse')[0].getBBox().height;
     add_relations();
-    // $('#loading_overlay').hide();
 }
 
 function add_relations() {
diff --git a/stemmaweb/root/src/relate.tt b/stemmaweb/root/src/relate.tt
index 07b9b0a..72ea8e1 100644
--- a/stemmaweb/root/src/relate.tt
+++ b/stemmaweb/root/src/relate.tt
@@ -19,7 +19,6 @@ $(function() {
 	</div>
 
 	<div id="enlargement_container">	
-		<div id="loading_overlay"></div>
 		<div id="enlargement">
 	        <div id="svgenlargement" style="height: 500px;"></div>
 		</div>