get rid of intermediate local analysis DB

[scpubgit/stemmaweb.git] / lib / stemmaweb / Controller / Stexaminer.pm

diff --git a/lib/stemmaweb/Controller/Stexaminer.pm b/lib/stemmaweb/Controller/Stexaminer.pm
index e556e32..16c515f 100644 (file)
--- a/lib/stemmaweb/Controller/Stexaminer.pm
+++ b/lib/stemmaweb/Controller/Stexaminer.pm
@@ -39,8 +39,23 @@ sub index :Path :Args(1) {
                $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' );
+               $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 = ( 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,8 +63,8 @@ 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;
+                               _stringify_element( $rhash, 'independent_occurrence' );
+                               _stringify_element( $rhash, 'reversions' );
                                unless( $rhash->{'text'} ) {
                                        $rhash->{'text'} = $rhash->{'readingid'};
                                }
@@ -68,6 +83,15 @@ 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;
+       }
+}
+
 =head2 graphsvg
 
   POST stexaminer/graphsvg