Fixed bug affecting import when nodes with bindings are being looked-…

…up. SPARQLgraph was saving json incorrectly. Mapping tab did not show lookup properly.
ge-semtk · Dec 8, 2020 · e775948 · e775948
1 parent 82abd2f
commit e775948
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/sparqlGraphWeb/sparqlGraph/js/importmapping.js b/sparqlGraphWeb/sparqlGraph/js/importmapping.js
@@ -160,7 +160,7 @@ define([	// properly require.config'ed
                 getUriLookupIDs : function () {
                     var ret = [];
                     for (var i=0; i < this.uriLookupNodes.length; i++) {
-                        ret.push(this.uriLookupNodes[i].getBindingOrSparqlID());
+                        ret.push(this.uriLookupNodes[i].getSparqlID());
                     }
                     return ret;
                 },
@@ -201,7 +201,18 @@ define([	// properly require.config'ed
 					return ImportMapping.staticGenUniqueKey(this.getNodeSparqlId(), this.getPropUri());
 				},
 
-                // return ?SparqlID of node or keyname of propItem
+                // get the name that would match a URI LOOKUP
+                // e.g. nodes are looked up by sparqlID
+                getUriLookupName : function () {
+                    if (this.isNode()) {
+                        return this.node.getSparqlID();
+                    } else {
+                        return this.propItem.getKeyName();
+                    }
+                },
+
+                // get the display name
+                // e.g. bindings are displayed where available
                 getName : function () {
                     if (this.isNode()) {
                         return this.node.getBindingOrSparqlID();

diff --git a/sparqlGraphWeb/sparqlGraph/js/importspec.js b/sparqlGraphWeb/sparqlGraph/js/importspec.js
@@ -183,7 +183,7 @@ define([// properly require.config'ed
 
             // get any mappings that have uriLookups containing this mapping
             getLookupMappings : function(mapping) {
-                var mapName = mapping.getName();
+                var mapName = mapping.getUriLookupName();
                 var ret = [];
                 for (var i=0; i < this.mapList.length; i++) {
 					if (this.mapList[i].getUriLookupIDs().indexOf(mapName) > -1) {