Make query parsing more forgiving on syntax errors

1 files changed, 8 insertions, 4 deletions

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 4153fac..fe1abf7 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
@@ -260,7 +260,7 @@ object RDFoxUtil {
       path: os.Path,
       prefixes: Prefixes = new Prefixes()
   ): List[ConjunctiveQuery] = {
-    val header = raw"\^\[[Qq]uery(\d+)\]".r
+    val header = "#?\\^\\[[Qq]uery(\\d+)\\]".r
     val comment = "^#.*".r
     val queries = os.read
       .lines(path)
@@ -270,9 +270,13 @@ object RDFoxUtil {
         case (line, (acc, query)) => {
           line match {
             case header(id) => {
-              val cq =
-                ConjunctiveQuery.parse(id.toInt, query.mkString(" "), prefixes)
-              (cq :: acc, List.empty)
+              if (query.isEmpty) {
+                (acc, List.empty)
+              } else {
+                val cq =
+                  ConjunctiveQuery.parse(id.toInt, query.mkString(" "), prefixes)
+                (cq :: acc, List.empty)
+              }
             }
             case comment() => (acc, query)
             case _         => (acc, line :: query)