X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=stemmaweb%2Flib%2Fstemmaweb%2FController%2FStexaminer.pm;h=37c2dea655db05f3cee749ad88725edff729d819;hb=5d9fd8da27f68c0b403533cbd81f5ab141c13f12;hp=d2aa2617d787fca0938760827f2a735a83ec81b0;hpb=f8d13166a3dca3726a5ccf07ed7d701ff93d28c3;p=scpubgit%2Fstemmatology.git

diff --git a/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm b/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
index d2aa261..37c2dea 100644
--- a/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
+++ b/stemmaweb/lib/stemmaweb/Controller/Stexaminer.pm
@@ -23,24 +23,45 @@ The stemma analysis tool with the pretty colored table.
 
 =head2 index
 
- GET stexaminer/$textid
+ GET stexaminer/$textid/$stemmaid
  
-Renders the application for the text identified by $textid.
+Renders the application for the text identified by $textid, using the stemma
+graph identified by $stemmaid.
 
 =cut
 
-sub index :Path :Args(1) {
-    my( $self, $c, $textid ) = @_;
+sub index :Path :Args(2) {
+    my( $self, $c, $textid, $stemid ) = @_;
     my $m = $c->model('Directory');
 	my $tradition = $m->tradition( $textid );
+	my $ok = _check_permission( $c, $tradition );
+	return unless $ok;
 	if( $tradition->stemma_count ) {
-		my $stemma = $tradition->stemma(0);
+		my $stemma = $tradition->stemma( $stemid );
 		$c->stash->{svg} = $stemma->as_svg( { size => [ 600, 350 ] } );
 		$c->stash->{graphdot} = $stemma->editable({ linesep => ' ' });
+		$c->stash->{text_id} = $textid;
 		$c->stash->{text_title} = $tradition->name;
 		$c->stash->{template} = 'stexaminer.tt'; 
+		
+		# Get the analysis options
+		my( $use_type1, $ignore_sort ) = ( 0, 'none' );
+		$use_type1 = $c->req->param( 'show_type1' ) ? 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, 'exclude_type1' => 1 );
+		my %analysis_options = ( 
+			stemma_id => $stemid,
+			exclude_type1 => !$use_type1 );
+		if( $ignore_sort eq 'spelling' ) {
+			$analysis_options{'merge_types'} = [ qw/ spelling orthographic / ];
+		} elsif( $ignore_sort eq 'orthographic' ) {
+			$analysis_options{'merge_types'} = 'orthographic';
+		}
+
+		# Do the deed
+		my $t = run_analysis( $tradition, %analysis_options );
 		# Stringify the reading groups
 		foreach my $loc ( @{$t->{'variants'}} ) {
 			my $mst = wit_stringify( $loc->{'missing'} );
@@ -48,6 +69,11 @@ sub index :Path :Args(1) {
 			foreach my $rhash ( @{$loc->{'readings'}} ) {
 				my $gst = wit_stringify( $rhash->{'group'} );
 				$rhash->{'group'} = $gst;
+				_stringify_element( $rhash, 'independent_occurrence' );
+				_stringify_element( $rhash, 'reversions' );
+				unless( $rhash->{'text'} ) {
+					$rhash->{'text'} = $rhash->{'readingid'};
+				}
 			}
 		}
 		# Values for TT rendering
@@ -63,6 +89,32 @@ sub index :Path :Args(1) {
 	}
 }
 
+sub _stringify_element {
+	my( $hash, $key ) = @_;
+	return undef unless exists $hash->{$key};
+	if( ref( $hash->{$key} ) eq 'ARRAY' ) {
+		my $str = join( ', ', @{$hash->{$key}} );
+		$hash->{$key} = $str;
+	}
+}
+
+sub _check_permission {
+	my( $c, $tradition ) = @_;
+    my $user = $c->user_exists ? $c->user->get_object : undef;
+    if( $user ) {
+    	return 'full' if ( $user->is_admin || 
+    		( $tradition->has_user && $tradition->user->id eq $user->id ) );
+    }
+	# Text doesn't belong to us, so maybe it's public?
+	return 'readonly' if $tradition->public;
+
+	# ...nope. Forbidden!
+	$c->response->status( 403 );
+	$c->response->body( 'You do not have permission to view this tradition' );
+	$c->forward('View::Plain');
+	return 0;
+}
+
 =head2 graphsvg
 
   POST stexaminer/graphsvg