From: Tara L Andrews Date: Wed, 3 Oct 2012 11:48:12 +0000 (+0200) Subject: send relationship type info in initial load, not as AJAX X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=56e3972ee78693b5fbcb530fad920ed9beb6be5a;p=scpubgit%2Fstemmaweb.git send relationship type info in initial load, not as AJAX --- diff --git a/lib/stemmaweb/Controller/Relation.pm b/lib/stemmaweb/Controller/Relation.pm index be51983..0b5d1bb 100644 --- a/lib/stemmaweb/Controller/Relation.pm +++ b/lib/stemmaweb/Controller/Relation.pm @@ -1,4 +1,5 @@ package stemmaweb::Controller::Relation; +use JSON qw/ to_json /; use Moose; use Module::Load; use namespace::autoclean; @@ -68,6 +69,16 @@ sub main :Chained('text') :PathPart('') :Args(0) { my $tradition = delete $c->stash->{'tradition'}; my $collation = $tradition->collation; + # Stash the relationship definitions + $c->stash->{'relationship_scopes'} = to_json( [ qw/ local global / ] ); + my @reltypeinfo; + foreach my $type ( sort { _typesort( $a, $b ) } $collation->relations->types ) { + next if $type->is_weak; + my $struct = { name => $type->name, description => $type->description }; + push( @reltypeinfo, $struct ); + } + $c->stash->{'relationship_types'} = to_json( \@reltypeinfo ); + # See how big the tradition is. Edges are more important than nodes # when it comes to rendering difficulty. my $numnodes = scalar $collation->readings; @@ -126,26 +137,11 @@ sub main :Chained('text') :PathPart('') :Args(0) { $c->stash->{'template'} = 'relate.tt'; } -=head2 definitions - - GET relation/$textid/definitions - -Returns a data structure giving the valid types and scopes for a relationship in -this tradition. - -=cut - -sub definitions :Chained('text') :PathPart :Args(0) { - my( $self, $c ) = @_; - my $tradition = delete $c->stash->{'tradition'}; - my @valid_relationships = map { $_->name } grep { !$_->is_weak } - $tradition->collation->relations->types; - my $valid_scopes = [ qw/ local global / ]; - $c->stash->{'result'} = { - 'types' => \@valid_relationships, - 'scopes' => $valid_scopes - }; - $c->forward('View::JSON'); +sub _typesort { + my( $a, $b ) = @_; + my $blsort = $a->bindlevel <=> $b->bindlevel; + return $blsort if $blsort; + return $a->name cmp $b->name; } =head2 help @@ -216,14 +212,9 @@ sub relationships :Chained('text') :PathPart :Args(0) { if( $c->stash->{'permission'} ne 'full' ) { $c->response->status( '403' ); $c->stash->{'result'} = { - 'error' => 'You do not have permission to view this tradition.' }; + 'error' => 'You do not have permission to modify this tradition.' }; + $c->detach( 'View::JSON' ); } elsif( $c->request->method eq 'POST' ) { - unless( $c->stash->{'permission'} eq 'full' ) { - $c->response->status( '403' ); - $c->stash->{'result'} = { - 'error' => 'You do not have permission to view this tradition.' }; - $c->detach( 'View::JSON' ); - } my $node = $c->request->param('source_id'); my $target = $c->request->param('target_id'); my $relation = $c->request->param('rel_type'); diff --git a/root/js/relationship-full.js b/root/js/relationship-full.js index 123b1d6..814e58e 100644 --- a/root/js/relationship-full.js +++ b/root/js/relationship-full.js @@ -201,35 +201,38 @@ function svgEnlargementLoaded() { } function add_relations( callback_fn ) { + // Add the relationship types to the keymap list + // TODO Make the descriptions (in typedef.description) available somewhere + $.each( relationship_types, function(index, typedef) { + var elid = 'list_rel_' + typedef.name; + $('#keymaplist').append( $('
  • ').attr( 'id', elid ).css( "border-color", relation_manager.relation_colors[index] ).text(typedef.name) ); + }); + // Now fetch the relationships themselves and add them to the graph + var rel_types = $.map( relationship_types, function(t) { return t.name }); + // Save this list of names to the outer element data so that the relationship + // factory can access it + $('#keymap').data('relations', rel_types); var textrelpath = getTextURL( 'relationships' ); - var typedefpath = getTextURL( 'definitions' ); - $.getJSON( typedefpath, function(data) { - var rel_types = data.types.sort(); - // Add the relationship types to our document data so that we don't have - // to call again - $('#keymap').data( 'relations', rel_types ); - $.getJSON( textrelpath, - function(data) { - $.each(data, function( index, rel_info ) { - var type_index = $.inArray(rel_info.type, rel_types); - var source_found = get_ellipse( rel_info.source ); - var target_found = get_ellipse( rel_info.target ); - if( type_index != -1 && source_found.size() && target_found.size() ) { - var relation = relation_manager.create( rel_info.source, rel_info.target, type_index ); - relation.data( 'type', rel_info.type ); - relation.data( 'scope', rel_info.scope ); - relation.data( 'note', rel_info.note ); - var node_obj = get_node_obj(rel_info.source); - node_obj.set_draggable( false ); - node_obj.ellipse.data( 'node_obj', null ); - node_obj = get_node_obj(rel_info.target); - node_obj.set_draggable( false ); - node_obj.ellipse.data( 'node_obj', null ); - } - }); - callback_fn.call(); - }); - }); + $.getJSON( textrelpath, function(data) { + $.each(data, function( index, rel_info ) { + var type_index = $.inArray(rel_info.type, rel_types); + var source_found = get_ellipse( rel_info.source ); + var target_found = get_ellipse( rel_info.target ); + if( type_index != -1 && source_found.size() && target_found.size() ) { + var relation = relation_manager.create( rel_info.source, rel_info.target, type_index ); + relation.data( 'type', rel_info.type ); + relation.data( 'scope', rel_info.scope ); + relation.data( 'note', rel_info.note ); + var node_obj = get_node_obj(rel_info.source); + node_obj.set_draggable( false ); + node_obj.ellipse.data( 'node_obj', null ); + node_obj = get_node_obj(rel_info.target); + node_obj.set_draggable( false ); + node_obj.ellipse.data( 'node_obj', null ); + } + }); + callback_fn.call(); + }); } function get_ellipse( node_id ) { @@ -661,18 +664,11 @@ $(document).ready(function () { }, create: function(event, ui) { $(this).data( 'relation_drawn', false ); - //TODO Check whether we have already retrieved the definitions - var typedefpath = getTextURL( 'definitions' ); - var jqjson = $.getJSON( typedefpath, function(data) { - var types = data.types.sort(); - $.each( types, function(index, value) { - $('#rel_type').append( $('
  • ').css( "border-color", relation_manager.relation_colors[index] ).text(value) ); - }); - var scopes = data.scopes; - $.each( scopes, function(index, value) { - $('#scope').append( $('
  • ').attr( 'id', elid ).css( "border-color", relation_manager.relation_colors[index] ).text(typedef.name) ); + }); + // Now fetch the relationships themselves and add them to the graph + var rel_types = $.map( relationship_types, function(t) { return t.name }); var textrelpath = getTextURL( 'relationships' ); - var typedefpath = getTextURL( 'definitions' ); - $.getJSON( typedefpath, function(data) { - var rel_types = data.types.sort(); - $.each( rel_types, function(index, value) { - $('#keymaplist').append( $('
  • ').css( "border-color", relation_manager.relation_colors[index] ).text(value) ); + $.getJSON( textrelpath, function(data) { + $.each(data, function( index, rel_info ) { + var type_index = $.inArray(rel_info.type, rel_types); + var source_found = get_ellipse( rel_info.source ); + var target_found = get_ellipse( rel_info.target ); + if( type_index != -1 && source_found.size() && target_found.size() ) { + var relation = relation_manager.create( rel_info.source, rel_info.target, type_index ); + relation.data( 'type', rel_info.type ); + relation.data( 'scope', rel_info.scope ); + relation.data( 'note', rel_info.note ); + var node_obj = get_node_obj(rel_info.source); + node_obj.set_draggable( false ); + node_obj.ellipse.data( 'node_obj', null ); + node_obj = get_node_obj(rel_info.target); + node_obj.set_draggable( false ); + node_obj.ellipse.data( 'node_obj', null ); + } }); - $.getJSON( textrelpath, function(data) { - $.each(data, function( index, rel_info ) { - var type_index = $.inArray(rel_info.type, rel_types); - var source_found = get_ellipse( rel_info.source ); - var target_found = get_ellipse( rel_info.target ); - if( type_index != -1 && source_found.size() && target_found.size() ) { - var relation = relation_manager.create( rel_info.source, rel_info.target, type_index ); - relation.data( 'type', rel_info.type ); - relation.data( 'scope', rel_info.scope ); - relation.data( 'note', rel_info.note ); - var node_obj = get_node_obj(rel_info.source); - node_obj.ellipse.data( 'node_obj', null ); - node_obj = get_node_obj(rel_info.target); - node_obj.ellipse.data( 'node_obj', null ); - } - }); - callback_fn.call(); - }); - }); + callback_fn.call(); + }); } function get_ellipse( node_id ) { diff --git a/root/src/relate.tt b/root/src/relate.tt index 0150581..7bb7054 100644 --- a/root/src/relate.tt +++ b/root/src/relate.tt @@ -8,6 +8,13 @@ var basepath = "[% c.uri_for( '/relation/' ) %]"; var textid = "[% textid %]"; var can_morphologize = "[% can_morphologize %]"; +[% IF error -%] +var relationship_types = []; +var relationship_scopes = []; +[% ELSE -%] +var relationship_types = [% relationship_types %]; +var relationship_scopes = [% relationship_scopes %]; +[% END -%] $(document).ready(function () { loadSVG('[% svg_string %]'); diff --git a/script/maketestdb.pl b/script/maketestdb.pl index b6ed6ec..021f528 100755 --- a/script/maketestdb.pl +++ b/script/maketestdb.pl @@ -49,5 +49,9 @@ $t2->add_stemma( dotfile => 't/data/florilegium.dot' ); die "Failed to create test tradition #2" unless $t2; $t2->public( 1 ); $dir->store( $t2 ); -say "Created test public tradition"; +my $t3 = Text::Tradition->new( input => 'Self', file => 't/data/john.xml' ); +$t3->public( 1 ); +$t3->name( 'John verse' ); +$dir->store( $t3 ); +say "Created test public traditions";