From 60876ada5b19bcdd02bef1f53992ae324b0e3670 Mon Sep 17 00:00:00 2001 From: Federico Igne Date: Wed, 18 Nov 2020 18:18:32 +0000 Subject: Change IRI prefix for internal resources --- src/main/scala/rsacomb/RSA.scala | 2 +- src/main/scala/rsacomb/RSAOntology.scala | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/main/scala/rsacomb/RSA.scala b/src/main/scala/rsacomb/RSA.scala index 1b2aa9c..3a37a87 100644 --- a/src/main/scala/rsacomb/RSA.scala +++ b/src/main/scala/rsacomb/RSA.scala @@ -26,7 +26,7 @@ import scala.collection.JavaConverters._ object RSA { val Prefixes: Prefixes = new Prefixes() - Prefixes.declarePrefix("rsa:", "http://127.0.0.1/") + Prefixes.declarePrefix("rsa:", "http://www.cs.ox.ac.uk/isg/rsa/") private def atom(name: IRI, vars: List[Term]) = TupleTableAtom.create(TupleTableName.create(name.getIRI), vars: _*) diff --git a/src/main/scala/rsacomb/RSAOntology.scala b/src/main/scala/rsacomb/RSAOntology.scala index 1a5e4ca..53bc560 100644 --- a/src/main/scala/rsacomb/RSAOntology.scala +++ b/src/main/scala/rsacomb/RSAOntology.scala @@ -164,7 +164,7 @@ class RSAOntology(val ontology: OWLOntology) extends RSAAxiom { data.importData( UpdateType.ADDITION, RSA.Prefixes, - "[?X,?Y] :- [?X,?Y], [?X], [?Y] ." + "rsa:E[?X,?Y] :- rsa:PE[?X,?Y], rsa:U[?X], rsa:U[?Y] ." ) /* Add built-in rules @@ -252,13 +252,9 @@ class RSAOntology(val ontology: OWLOntology) extends RSAAxiom { data: DataStoreConnection ): Graph[Resource, UnDiEdge] = { val query = "SELECT ?X ?Y WHERE { ?X rsa:E ?Y }" - val cursor = - data.createCursor(RSA.Prefixes, query, new HashMap[String, String]()); - var mul = cursor.open() - var edges: List[UnDiEdge[Resource]] = List() - while (mul > 0) { - edges = UnDiEdge(cursor.getResource(0), cursor.getResource(1)) :: edges - mul = cursor.advance() + val answers = RDFoxHelpers.submitSelectQuery(data, query, RSA.Prefixes) + var edges: List[UnDiEdge[Resource]] = answers.map { + case n1 :: n2 :: _ => UnDiEdge(n1, n2) } Graph(edges: _*) } -- cgit v1.2.3