initial work on Stemweb client - we have a button! (#29)

diff --git a/lib/stemmaweb/Controller/Root.pm b/lib/stemmaweb/Controller/Root.pm
index d798cbd..f33761d 100644 (file)
--- a/lib/stemmaweb/Controller/Root.pm
+++ b/lib/stemmaweb/Controller/Root.pm
@@ -1,7 +1,7 @@
 package stemmaweb::Controller::Root;
 use Moose;
 use namespace::autoclean;
-use Text::Tradition::Analysis qw/ run_analysis /;
+use LWP::UserAgent;
 use TryCatch;
 use XML::LibXML;
 use XML::LibXML::XPathContext;
@@ -15,6 +15,8 @@ BEGIN { extends 'Catalyst::Controller' }
 #
 __PACKAGE__->config(namespace => '');
 
+my $STEMWEB_BASE_URL = 'http://slinkola.users.cs.helsinki.fi';
+
 =head1 NAME
 
 stemmaweb::Controller::Root - Root Controller for stemmaweb
@@ -39,6 +41,14 @@ sub index :Path :Args(0) {
        if( $c->req->param('withtradition') ) {
                $c->stash->{'withtradition'} = $c->req->param('withtradition');
        }
+       # Get the current list of Stemweb algorithms
+       my $ua = LWP::UserAgent->new();
+       my $resp = $ua->get( $STEMWEB_BASE_URL . '/algorithms/available' );
+       if( $resp->is_success ) {
+               $c->stash->{'stemweb_algorithms'} = $resp->content;
+       } else {
+               $c->stash->{'stemweb_algorithms'} = '{}';
+       }
     $c->stash->{template} = 'index.tt';
 }
 

diff --git a/root/css/style.css b/root/css/style.css
index 1785a21..83f7517 100644 (file)
--- a/root/css/style.css
+++ b/root/css/style.css
@@ -190,7 +190,7 @@ div.pager_left_button.greyed_out, div.pager_left_button.greyed_out:hover {
     position: relative;
     top: 15px;
 }
-#run_stexaminer, #run_relater, #open_stemma_add, #open_stemma_edit {
+#run_stexaminer, #run_relater, #open_stemma_add, #open_stemma_edit, #open_stemweb_ui {
     height: 32px;
 }
 #stemma_pager {

diff --git a/root/js/componentload.js b/root/js/componentload.js
index aba03fd..352d34a 100644 (file)
--- a/root/js/componentload.js
+++ b/root/js/componentload.js
@@ -45,10 +45,12 @@ function loadTradition( textid, textname, editable ) {
     // Hide the functionality that is irrelevant
     if( editable ) {
        $('#open_stemma_add').show();
+       $('#open_stemweb_ui').show();
        $('#open_textinfo_edit').show();
        $('#relatebutton_label').text('View collation and edit relationships');
     } else {
        $('#open_stemma_add').hide();
+       $('#open_stemweb_ui').hide();
        $('#open_textinfo_edit').hide();
        $('#relatebutton_label').text('View collation and relationships');
     }
@@ -421,7 +423,7 @@ $(document).ready( function() {
                                // If we are creating a new stemma, populate the textarea with a
                                // bare digraph.
                                $(evt.target).dialog('option', 'title', 'Add a new stemma')
-                               $('#dot_field').val( "digraph stemma {\n\n}" );
+                               $('#dot_field').val( "digraph \"NAME STEMMA HERE\" {\n\n}" );
                        } else {
                                // If we are editing a stemma, grab its stemmadot and populate the
                                // textarea with that.
@@ -442,6 +444,70 @@ $(document).ready( function() {
                        display_error( jqXHR, $("#edit_stemma_status") );
        }
        });
+
+       $('#stemweb-ui-dialog').dialog({
+               autoOpen: false,
+               height: 200,
+               width: 300,
+               modal: true,
+               buttons: {
+                       Run: function (evt) {
+                               $("#stemweb_run_status").empty();
+                               $(evt.target).button("disable");
+                               var stemmaseq = $('#stemmaseq').val();
+                               var requrl = _get_url([ "stemma", selectedTextID, stemmaseq ]);
+                               var reqparam = { 'dot': $('#dot_field').val() };
+                               // TODO We need to stash the literal SVG string in stemmata
+                               // somehow. Implement accept header on server side to decide
+                               // whether to send application/json or application/xml?
+                               $.post( requrl, reqparam, function (data) {
+                                       // We received a stemma SVG string in return. 
+                                       // Update the current stemma sequence number
+                                       selectedStemmaID = data.stemmaid;
+                                       delete data.stemmaid;
+                                       // Stash the answer in the appropriate spot in our stemma array
+                                       stemmata[selectedStemmaID] = data;
+                                       // Display the new stemma
+                                       load_stemma( selectedStemmaID, true );
+                                       // Reenable the button and close the form
+                                       $(evt.target).button("enable");
+                                       $('#stemma-edit-dialog').dialog('close');
+                               }, 'json' );
+                       },
+                       Cancel: function() {
+                               $('#stemweb-ui-dialog').dialog('close');
+                       }
+               },
+               create: function(evt) {
+                       // Call out to Stemweb to get the algorithm options, with which we
+                       // populate the form.
+                       var algorithmTypes = {};
+                       var algorithmArgs = {};
+                       $.each( stemwebAlgorithms, function( i, o ) {
+                               // If it's an algorithmarg, skip it for now
+                               if( o.model === 'algorithms.algorithm' ) {
+                                       algorithmTypes[ o.pk ] = o.fields;
+                               } else {
+                                       // it's an arg
+                                       algorithmArgs[ o.pk ] = o.fields;
+                               }
+                       });
+                       $.each( algorithmTypes, function( pk, fields ) {
+                               var algopt = $('<option>').attr( 'value', pk ).append( fields.name );
+                               $('#stemweb_algorithm').append( algopt );
+                       });
+                       // TODO add the algorithm args
+               },
+               open: function(evt) {
+                       $("#stemweb_run_status").empty();
+               },
+       }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
+               $(event.target).parent().find('.ui-button').button("enable");
+       if( ajaxSettings.url.indexOf( 'algorithms' ) > -1 
+               && ajaxSettings.type == 'POST' ) {
+                       display_error( jqXHR, $("#stemweb_run_status") );
+       }
+       });
                
        $('#upload-collation-dialog').dialog({
                autoOpen: false,

diff --git a/root/src/index.tt b/root/src/index.tt
index 6dc7ad2..2c2f735 100644 (file)
--- a/root/src/index.tt
+++ b/root/src/index.tt
@@ -6,6 +6,7 @@
 // Set global variables that must be passed by the server
 var basepath = "[% c.uri_for( '/' ) %]";
 var textOnLoad = "[% withtradition %]";
+var stemwebAlgorithms = [% stemweb_algorithms %];
     </script>
 
 [% END %]
@@ -66,6 +67,12 @@ var textOnLoad = "[% withtradition %]";
                  <span>Edit this stemma</span>
             </div>
           </form>
+          <form id="open_stemweb_ui" action="" method="GET" name="run_stemweb">
+            <div class="button" id="run_stemweb_button"
+               onClick="$('#stemweb-ui-dialog').dialog('open');">
+              <span>Run a Stemweb algorithm</span>
+            </div>
+          </form>
           <form id="run_stexaminer" action="" method="GET" name="run_stexaminer">
             <div class="button" id="stexaminer_button" onClick="$('#run_stexaminer').submit()">
                  <span>Examine variants against this stemma</span>
@@ -122,9 +129,10 @@ var textOnLoad = "[% withtradition %]";
                <input id="stemmaseq" type="hidden" name="stemmaseq" val="n"/>
                        <div id="edit_instructions">
                                <p>All definitions begin with the line
-                                       <pre>digraph stemma {</pre>
+                                       <pre>digraph "Stemma Name" {</pre>
                                and end with the line 
-                                       <pre>}</pre>Please do not change these lines.</p>
+                                       <pre>}</pre>
+                               Please do not change these lines except to edit the stemma name.</p>
                                <p>First list each witness in your stemma, whether extant or lost /
                                reconstructed / hypothetical, and assign them a class of either "extant"
                                or "hypothetical". For example:</p><pre>  
@@ -144,6 +152,19 @@ var textOnLoad = "[% withtradition %]";
       </div>
     </div>
 
+       <!-- Stemweb UI dialog box -->
+    <div id="stemweb-ui-dialog">
+      <div id="stemweb_ui_container">
+       <form id="call_stemweb">
+               <label for="algorithm">Run algorithm:</label><br/>
+               <select id="stemweb_algorithm" name="algorithm"></select>
+               <!-- Algorithm-specific options, if any, will be added within this div -->
+               <div id="stemweb_runtime_options"></div>
+       </form>
+       <div id="stemweb_run_status"></div>
+      </div>
+    </div>
+    
     <!-- File upload dialog box -->
     <div id="upload-collation-dialog" title="Upload a collation">
       <div id="upload_container">