Skip to content
This repository was archived by the owner on Apr 22, 2022. It is now read-only.

Commit 370f073

Browse files
committed
integrated esta-ld and some bug fixing
1 parent abe8c99 commit 370f073

File tree

8 files changed

+32
-8
lines changed

8 files changed

+32
-8
lines changed

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
:FagiGisService
167167
a lds:InterlinkingService ;
168168
rdfs:label "Fagi-gis" ;
169-
lds:serviceUrl <http://localhost:8080/FAGI-WebInterface/> .
169+
lds:serviceUrl <http://localhost:8080/fagi-gis-service/> .
170170

171171
:Coevolution
172172
a lds:StackComponent ;
@@ -180,6 +180,18 @@
180180
rdfs:label "Public-Private Data Coevolution"^^xsd:string ;
181181
lds:serviceUrl <http://localhost:8080/coevolution-service/> .
182182

183+
:esta-ld
184+
a lds:StackComponent ;
185+
rdfs:label "ESTA-LD"^^xsd:string ;
186+
lds:providesService :esta-ld-service ;
187+
foaf:homepage <https://github.com/GeoKnow/ESTA-LD> ;
188+
dcterms:hasVersion "1.0"^^xsd:string .
189+
190+
:esta-ld-service
191+
a lds:ExplorationService ;
192+
rdfs:label "ESTA-LD" ;
193+
lds:serviceUrl <http://localhost:8080/ESTA-LD/> .
194+
183195

184196
########### ROUTES RESTRICTIONS DESCRIPTION #######################################################
185197
# Following triples describe required services for routes. It is used in conditional routing.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
ontos:frameworkDataDir "/var/generator"^^xsd:string ;
3030
foaf:homepage <http://localhost:8080/generator> ;
3131
sd:defaultDataset :default-dataset;
32-
lds:integrates :Virtuoso, :SpringBatch, :Facete, :Limes, :Sparqlify, :TripleGeo, :GeoLift, :OntoWiki, :Mappify, :FagiGis;
32+
lds:integrates :Virtuoso, :SpringBatch, :RdfImport, :Coevolution;
33+
# :Facete, :Limes, :Sparqlify, :TripleGeo, :GeoLift, :esta-ld, :Mappify, :FagiGis, :DEER,
34+
lds:requires :Virtuoso, :SpringBatch, :Coevolution;
3335
lds:providesService :PublishingService, :UserManagerService, :EmailService
3436
.
3537

src/main/resources/system-users.ttl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
:admin
1818
a ontos:Account;
1919
foaf:accountName "admin"^^xsd:string;
20-
lds:password "admin"^^xsd:string;
20+
lds:password "generatorfinal"^^xsd:string;
2121
foaf:mbox <mailto:pr@geoknow.eu>;
2222
ontos:role :Administrator.
2323

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@ function GeneralSettingsCtrl($scope, ConfigurationService, flash) {
3131
ConfigurationService.getSettings().then(
3232
//success
3333
function(response){
34-
34+
var workbenchHP = ConfigurationService.getFrameworkHomepage();
35+
if (workbenchHP.substr(-1) != '/')
36+
workbenchHP += '/';
37+
3538
$scope.settings = {
3639
uriBase: ConfigurationService.getUriBase() ,
3740
endpointService: ConfigurationService.getSPARQLEndpoint(),
38-
settingsGraph : ConfigurationService.getSettingsGraph()
41+
settingsGraph : ConfigurationService.getSettingsGraph(),
42+
workbenchUrl : workbenchHP
3943
};
4044

4145
},

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ <h3 class="green bold">Generator Settings</h3>
2828
<tr>
2929
<td>Endpoint:</td><td>{{settings.endpointService}}</td>
3030
</tr>
31+
<td>Workbench URL:</td><td>{{settings.workbenchUrl}}</td>
32+
</tr>
3133
</table>
3234
</div>
3335

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ app.controller('FagiGisCtrl', function($q, $scope, ConfigurationService, Compone
5656
'&virtuoso-port='+ encodeURIComponent($scope.fagi.database.dbPort) +
5757
'&target-endpoint='+ encodeURIComponent(authEndpoint) +
5858
'&target-dataset='+ encodeURIComponent($scope.fagi.targetGraph.replace(':',ConfigurationService.getUriBase())) ;
59+
console.log("endpoint" + authEndpoint);
5960
console.log(url);
6061
window.open(url);
6162
});

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ var LimesCtrl = function($scope, $http, ConfigurationService, ComponentsService,
2929

3030
// retreive the publication service url
3131
var pubService;
32-
ConfigurationService.getWorkbenchService("PublishingService").then(
32+
ConfigurationService.getWorkbenchService(Ns.lengthen(":PublishingService")).then(
3333
function(response){
34+
console.log(response);
3435
pubService = response;
3536
},
3637
function(response){

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ app.controller('EstaLdCtrl', function($scope, ConfigurationService, ComponentsSe
4848

4949
return AuthSessionService.createSession().then(function(response){
5050

51-
var atuhEndpoint = workbenchHP + response.data.endpoint;
51+
var authEndpoint = workbenchHP + response.data.endpoint;
5252
var url = $scope.sevice.serviceUrl +
53-
'?endpoint=' + encodeURIComponent(atuhEndpoint) +
53+
'?endpoint=' + encodeURIComponent(authEndpoint) +
5454
'&graph=' + encodeURIComponent($scope.source.graph.replace(':',ConfigurationService.getUriBase()));
5555

56+
console.log("endpoint: " + authEndpoint);
57+
console.log("graph: " + $scope.source.graph.replace(':',ConfigurationService.getUriBase()));
5658
console.log(url);
5759

5860
window.open(url);

0 commit comments

Comments
 (0)