integrated esta-ld and some bug fixing

Author: alegrm

src/main/resources/system-components-template.ttl

@@ -166,7 +166,7 @@
 :FagiGisService
       a       lds:InterlinkingService ;
       rdfs:label "Fagi-gis" ;
-      lds:serviceUrl <http://localhost:8080/FAGI-WebInterface/> .
+      lds:serviceUrl <http://localhost:8080/fagi-gis-service/> .
 
 :Coevolution
       a       lds:StackComponent ;
@@ -180,6 +180,18 @@
       rdfs:label "Public-Private Data Coevolution"^^xsd:string ;
       lds:serviceUrl <http://localhost:8080/coevolution-service/> .
 
+:esta-ld
+  a       lds:StackComponent ;
+  rdfs:label "ESTA-LD"^^xsd:string ;
+  lds:providesService :esta-ld-service ;
+  foaf:homepage <https://github.com/GeoKnow/ESTA-LD> ;
+  dcterms:hasVersion "1.0"^^xsd:string .
+
+:esta-ld-service
+      a       lds:ExplorationService ;
+      rdfs:label "ESTA-LD" ;
+      lds:serviceUrl <http://localhost:8080/ESTA-LD/> .
+
 
 ########### ROUTES RESTRICTIONS DESCRIPTION #######################################################
 # Following triples describe required services for routes. It is used in conditional routing.

src/main/resources/system-configuration-template.ttl

@@ -29,7 +29,9 @@
   ontos:frameworkDataDir "/var/generator"^^xsd:string ;
   foaf:homepage <http://localhost:8080/generator> ;
   sd:defaultDataset :default-dataset;  
-  lds:integrates :Virtuoso, :SpringBatch, :Facete, :Limes, :Sparqlify, :TripleGeo, :GeoLift, :OntoWiki, :Mappify, :FagiGis;
+  lds:integrates :Virtuoso, :SpringBatch, :RdfImport, :Coevolution;
+  # :Facete, :Limes, :Sparqlify, :TripleGeo, :GeoLift, :esta-ld, :Mappify, :FagiGis, :DEER, 
+  lds:requires :Virtuoso, :SpringBatch, :Coevolution;
   lds:providesService :PublishingService, :UserManagerService, :EmailService
   .
 

src/main/resources/system-users.ttl

@@ -17,7 +17,7 @@
 :admin
   a ontos:Account;
   foaf:accountName "admin"^^xsd:string;
-  lds:password "admin"^^xsd:string;
+  lds:password "generatorfinal"^^xsd:string;
   foaf:mbox <mailto:[email protected]>;
   ontos:role :Administrator.
 

src/main/webapp/js/settings/settings-controller.js

@@ -31,11 +31,15 @@ function GeneralSettingsCtrl($scope, ConfigurationService, flash) {
     ConfigurationService.getSettings().then(
       //success
       function(response){
-        
+        var workbenchHP = ConfigurationService.getFrameworkHomepage();
+        if (workbenchHP.substr(-1) != '/') 
+          workbenchHP += '/';        
+
         $scope.settings = {
           uriBase: ConfigurationService.getUriBase() ,
           endpointService: ConfigurationService.getSPARQLEndpoint(),
-          settingsGraph : ConfigurationService.getSettingsGraph()
+          settingsGraph : ConfigurationService.getSettingsGraph(),
+          workbenchUrl : workbenchHP
         }; 
 
       },

src/main/webapp/js/settings/settings.html

@@ -28,6 +28,8 @@ <h3 class="green bold">Generator Settings</h3>
         <tr>
         <td>Endpoint:</td><td>{{settings.endpointService}}</td>
         </tr>
+        <td>Workbench URL:</td><td>{{settings.workbenchUrl}}</td>
+        </tr>
     </table>
 	</div>
 

src/main/webapp/js/workbench/linking-and-fusing/fagi-gis-controller.js

@@ -56,6 +56,7 @@ app.controller('FagiGisCtrl', function($q, $scope, ConfigurationService, Compone
 					'&virtuoso-port='+ encodeURIComponent($scope.fagi.database.dbPort) +
 					'&target-endpoint='+ encodeURIComponent(authEndpoint) +
 					'&target-dataset='+ encodeURIComponent($scope.fagi.targetGraph.replace(':',ConfigurationService.getUriBase())) ;
+			console.log("endpoint" + authEndpoint);
 			console.log(url);
 			window.open(url);
 		});

src/main/webapp/js/workbench/linking-and-fusing/limes-controller.js

@@ -29,8 +29,9 @@ var LimesCtrl = function($scope, $http, ConfigurationService, ComponentsService,
 
 	// retreive the publication service url
 	var pubService;
-	ConfigurationService.getWorkbenchService("PublishingService").then(
+	ConfigurationService.getWorkbenchService(Ns.lengthen(":PublishingService")).then(
 		function(response){
+			console.log(response);
 			pubService = response;
 		},
 		function(response){

src/main/webapp/js/workbench/search-querying-and-exploration/esta-ld-controller.js

@@ -48,11 +48,13 @@ app.controller('EstaLdCtrl', function($scope, ConfigurationService, ComponentsSe
 
 			return AuthSessionService.createSession().then(function(response){
 
-				var atuhEndpoint = workbenchHP + response.data.endpoint;
+				var authEndpoint = workbenchHP + response.data.endpoint;
 				var url = $scope.sevice.serviceUrl + 
-								'?endpoint=' + encodeURIComponent(atuhEndpoint) +
+								'?endpoint=' + encodeURIComponent(authEndpoint) +
       					'&graph=' + encodeURIComponent($scope.source.graph.replace(':',ConfigurationService.getUriBase()));
 
+    		console.log("endpoint: " + authEndpoint);
+    		console.log("graph: " + $scope.source.graph.replace(':',ConfigurationService.getUriBase()));
     		console.log(url);
 
 				window.open(url);