X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=stemmaweb%2Flib%2Fstemmaweb%2FController%2FStexaminer.pm;h=e7eee1b32772930597900eeecf576bae99672052;hb=e217c221e9686dd0a819bdd72afa4861dfb99236;hp=1449ad209eed3528c4e3fafe98ea182144db3188;hpb=a44aaf2a3c6e12fd2329a85718f2fc1fa077f9a4;p=scpubgit%2Fstemmatology.git

diff --git a/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm b/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
index 1449ad2..e7eee1b 100644
--- a/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
+++ b/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
@@ -1,9 +1,12 @@
 package stemmaweb::Controller::Stexaminer;
 use Moose;
 use namespace::autoclean;
+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' }
 
@@ -18,12 +21,12 @@ The stemma analysis tool with the pretty colored table.
 
 =head1 METHODS
 
+=head2 index
+
  GET stexaminer/$textid
  
 Renders the application for the text identified by $textid.
 
-=head2 index
-
 =cut
 
 sub index :Path :Args(1) {
@@ -32,12 +35,29 @@ sub index :Path :Args(1) {
 	my $tradition = $m->tradition( $textid );
 	if( $tradition->stemma_count ) {
 		my $stemma = $tradition->stemma(0);
-		# TODO Think about caching the stemma in a session 
-		$c->stash->{svg} = $stemma->as_svg;
+		$c->stash->{svg} = $stemma->as_svg( { size => [ 600, 350 ] } );
+		$c->stash->{graphdot} = $stemma->editable({ linesep => ' ' });
 		$c->stash->{text_title} = $tradition->name;
 		$c->stash->{template} = 'stexaminer.tt'; 
+		
+		# Get the analysis options
+		my( $use_type1, $ignore_sort ) = ( 0, 'none' );
+		if( $c->req->method eq 'POST' ) {
+			$use_type1 = $c->req->param( 'show_type1' ) eq 'on' ? 1 : 0;
+			$ignore_sort = $c->req->param( 'ignore_variant' );
+		}
+		$c->stash->{'show_type1'} = $use_type1;
+		$c->stash->{'ignore_variant'} = $ignore_sort;
 		# TODO Run the analysis as AJAX from the loaded page.
-		my $t = run_analysis( $tradition );
+		my %analysis_options;
+		$analysis_options{'exclude_type1'} = !$use_type1;
+		if( $ignore_sort eq 'spelling' ) {
+			$analysis_options{'collapse'} = [ qw/ spelling orthographic / ];
+		} elsif( $ignore_sort eq 'orthographic' ) {
+			$analysis_options{'collapse'} = 'orthographic';
+		}
+			
+		my $t = run_analysis( $tradition, %analysis_options );
 		# Stringify the reading groups
 		foreach my $loc ( @{$t->{'variants'}} ) {
 			my $mst = wit_stringify( $loc->{'missing'} );
@@ -45,18 +65,54 @@ sub index :Path :Args(1) {
 			foreach my $rhash ( @{$loc->{'readings'}} ) {
 				my $gst = wit_stringify( $rhash->{'group'} );
 				$rhash->{'group'} = $gst;
+				my $roots = join( ', ', @{$rhash->{'independent_occurrence'}} );
+				$rhash->{'independent_occurrence'} = $roots;
+				unless( $rhash->{'text'} ) {
+					$rhash->{'text'} = $rhash->{'readingid'};
+				}
 			}
 		}
+		# Values for TT rendering
 		$c->stash->{variants} = $t->{'variants'};
 		$c->stash->{total} = $t->{'variant_count'};
 		$c->stash->{genealogical} = $t->{'genealogical_count'};
-		$c->stash->{conflict} = $t->{'conflict_count'};
+		$c->stash->{conflict} = $t->{'conflict_count'};		
+		# Also make a JSON stash of the data for the statistics tables
+		$c->stash->{reading_statistics} = to_json( $t->{'variants'} );
 	} else {
 		$c->stash->{error} = 'Tradition ' . $tradition->name 
 			. 'has no stemma for analysis.';
 	}
 }
 
+=head2 graphsvg
+
+  POST stexaminer/graphsvg
+  	dot: <stemmagraph dot string> 
+  	layerwits: [ <a.c. witnesses ] 
+  
+Returns an SVG string of the given graph, extended to include the given 
+layered witnesses.
+
+=cut
+
+sub graphsvg :Local {
+	my( $self, $c ) = @_;
+	my $dot = $c->request->param('dot');
+	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 $svgopts = { size => [ 600, 350 ] };
+	if( @layerwits ) {
+		$svgopts->{'layerwits'} = \@layerwits;
+	}
+	$c->stash->{'result'} = $tempstemma->as_svg( $svgopts );
+	$c->forward('View::SVG');
+}
+
 =head2 end
 
 Attempt to render a view, if needed.