From 76287688a368174790e320ce4150f28939233216 Mon Sep 17 00:00:00 2001
From: Federico Igne <federico.igne@cs.ox.ac.uk>
Date: Tue, 22 Sep 2020 19:07:52 +0200
Subject: Fix RDFox query execution helper

---
 src/main/scala/rsacomb/RDFoxUtil.scala   | 17 +++++++++++------
 src/main/scala/rsacomb/RSAOntology.scala |  8 ++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'src/main/scala/rsacomb')

diff --git a/src/main/scala/rsacomb/RDFoxUtil.scala b/src/main/scala/rsacomb/RDFoxUtil.scala
index 9699fb4..d5a4dbb 100644
--- a/src/main/scala/rsacomb/RDFoxUtil.scala
+++ b/src/main/scala/rsacomb/RDFoxUtil.scala
@@ -44,9 +44,10 @@ object RDFoxUtil {
   def submitQuery(
       data: DataStoreConnection,
       prefixes: Prefixes,
-      query: String
+      query: String,
+      answers: Int
   ): Unit = {
-    println(s"\n{ $query }")
+    println(s"\nQUERY { $query }")
     val cursor = data.createCursor(
       prefixes,
       query,
@@ -54,12 +55,16 @@ object RDFoxUtil {
     );
     var mul = cursor.open()
     while (mul > 0) {
-      val res0 = cursor.getResource(0)
-      val res1 = cursor.getResource(1)
-      println(s"Answer: $res0 $res1")
+      print("Answer: ")
+      for (i <- 0 until answers) {
+        val res = cursor.getResource(i)
+        print(s"$res ")
+      }
+      println()
       mul = cursor.advance()
     }
     cursor.close();
+    println(s"QUERY END")
   }
 
   def closeConnection(
@@ -70,4 +75,4 @@ object RDFoxUtil {
     data.close();
   }
 
-} // object RDFox
+} // object RDFoxUtil
diff --git a/src/main/scala/rsacomb/RSAOntology.scala b/src/main/scala/rsacomb/RSAOntology.scala
index 30ebd3a..309106a 100644
--- a/src/main/scala/rsacomb/RSAOntology.scala
+++ b/src/main/scala/rsacomb/RSAOntology.scala
@@ -92,6 +92,14 @@ trait RSAOntology {
         "<http://127.0.0.1/E>[?X,?Y] :- <http://127.0.0.1/PE>[?X,?Y], <http://127.0.0.1/U>[?X], <http://127.0.0.1/U>[?Y] ."
       )
 
+      /* Add built-in rules
+       */
+      // data.importData(
+      //   UpdateType.ADDITION,
+      //   RSA.Prefixes,
+      //   "[?entity, a, ?superClass] :- [?entity, a, ?class], [?class, rdfs:subClassOf, ?superClass] ."
+      // )
+
       /* Add ontology rules
        */
       data.addRules(datalog.asJava)
-- 
cgit v1.2.3