query dynamically for relationship types in rel mapper

[scpubgit/stemmaweb.git] / root / js / relationship-full.js

diff --git a/root/js/relationship-full.js b/root/js/relationship-full.js
index 7847571..123b1d6 100644 (file)
--- a/root/js/relationship-full.js
+++ b/root/js/relationship-full.js
@@ -202,8 +202,12 @@ function svgEnlargementLoaded() {
 
 function add_relations( callback_fn ) {
        var textrelpath = getTextURL( 'relationships' );
-    $.getJSON( basepath + 'definitions', function(data) {
+       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 ) {
@@ -638,9 +642,10 @@ $(document).ready(function () {
             $.each( data, function(item, source_target) { 
                var source_found = get_ellipse( source_target[0] );
                var target_found = get_ellipse( source_target[1] );
-               if( source_found.size() && target_found.size() ) {
-                    var relation = relation_manager.create( source_target[0], source_target[1], $('#rel_type')[0].selectedIndex-1 );
-                                       relation.data( 'type', $('#rel_type :selected').text()  );
+               var relation_found = $.inArray( source_target[2], $('#keymap').data('relations') );
+               if( source_found.size() && target_found.size() && relation_found > -1 ) {
+                    var relation = relation_manager.create( source_target[0], source_target[1], relation_found );
+                                       relation.data( 'type', source_target[2]  );
                                        relation.data( 'scope', $('#scope :selected').text()  );
                                        relation.data( 'note', $('#note').val()  );
                                        relation_manager.toggle_active( relation.attr('id') );
@@ -656,8 +661,9 @@ $(document).ready(function () {
     },
     create: function(event, ui) { 
         $(this).data( 'relation_drawn', false );
-        //TODO? Err handling?
-        var jqjson = $.getJSON( basepath + 'definitions', function(data) {
+        //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( $('<option />').attr( "value", value ).text(value) );