fixed some bugeens

Author: kevinchekovfeeney

lib/viewer/documentFrame.js

@@ -153,21 +153,38 @@ DocumentFrame.prototype.setErrors = function(errors, frameconf){
     for(var i = 0; i<errors.length; i++){
         addRuleForVio(frameconf, errors[i])
     }
-	this.applyRules(false, frameconf);   
+    var myfilt = function(frame, rule){
+        if(rule.errors()){
+			frame.errors = frame.errors ? frame.errors.concat(rule.errors()) : rule.errors();
+        }
+    }
+	this.applyRules(false, frameconf, myfilt);   
 }
 
 DocumentFrame.prototype.clearErrors = function(frameconf){
-    frameconf.all().errors(false)
-    this.applyRules(false, frameconf)
+    frameconf.all()
+    var myfilt = function(frame, rule){
+        if(frame.errors) delete(frame.errors)
+    }
+    this.applyRules(false, frameconf, myfilt)
+    frameconf.rules = []
 }
 
 function addRuleForVio(docview, error){
-    let prop = (error['api:property'] ? error['api:property']["@value"] : false)
-    let subj = (error['api:subject'] ? error['api:subject']["@value"] : false)
-    let val = (error['api:value'] ? error['api:value']["@value"] : false)
-    let type = (error['api:type'] ? error['api:type']["@value"] : false)
+    let prop = (error['vio:property'] ? error['vio:property']["@value"] : false)
+    let subj = (error['vio:subject'] ? error['vio:subject']["@value"] : false)
+    let msg = (error['vio:message'] ? error['vio:message']["@value"] : false)
+    let val = (error['api:value'] ? error['api:value'] : false)
+    if(val && val[0] == '"' && val[val.length-1] == '"')
+        val = val.substring(1, val.length-1)
+    let type = (error['api:type'] ? error['api:type'] : false)
     if(type && val){ //api:BadCast
-        docview.data().value(val).range(type).errors([error])
+        docview.data().value(val).type(type).errors([error])
+    }
+    if(prop && subj){//untypedInstanceViolation
+        let shrt = FrameHelper.shorten(subj)
+        if(shrt.substring(0, 5) == "woql:") shrt == shrt.substring(5)
+        docview.data().property(prop).value(shrt, subj).errors([error])
     }
 }
 

lib/viewer/frameRule.js

@@ -102,6 +102,16 @@ FrameRule.prototype.range = function(...prop){
     return this;
 }
 
+/**
+ * Specifies that only one from among the list of range types will match
+ */
+FrameRule.prototype.value = function(...prop){
+    if(!prop || prop.length == 0) return this.pattern.value;
+    this.pattern.value = prop;
+    return this;
+}
+
+
 /**
  * Specifies that only frames of the specified depth will match the rule
  */
@@ -404,8 +414,8 @@ FramePattern.prototype.checkProperty = function (rtype, frame) {
  */
 FramePattern.prototype.checkType = function (rtype, frame) {
 	if(rtype == "object") var vs = frame.subjectClass();
-	else var vs = frame.range();
-	if(!Array.isArray(this.type)) this.type = [this.type];
+	else var vs = typeof frame.range == "function" ? frame.range() : frame.range;
+    if(!Array.isArray(this.type)) this.type = [this.type];
 	if(this.type.indexOf(vs) === -1) return false;
 	return true;
 }
@@ -423,7 +433,7 @@ FramePattern.prototype.checkValue = function (rtype, frame) {
 	if (typeof this.value !== 'object' || !this.value.length) this.value = [this.value];
 	for (let i = 0; i < this.value.length; i++) {
 		if (rtype == 'data') {
-			if (this.valuesMatch(frame.value(), this.value[i])) {
+			if (this.valuesMatch(frame.get(), this.value[i])) {
 				return true;
 			}
 		} else if (rtype == 'property') {