[Fix] Fix processing of _pInputGraphURL parameter

kbss-cvut · Nov 24, 2021 · 85a141c · 85a141c
1 parent d7616a3
commit 85a141c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/s-pipes-web/src/main/java/cz/cvut/spipes/rest/SPipesServiceController.java b/s-pipes-web/src/main/java/cz/cvut/spipes/rest/SPipesServiceController.java
@@ -6,6 +6,7 @@
 import cz.cvut.spipes.manager.SPipesScriptManager;
 import cz.cvut.spipes.modules.Module;
 import cz.cvut.spipes.rest.util.*;
+import cz.cvut.spipes.util.JenaUtils;
 import cz.cvut.spipes.util.RDFMimeType;
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.QuerySolutionMap;
@@ -237,7 +238,7 @@ private ExecutionContext extractInputExecutionContext(final Model inputDataModel
         // FILE WHERE TO GET INPUT GRAPH
         URL inputGraphURL = null;
         if (paramHelper.hasParameterValue(P_INPUT_GRAPH_URL)) {
-            inputGraphURL = paramHelper.parseParameterValueAsUrl(P_INPUT_BINDING_URL);
+            inputGraphURL = paramHelper.parseParameterValueAsUrl(P_INPUT_GRAPH_URL);
             logParam(P_INPUT_GRAPH_URL, inputGraphURL.toString());
         }
 
@@ -257,7 +258,11 @@ private ExecutionContext extractInputExecutionContext(final Model inputDataModel
         }
         LOG.info("- input variable binding ={}", inputVariablesBinding);
 
-        return ExecutionContextFactory.createContext(inputDataModel, inputVariablesBinding);
+        Model unionModel =  Optional.ofNullable(inputGraphURL)
+            .map(url -> JenaUtils.createUnion(inputDataModel,loadModelFromUrl(url.toString())))
+            .orElse(inputDataModel);
+
+        return ExecutionContextFactory.createContext(unionModel, inputVariablesBinding);
     }
 
     private File extractOutputBindingPath(final MultiValueMap<String, String> parameters) {