several fix

Author: alegrm

src/deb/control/control

@@ -1,15 +1,12 @@
-Package: geoknow-generator-ui
-Version: 1.2.0
+Package: deer-service
+Version: 0.1.1
 Section: web
 Priority: extra
 Architecture: all
-Depends: virtuoso-opensource,spring-batch-admin-geoknow,coevolution-debian-package,limes-service,deer-service,triplegeo-service,esta-ld
+Depends: tomcat7
 Maintainer: Alejandra Garcia-Rojas M <[email protected]>
 Distribution: ldstack-nightly
-Homepage: http://stack.linkeddata.org/getting-started/geoknow-generator/
-Description: The GeoKnow Generator provides a workbench that integrates of tools
- developed within GeoKnow project (http://geoknow.eu/),
- and are part of the Linked Data Stack (http://stack.linkeddata.org/).
- These workbench aim to provide the required methods and tools
- to easly integrate and process geospatial data
- across a wide range of data sources on the web of data.
+Homepage: https://github.com/GeoKnow/DEER-Service
+Description: A REST service for DEER (https://github.com/GeoKnow/DEER)
+ for Linked Data enrichment, developed within GeoKnow project (http://geoknow.eu/),
+ and part of the Linked Data Stack (http://stack.linkeddata.org/).

src/main/java/eu/geoknow/generator/rest/AuthorizedSessions.java

@@ -66,6 +66,7 @@
  * 
  * @author alejandragarciarojas
  * 
+ *         TODO: errors on the server are not given back to the client
  */
 @Path("/session")
 public class AuthorizedSessions {

src/main/resources/log4j.properties

@@ -7,4 +7,4 @@ log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
 
-log4j.logger.eu.geoknow=INFO
+log4j.logger.eu.geoknow=DEBUG

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

@@ -132,7 +132,7 @@
 :DEERService
       a       lds:EnrichmentService ;
       rdfs:label "Deer" ;
-      lds:serviceUrl <http://localhost:8080/deer-Service> .
+      lds:serviceUrl <http://localhost:8080/deer-service/> .
 
 :OntoWiki
       a       lds:StackComponent ;

src/main/webapp/index.html

@@ -206,7 +206,6 @@
   <script src="modal-forms/modal-id-label-controller.js"></script>
 
   <script src="modal-forms/workbench/modal-job-controller.js"></script>
-  <script src="modal-forms/workbench/modal-limes-job-controller.js"></script>
   <script src="modal-forms/settings/modal-roles-controller.js"></script>
   <script src="modal-forms/settings/modal-user-controller.js"></script>
   <script src="modal-forms/settings/named-graphs/modal-graph-controller.js"></script>

src/main/webapp/js/filters.js

@@ -17,7 +17,7 @@ module.filter('shortenURI', function(Ns) {
 */
 module.filter('formatDate', function() {
   return function(date) {
-  	if(date == "") return "";
+  	if(date == null || date == "") return "";
   	var day   = date.substring(8,10);
   	var month = date.substring(5,7);
   	var year  = date.substring(0,4);

src/main/webapp/js/services/components-service.js

@@ -25,8 +25,9 @@ module.factory('ComponentsService', function ($http, $q, ConfigurationService) {
 		// parse the component data to find a service
 		getComponentService : function(id, component){
 			var uri = ConfigurationService.getUriBase() + id;
-			console.log(uri);	
+			
 			for(var i in component.services){
+				console.log(uri) + " ==?" + component.services[i].uri;	
 				if (component.services[i].uri == uri)
 					return component.services[i];
 			}

src/main/webapp/js/services/configuration-service.js

@@ -220,7 +220,6 @@ module.factory('ConfigurationService', function ($q, Config, $http, $location, f
         getAllEndpoints: function () {
             var results = [];
             var elements = Config.select("rdf:type", "ontos:SPARQLEndpoint");
-            console.log(elements);
             for (var resource in elements) {
                 var element = elements[resource];
                 if(element["rdfs:label"]== undefined) continue;

src/main/webapp/js/services/graph-service.js

@@ -435,6 +435,8 @@ module.factory("GraphService", function ($http, $q, Config, ConfigurationService
                     settings[":default-dataset"]["sd:namedGraph"] = [];
                 settings[":default-dataset"]["sd:namedGraph"].push(parNamedGraph.name);
 
+                console.log(response);
+                console.log(settings);
                 return Config.write();
             });
         return promise;

src/main/webapp/js/workbench/dashboard-controller.js

@@ -2,20 +2,20 @@
 
 function DashboardCtrl($scope, JobService, ComponentsService, $http, flash, ServerErrorResponse) {
 
-  var sbaId ="SpringBatch";
-  var serviceId = "SpringBatchService";
+  // var sbaId ="SpringBatch";
+  // var sbaServiceId = "SpringBatchService";
 
-  ComponentsService.getComponent(sbaId).then(
-    //success
-    function(response){
-      $scope.sba = response;
-      $scope.service = ComponentsService.getComponentService(serviceId, $scope.sba);
-      if($scope.service== null)
-        flash.error="Service not configured: " +serviceId; 
-    }, 
-    function(response){
-      flash.error="Component not configured: " +ServerErrorResponse.getMessage(response);
-    });
+  // ComponentsService.getComponent(sbaId).then(
+  //   //success
+  //   function(response){
+  //     $scope.sba = response;
+  //     $scope.sbaService = ComponentsService.getComponentService(sbaServiceId, $scope.sba);
+  //     if($scope.sbaService== null)
+  //       flash.error="Service not configured: " +sbaServiceId; 
+  //   }, 
+  //   function(response){
+  //     flash.error="Component not configured: " +ServerErrorResponse.getMessage(response);
+  //   });
 
   $scope.jobs = [];
 
@@ -31,6 +31,7 @@ function DashboardCtrl($scope, JobService, ComponentsService, $http, flash, Serv
     if($scope.jobs[index].executions == undefined){
       JobService.getJob($scope.jobs[index].name).then(
         function(response){
+          console.log(response);
           // if(response.executions.status!="COMPLETED" || response.executions.status!="FAILED")
           $scope.jobs[index].executions = response.executions;
         });