fixing commit path query and adding data list structure

Author: KittyJose

lib/query/woqlCore.js

@@ -644,7 +644,7 @@ function getClauseAndRemainder(pat) {
         }
         return []
     }
-    if (pat[0] == '+' || pat[0] == ',' || pat[0] == '|') {
+    if (pat[0] == '+' || pat[0] == ',' || pat[0] == '|' || pat[0] == '*') {
         let ret = [pat[0]]
         if (pat.substring(1)) ret.push(pat.substring(1))
         return ret
@@ -655,7 +655,7 @@ function getClauseAndRemainder(pat) {
         return ret
     }
     for (var i = 1; i < pat.length; i++) {
-        if (pat[i] == ',' || pat[i] == '|' || pat[i] == '+' || pat[i] == '{')
+        if (pat[i] == ',' || pat[i] == '|' || pat[i] == '+' || pat[i] == '{' || pat[i] == '*')
             return [pat.substring(0, i), pat.substring(i)]
     }
     return [pat]
@@ -676,14 +676,17 @@ function compilePredicate(pp, q) {
         }
     } else if (pp.indexOf('<') != -1) {
         let pred = pp.slice(1, pp.length)
-        let cleaned = pred == '*' ? 'owl:topObjectProperty' : q.cleanPathPredicate(pred)
+        //let cleaned = pred == '*' ? 'owl:topObjectProperty' : q.cleanPathPredicate(pred)
+        let cleaned = q.cleanPathPredicate(pred)
         return {'@type': 'InvertedPathPredicate', 'predicate': cleaned}
     } else if (pp.indexOf('>') != -1) {
         let pred = pp.slice(0, pp.length - 1)
-        let cleaned = pred == '*' ? 'owl:topObjectProperty' : q.cleanPathPredicate(pred)
+        //let cleaned = pred == '*' ? 'owl:topObjectProperty' : q.cleanPathPredicate(pred)
+        let cleaned = q.cleanPathPredicate(pred)
         return {'@type': 'PathPredicate', 'predicate': cleaned}
     } else {
-        let pred = pp == '*' ? 'owl:topObjectProperty' : q.cleanPathPredicate(pp)
+        //let pred = pp == '*' ? 'owl:topObjectProperty' : q.cleanPathPredicate(pp)
+        let pred =  q.cleanPathPredicate(pp)
         return {'@type': 'PathPredicate', 'predicate': pred}
     }
 }
@@ -726,6 +729,12 @@ function tokensToJSON(seq, q) {
             '@type': 'PathPlus',
             'plus': tokensToJSON([seq[0]], q),
         }
+    } else if (seq[1] == '*') {
+        //binds tightest of all
+        return {
+            '@type': 'PathStar',
+            'star': tokensToJSON([seq[0]], q),
+        }
     } else if (seq[1].charAt(0) == '{') {
         //binds tightest of all
         let meat = seq[1].substring(1, seq[1].length - 1).split(',')

lib/query/woqlQuery.js

@@ -932,7 +932,7 @@ WOQLQuery.prototype.path = function(Subject, Pattern, Object, Path) {
     this.cursor['@type'] = 'Path'
     this.cursor['subject'] = this.cleanSubject(Subject)
     if (typeof Pattern == 'string') Pattern = this.compilePathPattern(Pattern)
-    this.cursor['path_pattern'] = Pattern
+    this.cursor['pattern'] = Pattern
     this.cursor['object'] = this.cleanObject(Object)
     this.cursor['path'] = this.varj(Path)
     return this
@@ -968,4 +968,4 @@ WOQLQuery.prototype.type_of = function(a, b) {
     return this
 }
 
-module.exports = WOQLQuery
+module.exports = WOQLQuery