let stexaminer run without IDP server reachable

diff --git a/lib/Text/Tradition/Analysis.pm b/lib/Text/Tradition/Analysis.pm
index b105b32..d9612d7 100644 (file)
--- a/lib/Text/Tradition/Analysis.pm
+++ b/lib/Text/Tradition/Analysis.pm
@@ -206,7 +206,20 @@ sub run_analysis {
                $lacunae{$rank} = $missing;
        }
        # Run the solver
-       my $answer = solve_variants( $dir, @groups );
+       my $answer;
+       try {
+               $answer = solve_variants( $dir, @groups );
+       } catch ( Text::Tradition::Error $e ) {
+               if( $e->message =~ /IDP/ ) {
+                       # Something is wrong with the solver; make the variants table anyway
+                       $answer->{'variants'} = [];
+                       map { push( @{$answer->{'variants'}}, _init_unsolved( $_, 'IDP error' ) ) }
+                               @groups;
+               } else {
+                       # Something else is wrong; error out.
+                       $e->throw;
+               }
+       }
 
        # Do further analysis on the answer
        my $conflict_count = 0;
@@ -568,19 +581,15 @@ sub solve_variants {
                        || $graphproblem->{'object'};
                
                # Initialize the result structure for this graph problem
-               my $vstruct = { readings => [] };
-               push( @$variants, $vstruct );
-               
-               # 0. Do we have a calculated result at all?
-               unless( $result->status eq 'OK' ) {
-                       $vstruct->{'unsolved'} = $result->status;
-                       foreach my $rid ( keys %{$graphproblem->{grouping}} ) {
-                               push( @{$vstruct->{readings}}, { readingid => $rid, 
-                                       group => [ $graphproblem->{grouping}->{$rid}->members ] } );
-                       }
+               my $vstruct;
+               if( $result->status eq 'OK' ) {
+                       $vstruct = { readings => [] };
+                       push( @$variants, $vstruct );
+               } else {
+                       push( @$variants, _init_unsolved( $graphproblem, $result->status ) );
                        next;
                }
-               
+                               
                # 1. Did the group evaluate as genealogical?
                $vstruct->{genealogical} = $result->is_genealogical;
                $genealogical++ if $result->is_genealogical;
@@ -604,6 +613,17 @@ sub solve_variants {
                         'genealogical_count' => $genealogical };
 }
 
+sub _init_unsolved {
+       my( $graphproblem, $status ) = @_;
+       my $vstruct = { 'readings' => [] };
+       $vstruct->{'unsolved'} = $status;
+       foreach my $rid ( keys %{$graphproblem->{grouping}} ) {
+               push( @{$vstruct->{readings}}, { readingid => $rid, 
+                       group => [ $graphproblem->{grouping}->{$rid}->members ] } );
+       }
+       return $vstruct;
+}
+
 =head2 analyze_location ( $tradition, $graph, $location_hash )
 
 Given the tradition, its stemma graph, and the solution from the graph solver,

diff --git a/stemmaweb/root/js/stexaminer.js b/stemmaweb/root/js/stexaminer.js
index d64a3b6..fd7eade 100644 (file)
--- a/stemmaweb/root/js/stexaminer.js
+++ b/stemmaweb/root/js/stexaminer.js
@@ -63,8 +63,14 @@ function show_stats( rs ) {
        var rshtml = $('#stats_template').clone();
        rshtml.find('#statrank').append( rs.id );
        if( "unsolved" in rs ) {
-               rshtml.find('.solutionstatus').append(
-                       "(Not yet calculated for this location - please try later)");
+               var nocalcmsg;
+               if( rs.unsolved == 'IDP error' ) {
+                       nocalcmsg = $('<span>').attr('class', 'error').append(
+                               "(Could not reach calculation server - are you offline?)" );
+               } else {
+                       nocalcmsg = "(Not yet calculated for this location - please try later)";
+               }
+               rshtml.find('.solutionstatus').append( nocalcmsg );
        } else {
                $.each( rs.readings, function( idx, rdghash ) {
                        var rdgstats = $('#reading_template').clone();