From 57444fcc686472e1c5bd7a1dca0606f6b6ca498f Mon Sep 17 00:00:00 2001
From: Federico Igne <federico.igne@cs.ox.ac.uk>
Date: Thu, 25 Nov 2021 17:26:38 +0000
Subject: Ignore unparsable queries and notify the user

---
 src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala         |  3 ++-
 .../scala/uk/ac/ox/cs/rsacomb/util/RDFoxUtil.scala    | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
index 3aa81a7..2daa634 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
@@ -57,7 +57,8 @@ object RSAComb extends App {
   if (config contains 'queries) {
     val queries =
       RDFoxUtil.loadQueriesFromFiles(
-        config('queries).get[List[os.Path]]
+        config('queries).get[List[os.Path]],
+        RSA.Prefixes
       )
 
     val answers = rsa ask queries
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 fe1abf7..6e10b30 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
@@ -317,13 +317,18 @@ object RDFoxUtil {
       query: String,
       prefixes: Prefixes = new Prefixes()
   ): Option[SelectQuery] = {
-    val parser = new SPARQLParser(
-      prefixes,
-      new StringReader(query)
-    )
-    parser.parseSingleQuery() match {
-      case q: SelectQuery => Some(q)
-      case _              => None
+    val parser = new SPARQLParser(prefixes, new StringReader(query))
+    try {
+      parser.parseSingleQuery() match {
+        case q: SelectQuery => Some(q)
+        case _              => None
+      }
+    } catch {
+      /* Just ignore unparsable queries */
+      case error: Throwable => {
+        Logger print s"Unable to parse '$query' due to error '$error'"
+        None
+      }
     }
   }
 
-- 
cgit v1.2.3