Updated to consolidated user defined functions system

SmartDataAnalytics · Sep 20, 2024 · 0777a58 · 0777a58
1 parent 3ef8995
commit 0777a58
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docs/examples/macros.ttl b/docs/examples/macros.ttl
@@ -1,4 +1,4 @@
-PREFIX udf: <http://ns.aksw.org/jena/udf/>
+PREFIX udf: <https://w3id.org/aksw/norse#udf.>
 
 # Reuse of shacl's prefix vocabulary
 PREFIX sh: <http://www.w3.org/ns/shacl#>

diff --git a/docs/sparql-extensions/service-enhancer.md b/docs/sparql-extensions/service-enhancer.md
@@ -1,7 +1,7 @@
 ---
 title: Service Enhancer
 parent: SPARQL Extensions
-nav_order: 20
+nav_order: 100
 layout: default
 ---
 

diff --git a/...toolkit-cli/src/main/java/org/aksw/sparql_integrate/cli/main/SparqlIntegrateCmdImpls.java b/...toolkit-cli/src/main/java/org/aksw/sparql_integrate/cli/main/SparqlIntegrateCmdImpls.java
@@ -42,7 +42,6 @@
 import org.aksw.jena_sparql_api.sparql.ext.url.E_IriAsGiven.ExprTransformIriToIriAsGiven;
 import org.aksw.jena_sparql_api.sparql.ext.url.F_BNodeAsGiven.ExprTransformBNodeToBNodeAsGiven;
 import org.aksw.jena_sparql_api.sparql.ext.url.JenaUrlUtils;
-import org.aksw.jena_sparql_api.user_defined_function.UserDefinedFunctions;
 import org.aksw.jenax.arq.picocli.CmdMixinArq;
 import org.aksw.jenax.arq.util.dataset.HasDataset;
 import org.aksw.jenax.arq.util.query.QueryTransform;
@@ -72,6 +71,7 @@
 import org.aksw.jenax.graphql.rdf.api.RdfGraphQlExecFactory;
 import org.aksw.jenax.graphql.sparql.GraphQlExecFactoryOverSparql;
 import org.aksw.jenax.graphql.sparql.v2.api.high.GraphQlExecFactory;
+import org.aksw.jenax.model.udf.util.UserDefinedFunctions;
 import org.aksw.jenax.sparql.query.rx.RDFDataMgrEx;
 import org.aksw.jenax.stmt.core.SparqlStmt;
 import org.aksw.jenax.stmt.core.SparqlStmtMgr;
@@ -584,7 +584,7 @@ public static int sparqlIntegrate(CmdSparqlIntegrateMain cmd) throws Exception {
         Map<String, UserDefinedFunctionDefinition> udfRegistry = new LinkedHashMap<>();
         for (String macroSource : cmd.macroSources) {
             Model model = RDFDataMgr.loadModel(macroSource);
-            SparqlStmtMgr.execSparql(model, "udf-inferences.sparql");
+            SparqlStmtMgr.execSparql(model, "udf-inferences.rq");
             Map<String, UserDefinedFunctionDefinition> contrib = UserDefinedFunctions.load(model, macroProfiles);
             udfRegistry.putAll(contrib);
         }