CollateX format for GraphML output changed; parser update

diff --git a/lib/stemmaweb/Controller/Stexaminer.pm b/lib/stemmaweb/Controller/Stexaminer.pm
index 1449ad2..cb9990f 100644 (file)
--- a/lib/stemmaweb/Controller/Stexaminer.pm
+++ b/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 );
+               my $t = run_analysis( $tradition, 'exclude_type1' => 1 );
                # Stringify the reading groups
                foreach my $loc ( @{$t->{'variants'}} ) {
                        my $mst = wit_stringify( $loc->{'missing'} );

diff --git a/root/css/relationship.css b/root/css/relationship.css
index 0d85213..e2e2f25 100644 (file)
--- a/root/css/relationship.css
+++ b/root/css/relationship.css
@@ -74,6 +74,15 @@ 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/root/js/relationship.js b/root/js/relationship.js
index 414b78c..64bd041 100644 (file)
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -21,6 +21,8 @@ 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'} );
@@ -42,6 +44,7 @@ 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/root/src/relate.tt b/root/src/relate.tt
index 72ea8e1..07b9b0a 100644 (file)
--- a/root/src/relate.tt
+++ b/root/src/relate.tt
@@ -19,6 +19,7 @@ $(function() {
        </div>
 
        <div id="enlargement_container">        
+               <div id="loading_overlay"></div>
                <div id="enlargement">
                <div id="svgenlargement" style="height: 500px;"></div>
                </div>