Merge branch 'dev' of https://github.com/terminusdb/terminus-client into dev

Author: KittyJose

lib/query/woqlCore.js

@@ -257,15 +257,26 @@ WOQLQuery.prototype.cleanPredicate = function(p) {
         return '' + p
     }
     if (p.indexOf(':') != -1) pred = p
-    else if (this.vocab && this.vocab[p]) pred = this.vocab[p]
+    else if (this.wellKnownPredicate(p) ) pred = this.vocab[p]
     else pred = 'scm:' + p
     return this.expandVariable(pred)
 }
 
+WOQLQuery.prototype.wellKnownPredicate = function(p) {
+    if (this.vocab && this.vocab[p]){
+        let full = this.vocab[p]
+        let start = full.substring(0, 3)
+        if(full == "system:abstract" || start == "xdd" || start == "xsd") return false
+        return true
+    }
+    return false
+}
+
+
 WOQLQuery.prototype.cleanPathPredicate = function(p) {
     let pred = false
     if (p.indexOf(':') != -1) pred = p
-    else if (this.vocab && this.vocab[p]) pred = this.vocab[p]
+    else if (this.wellKnownPredicate(p) ) pred = this.vocab[p]
     else pred = 'scm:' + p
     return pred
 }