X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Fcomponentload.js;h=838da464a877485d00976413214691456b9ec69c;hb=c2b80bba7c5c1620828f6aa4d7ee841bf8d9a8e4;hp=243d8f7ca67f34eb3aa9addfef6e0537a745f93a;hpb=2ece58b34307ec3f4e45eb466ac13fa88715a275;p=scpubgit%2Fstemmaweb.git
diff --git a/root/js/componentload.js b/root/js/componentload.js
index 243d8f7..838da46 100644
--- a/root/js/componentload.js
+++ b/root/js/componentload.js
@@ -45,12 +45,14 @@ function loadTradition( textid, textname, editable ) {
// Hide the functionality that is irrelevant
if( editable ) {
$('#open_stemma_add').show();
- $('#open_stemma_edit').show();
$('#open_textinfo_edit').show();
+ $('#relatebutton_label').text('View collation and edit relationships');
} else {
$('#open_stemma_add').hide();
- $('#open_stemma_edit').hide();
+ $('#open_stemweb_ui').hide();
+ $('#query_stemweb_ui').hide();
$('#open_textinfo_edit').hide();
+ $('#relatebutton_label').text('View collation and relationships');
}
// Then get and load the actual content.
@@ -60,19 +62,19 @@ function loadTradition( textid, textname, editable ) {
// Add the scalar data
selectedTextInfo = textdata;
load_textinfo();
- // Add the stemma(ta) and set up the stexaminer button
+ // Add the stemma(ta)
stemmata = textdata.stemmata;
if( stemmata.length ) {
selectedStemmaID = 0;
- $('#run_stexaminer').show();
} else {
selectedStemmaID = -1;
- $('#open_stemma_edit').hide();
- $('#run_stexaminer').hide();
}
- load_stemma( selectedStemmaID );
+ load_stemma( selectedStemmaID, editable );
// Set up the relationship mapper button
$('#run_relater').attr( 'action', _get_url([ "relation", textid ]) );
+ // Set up the download button
+ $('#dl_tradition').attr( 'href', _get_url([ "download", textid ]) );
+ $('#dl_tradition').attr( 'download', selectedTextInfo.name + '.xml' );
});
}
@@ -88,7 +90,12 @@ function load_textinfo() {
// Who the owner is
$('#owner_id').empty().append('no one');
if( selectedTextInfo.owner ) {
- $('#owner_id').empty().append( selectedTextInfo.owner );
+ var owneremail = selectedTextInfo.owner;
+ var chop = owneremail.indexOf( '@' );
+ if( chop > -1 ) {
+ owneremail = owneremail.substr( 0, chop + 1 ) + '...';
+ }
+ $('#owner_id').empty().append( owneremail );
}
// Whether or not it is public
$('#not_public').empty();
@@ -103,35 +110,81 @@ function load_textinfo() {
}
// Enable / disable the appropriate buttons for paging through the stemma.
-function show_stemmapager () {
+function show_stemmapager ( editable ) {
$('.pager_left_button').unbind('click').addClass( 'greyed_out' );
$('.pager_right_button').unbind('click').addClass( 'greyed_out' );
if( selectedStemmaID > 0 ) {
$('.pager_left_button').click( function () {
- load_stemma( selectedStemmaID - 1 );
+ load_stemma( selectedStemmaID - 1, editable );
}).removeClass( 'greyed_out' );
}
if( selectedStemmaID + 1 < stemmata.length ) {
$('.pager_right_button').click( function () {
- load_stemma( selectedStemmaID + 1 );
+ load_stemma( selectedStemmaID + 1, editable );
}).removeClass( 'greyed_out' );
}
}
// Load a given stemma SVG into the stemmagraph box.
-function load_stemma( idx ) {
+function load_stemma( idx, editable ) {
// Load the stemma at idx
selectedStemmaID = idx;
- show_stemmapager();
+ show_stemmapager( editable );
+ $('#open_stemma_edit').hide();
+ $('#run_stexaminer').hide();
+ $('#stemma_identifier').empty();
+ // Add the relevant Stemweb functionality
+ if( editable ) {
+ if( selectedTextInfo.stemweb_jobid == 0 ) {
+ $('#open_stemweb_ui').show();
+ } else {
+ $('#query_stemweb_ui').show();
+ }
+ }
if( idx > -1 ) {
- loadSVG( stemmata[idx] );
- // Stexaminer submit action
- var stexpath = _get_url([ "stexaminer", selectedTextID, idx ]);
- $('#run_stexaminer').attr( 'action', stexpath );
+ // Load the stemma and its properties
+ var stemmadata = stemmata[idx];
+ if( editable ) {
+ $('#open_stemma_edit').show();
+ }
+ if( stemmadata.directed ) {
+ // Stexaminer submit action
+ var stexpath = _get_url([ "stexaminer", selectedTextID, idx ]);
+ $('#run_stexaminer').attr( 'action', stexpath );
+ $('#run_stexaminer').show();
+ }
+ loadSVG( stemmadata.svg );
+ $('#stemma_identifier').text( stemmadata.name );
setTimeout( 'start_element_height = $("#stemma_graph .node")[0].getBBox().height;', 500 );
}
}
+function query_stemweb_progress() {
+ var requrl = _get_url([ "stemweb", "query", selectedTextInfo.stemweb_jobid ]);
+ $.getJSON( requrl, function (data) {
+ // Look for a status message, either success, running, or notfound.
+ if( data.status === 'success' ) {
+ // Add the new stemmata to the textinfo and tell the user.
+ if( data.stemmata.length > 0 ) {
+ stemmata = stemmata.concat( data.stemmata );
+ if( selectedStemmaID == -1 ) {
+ // We have a stemma for the first time; load the first one.
+ load_stemma( 0 );
+ }
+ alert( 'You have one or more new stemmata!' );
+ } else {
+ alert( 'Stemweb run finished with no stemmata...huh?!' );
+ }
+ } else if( data.status === 'running' ) {
+ // Just tell the user.
+ alert( 'Your Stemweb query is still running!' );
+ } else if( data.status === 'notfound' ) {
+ // Ask the user to refresh, for now.
+ alert( 'Your Stemweb query probably finished and reported back. Please reload to check.' );
+ }
+ });
+}
+
// Load the SVG we are given
function loadSVG(svgData) {
var svgElement = $('#stemma_graph');
@@ -188,8 +241,10 @@ function display_error( jqXHR, el ) {
function file_selected( e ) {
if( e.files.length == 1 ) {
$('#upload_button').button('enable');
+ $('#new_file_name_container').html( '' + e.files[0].name + '' );
} else {
$('#upload_button').button('disable');
+ $('#new_file_name_container').html( '(Use \'pick file\' to select a tradition file to upload.)' );
}
}
@@ -299,7 +354,7 @@ function _get_url( els ) {
$(document).ready( function() {
// See if we have the browser functionality we need
// TODO Also think of a test for SVG readiness
- if( typeof window.FileReader && typeof window.File ) {
+ if( !!window.FileReader && !!window.File ) {
$('#compatibility_check').empty();
}
@@ -381,10 +436,11 @@ $(document).ready( function() {
// We received a stemma SVG string in return.
// Update the current stemma sequence number
selectedStemmaID = data.stemmaid;
- // Stash the answer in our SVG array
- stemmata[selectedStemmaID] = data.stemmasvg;
+ delete data.stemmaid;
+ // Stash the answer in the appropriate spot in our stemma array
+ stemmata[selectedStemmaID] = data;
// Display the new stemma
- load_stemma( selectedStemmaID );
+ load_stemma( selectedStemmaID, true );
// Reenable the button and close the form
$(evt.target).button("enable");
$('#stemma-edit-dialog').dialog('close');
@@ -401,7 +457,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.
@@ -422,6 +478,93 @@ $(document).ready( function() {
display_error( jqXHR, $("#edit_stemma_status") );
}
});
+
+ $('#stemweb-ui-dialog').dialog({
+ autoOpen: false,
+ height: 160,
+ width: 225,
+ modal: true,
+ buttons: {
+ Run: function (evt) {
+ $("#stemweb_run_status").empty();
+ $(evt.target).button("disable");
+ var requrl = _get_url([ "stemweb", "request" ]);
+ var reqparam = $('#call_stemweb').serialize();
+ // 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?
+ $.getJSON( requrl, reqparam, function (data) {
+ // Job ID is in data.jobid. TODO do something with it.
+ $(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( o.model === 'algorithms.algorithm' ) {
+ // it's an algorithm.
+ algorithmTypes[ o.pk ] = o.fields;
+ } else if( o.model == 'algorithms.algorithmarg' && o.fields.external ) {
+ // it's an option for an algorithm that we should display.
+ algorithmArgs[ o.pk ] = o.fields;
+ }
+ });
+ $.each( algorithmTypes, function( pk, fields ) {
+ var algopt = $('