fixing frame stuff

Author: kevinchekovfeeney

lib/viewer/documentFrame.js

@@ -143,6 +143,9 @@ DocumentFrame.prototype.filterFrame = function(loadRenderer){
 		if(rule.compare()){
 			frame.compare = rule.compare();
 		}
+		if(rule.errors()){
+			frame.errors = rule.errors();
+		}
 	}
 	this.applyRules(false, false, myfilt);
 }
@@ -159,7 +162,7 @@ DocumentFrame.prototype.applyRules = function(doc, config, mymatch){
 		config.setFrameDisplayOptions(frame, rule);
 		if(mymatch) mymatch(frame, rule);
 	};
-	doc.filter(config.rules, onmatch);
+	doc.mfilter(config.rules, onmatch);
 }
 
 module.exports = DocumentFrame ;

lib/viewer/frameConfig.js

@@ -237,6 +237,14 @@ DocumentRule.prototype.header = function(m){
 	return this;
 }
 
+
+DocumentRule.prototype.errors = function(errs){
+	if(!errs) return this.rule.errors;
+	this.rule.errors = errs;
+	return this;
+}
+
+
 DocumentRule.prototype.headerStyle = function(m){
 	if(!m) return this.rule.headerStyle;
 	this.rule.headerStyle = m;
@@ -444,7 +452,10 @@ DocumentRule.prototype.prettyPrint = function(){
 	if(typeof this.args() != "undefined"){
 		str += ".args(" + JSON.stringify(this.args()) + ")";
 	}
-	if(typeof this.showEmpty() != "undefined"){
+	if(typeof this.errors() != "undefined"){
+		str += ".errors(" + JSON.stringify(this.errors()) + ")";
+    }
+    if(typeof this.showEmpty() != "undefined"){
 		str += ".showEmpty(" + this.show_empty() + ")";
 	}
 	if(typeof this.dataviewer() != "undefined"){

lib/viewer/objectFrame.js

@@ -217,10 +217,15 @@ ObjectFrame.prototype.clear = function () {
 /*
  * Filters the frame and its children
  */
-ObjectFrame.prototype.filter = function (rules, onmatch) {
+ObjectFrame.prototype.mfilter = function (rules, onmatch) {
 	var hits = new FrameRule().testRules(rules, this, onmatch);
 	for (const prop of Object.keys(this.properties)) {
-		this.properties[prop].filter(rules, onmatch);
+        if(!this.properties[prop].mfilter){
+            console.log(prop, this.properties[prop])
+        }
+        else {
+            this.properties[prop].mfilter(rules, onmatch);
+        }
 	}
 	return this;
 };
@@ -420,20 +425,21 @@ ObjectFrame.prototype.removePropertyValue = function (prop, value, index) {
 };
 
 ObjectFrame.prototype.error = function (msg) {
-	console.error(msg);
-};
+    if(!this.errors) this.errors = []
+    this.errors.push({"type": "Internal Object Frame Error", msg})
+}
 
 ObjectFrame.prototype.extract = function(){
     var extracts = {};
 	for(var prop in this.properties){
-        if(!Array.isArray(this.properties[prop])) this.properties[prop] = [this.properties[prop]]
-		for(var i = 0; i<this.properties[prop].length; i++){
-            var extracted = this.properties[prop][i].extract();
+        //if(!Array.isArray(this.properties[prop])) this.properties[prop] = [this.properties[prop]]
+		//for(var i = 0; i<this.properties[prop].length; i++){
+            var extracted = this.properties[prop].extract();
 			if(!FrameHelper.empty(extracted)){
 				if(typeof extracts[prop] == "undefined") extracts[prop] = [];
 				extracts[prop] = extracts[prop].concat(extracted);
 			}
-        }
+        //}
         if(extracts[prop] && extracts[prop].length == 1) extracts[prop] = extracts[prop][0] 
 	}
 	if(FrameHelper.empty(extracts) && this.parent){
@@ -817,10 +823,10 @@ PropertyFrame.prototype.createEmpty = function(){
 	}
 }
 
-PropertyFrame.prototype.filter = function (rules, onmatch) {
+PropertyFrame.prototype.mfilter = function (rules, onmatch) {
 	var hits = new FrameRule().testRules(rules, this, onmatch);
 	for (var i = 0; i<this.values.length; i++){
-		this.values[i].filter(rules, onmatch);
+		this.values[i].mfilter(rules, onmatch);
 	}
 	return this;
 }
@@ -941,7 +947,7 @@ DataFrame.prototype.copy = function (newid) {
 	return copy;
 };
 
-DataFrame.prototype.filter = function (rules, onmatch) {
+DataFrame.prototype.mfilter = function (rules, onmatch) {
 	var hits = new FrameRule().testRules(rules, this, onmatch);
 	return this;
 };
@@ -1036,7 +1042,9 @@ ObjectFrame.prototype.getComment = DataFrame.prototype.getComment;
 
 
 DataFrame.prototype.error = function (msg) {
-	if (msg)	this.err = msg;
+    if (msg) this.err = msg;
+    if(!this.errors) this.errors = []
+    this.errors.push({"type": "Internal Data Frame Error", msg})    
 	return this.err;
 };