Update submodules

cefriel · Feb 18, 2021 · 4d521cd · 4d521cd
1 parent f55a055
commit 4d521cd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/chimera-rml/src/main/java/com/cefriel/chimera/processor/rml/RMLConfigurator.java b/chimera-rml/src/main/java/com/cefriel/chimera/processor/rml/RMLConfigurator.java
@@ -134,7 +134,9 @@ static Mapper configure(RDFGraph graph, IRI contextIRI, RecordsFactory factory,
                 logger.debug("Base IRI set to value: " + options.getBaseIRI());
             }
             else {
-                baseIRI = ProcessorConstants.BASE_IRI_VALUE;
+                baseIRI = getBaseIRIFromMappings(options);
+                if (baseIRI == null)
+                    baseIRI = ProcessorConstants.BASE_IRI_VALUE;
             }
 
             outputStore.copyNameSpaces(initializer.getRMLStore());
@@ -166,6 +168,15 @@ static Mapper configure(RDFGraph graph, IRI contextIRI, RecordsFactory factory,
         return null;
     }
 
+    private static String getBaseIRIFromMappings(RMLOptions options) {
+        List<InputStream> lis = options.getMappings().stream()
+                .map(Utils::getInputStreamFromFileOrContentString)
+                .collect(Collectors.toList());
+        InputStream is = new SequenceInputStream(Collections.enumeration(lis));
+
+        return Utils.getBaseDirectiveTurtle(is);
+    }
+
     public static void initExecutors (RMLOptions options) {
         if(options.isConcurrentRecords())
             if (ConcurrentExecutor.executorService == null) {

diff --git a/libs/rdf-lowerer b/libs/rdf-lowerer
diff --git a/libs/rmlmapper-cefriel b/libs/rmlmapper-cefriel