From 0f52fea098088d8e90410b97213f60c52407f8ff Mon Sep 17 00:00:00 2001
From: Federico Igne <git@federicoigne.com>
Date: Wed, 1 Sep 2021 13:14:23 +0100
Subject: Update RDFox library to 5.2.1

---
 src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala    |  1 +
 .../uk/ac/ox/cs/rsacomb/converter/Normalizer.scala      | 17 +++++++++--------
 src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala |  3 ++-
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
index 869dd88..0c88f7f 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -518,6 +518,7 @@ class RSAOntology(axioms: List[OWLLogicalAxiom], datafiles: List[File])
       /* Generate `named` predicates */
       RDFoxUtil.addFacts(data, (individuals ++ literals) map RSA.Named)
       data.evaluateUpdate(
+        null, // the base IRI for the query (if null, a default is used)
         RSA.Prefixes,
         "INSERT { ?X a  rsa:Named } WHERE { ?X a owl:Thing }",
         new java.util.HashMap[String, String]
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala
index c24f99d..33cb715 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/converter/Normalizer.scala
@@ -599,13 +599,14 @@ class Normalizer() {
     }
 
   /** Non supported axioms */
-  private def notSupported(axiom: OWLLogicalAxiom): Seq[OWLLogicalAxiom] =
-    // Logger.print(
-    //   s"'$axiom' has been ignored because it is not in Horn-ALCHOIQ",
-    //   Logger.VERBOSE
-    // )
-    // Seq()
-    throw new RuntimeException(
-      s"'$axiom' is not currently supported."
+  private def notSupported(axiom: OWLLogicalAxiom): Seq[OWLLogicalAxiom] = {
+    Logger.print(
+      s"'$axiom' has been ignored because it is not in Horn-ALCHOIQ",
+      Logger.VERBOSE
     )
+    Seq()
+    // throw new RuntimeException(
+    //   s"'$axiom' is not currently supported."
+    // )
+  }
 }
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala
index a9027cf..3d67270 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala
@@ -84,8 +84,9 @@ object RDFoxUtil {
     val password = ""
     val server =
       ConnectionFactory.newServerConnection(serverUrl, role, password)
+    opts.put("type", "par-complex-nn")
     if (!server.containsDataStore(datastore))
-      server.createDataStore(datastore, "par-complex-nn", opts)
+      server.createDataStore(datastore, opts)
     val data = server.newDataStoreConnection(datastore)
     (server, data)
   }
-- 
cgit v1.2.3