updated tripleGeo

Author: alegrm

pom.xml

@@ -284,35 +284,5 @@
 		</plugins>
 	</build>
 
-	<profiles>
-		<profile>
-			<id>deb-pkg</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<configuration>
-							<tasks>
-								<echo message="Creating debian package">
-								</echo>
-								<exec dir="${basedir}/deb-package" executable="${basedir}/deb-package/build_debpkg.sh"
-									failonerror="true">
-								</exec>
-							</tasks>
-						</configuration>
-						<executions>
-							<execution>
-								<id>deb-pkg</id>
-								<phase>package</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+
 </project>

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

@@ -41,8 +41,8 @@ public class ImportRdf {
   public ImportRdf(@Context ServletContext context) {
 
     filePath =
-        context.getRealPath(File.separator) + File.separator
-            + context.getInitParameter("file-upload") + File.separator;
+        context.getRealPath(File.separator) + context.getInitParameter("file-upload")
+            + File.separator;
     filePath = "file:///" + filePath.replace("\\", "/");
     filePath = filePath.replace(" ", "%20");
     log.info("Uploading directory: " + filePath);

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

@@ -121,7 +121,7 @@
 :TripleGeoService
       a       lds:ExtractionService ;
       rdfs:label "Triple-Geo" ;
-      lds:serviceUrl <http://localhost:8080/TripleGeo-Service> .
+      lds:serviceUrl <http://localhost:8080/triplegeo-service> .
 
 :DEER
       a       lds:StackComponent ;

src/main/webapp/index.html

@@ -5,8 +5,8 @@
   <meta charset="utf-8">
   <title>GeoKnow Generator</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="description" content="" />
-  <meta name="author" content="GeoKnow EU project FP7" />
+  <meta name="description" content="GeoKnow Generator EU project FP7" />
+  <meta name="author" content="Ontos AG" />
 
   <!-- Le styles -->
   <link href="lib/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet" />
@@ -142,19 +142,24 @@
   <script src="lib/bootstrap-slider/bootstrap-slider.js"></script>
   <script src="lib/ui-bootstrap/ui-bootstrap-tpls-0.11.2.min.js"></script>
 
-  <!-- Misc -->
-  <script src="lib/ng-file-upload/4.0.0/ng-file-upload-shim.min.js"></script> 
-  <script src="lib/ng-file-upload/4.0.0/ng-file-upload.min.js"></script> 
+  <!-- Angular Misc -->
+  <script src="lib/ng-file-upload/9.0.0/ng-file-upload-shim.min.js"></script> 
+  <script src="lib/ng-file-upload/9.0.0/ng-file-upload.min.js"></script> 
   <script src="lib/http-auth-interceptor.js"></script>
   <script src="lib/xml2json.min.js"></script>
   <script src="lib/angular-flash/angular-flash.min.js"></script>
   <script src="lib/angular-loading-bar/loading-bar.js"></script>
-<!-- 
-  <script src="lib/angular-file-upload-master/2.1.1/angular-file-upload-shim.min.js"></script>
-  <script src="lib/angular-file-upload-master/2.1.1/angular-file-upload.min.js"></script>
-  <script src="lib/angular-file-upload-master/2.1.1/FileAPI.min.js"></script>
- -->
- 
+
+  <!-- RDF parser for DEER -->
+  <script src="lib/rdf/Builtins.js"></script>
+  <script src="lib/rdf/Default.js"></script>
+  <script src="lib/rdf/Graph.js"></script>
+  <script src="lib/rdf/Profile.js"></script>
+  <script src="lib/rdf/rdf.js"></script>
+  <script src="lib/rdf/RDFEnvironment.js"></script>
+  <script src="lib/rdf/RDFNode.js"></script>
+  <script src="lib/rdf/TurtleParser.js"></script>
+
   <!-- services for the different modules/pages -->
   <script src="js/app.js"></script>
   <script src="js/services/config.js"></script>

src/main/webapp/js/workbench/classification-and-enrichment/deer-controller.js

@@ -6,7 +6,7 @@
 *
 ***************************************************************************************************/
 
-var DeerCtrl = function($scope, $http, ConfigurationService, ComponentsService, flash, ServerErrorResponse, $window, AccountService, GraphService){
+var DeerCtrl = function($scope, $http, ConfigurationService, ComponentsService, flash, ServerErrorResponse, $window, AccountService, GraphService, Ns, $modal, JobService, AuthSessionService){
 
 	var componentId ="DEER";
 	var serviceId = "DEERService";

src/main/webapp/js/workbench/extraction-and-loading/import-rdf-controller.js

@@ -32,8 +32,7 @@ var ImportFormCtrl = function($scope, $http, ConfigurationService, flash, Accoun
 
 
     $scope.endpoints = ConfigurationService.getAllEndpoints();
-    $scope.uploadMessage = '';
-
+    $scope.uploadMessage = "";
     $scope.sourceType = "";
 
     // source can be : file, url, endpoint or graph
@@ -233,7 +232,7 @@ var ImportFormCtrl = function($scope, $http, ConfigurationService, flash, Accoun
 
     initialise();
 
-    $scope.importFile.files = [];
+    $scope.importFile.files = null;
     $scope.urlForm.$setPristine();
     $scope.fileForm.$setPristine();
     $scope.endpointForm.$setPristine();