Browse Source

synchronize changes

Christophe Debruyne 5 years ago
parent
commit
2b83becde9
4 changed files with 9 additions and 4 deletions
  1. 1 1
      README.md
  2. 5 0
      pom.xml
  3. 2 2
      src/r2rml/Main.java
  4. 1 1
      test/resources/CSV02.mapping.ttl

+ 1 - 1
README.md

@@ -102,7 +102,7 @@ This implementation of R2RML re-implemented the ideas presented in [1], allowing
 ```
 
 ## License
-This implementation of R2RML is written by [Christophe Debruyne](http://www.christophedebruyne.be/).
+This implementation of R2RML is written by [Christophe Debruyne](http://www.christophedebruyne.be/). This repository contains the changes contained at [https://github.com/chrdebru/r2rml](https://github.com/chrdebru/r2rml).
 
 This code is copyrighted by [ADAPT - Trinity College Dublin](http://www.adaptcentre.ie/) and released under the [MIT license](http://opensource.org/licenses/MIT).
 

+ 5 - 0
pom.xml

@@ -128,6 +128,11 @@
 			<artifactId>ojdbc7</artifactId>
 			<version>12.1.0.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.drill.exec</groupId>
+			<artifactId>drill-jdbc</artifactId>
+			<version>1.13.0</version>
+		</dependency>
 		<!-- h2 allows us to create tables from CSV files in an easy way -->
 		<dependency>
 			<groupId>com.h2database</groupId>

+ 2 - 2
src/r2rml/Main.java

@@ -39,8 +39,8 @@ public class Main {
 
 			Configuration configuration = new Configuration(args[0]);
 
-			if(configuration.getConnectionURL() == null) {
-				throw new R2RMLException("A connection URL is mandatory.", null);
+			if(configuration.getConnectionURL() == null && configuration.getCSVFiles().size() == 0) {
+				throw new R2RMLException("A connection URL or CVS files are mandatory.", null);
 			}
 
 			if(configuration.getMappingFile() == null) {

+ 1 - 1
test/resources/CSV02.mapping.ttl

@@ -4,7 +4,7 @@
 <#TriplesMap1>
     rr:logicalTable [ rr:tableName "EMP" ];
     rr:subjectMap [
-        rr:template "http://data.example.com/employee/{EMPNO}";
+        rr:template "http://data.example.com/employee/{EMP NO}";
     ];
 	rr:predicateObjectMap [
 		rr:predicate ex:department;