Mask and MaxLength conditions

Author: eduard93

isc/py/data/Context.cls

@@ -61,7 +61,7 @@ Method PopulateModules() As %Status
 }
 
 /// Get variables and their values.
-Method PopulateVariables() As %Status
+Method PopulateVariables(maxLength As %Integer = {$$$MaxStringLength}, mask As %String = "*") As %Status
 {
 	#dim sc As %Status = $$$OK
 
@@ -73,9 +73,13 @@ Method PopulateVariables() As %Status
 	set iterator = variables.%GetIterator()
 	while iterator.%GetNext(.key, .variable) {
 		#dim varObj As isc.py.data.Varable
-		set sc = ##class(isc.py.data.Variable).SaveVariable(variable, .varObj)
-		quit:$$$ISERR(sc)
-		do ..Variables.Insert(varObj)
+		kill varObj
+		if ##class(isc.py.util.Matcher).MatchOr(variable, mask) {
+			set sc = ##class(isc.py.data.Variable).SaveVariable(variable, maxLength, .varObj)
+			quit:$$$ISERR(sc)
+			do:$isObject($g(varObj)) ..Variables.Insert(varObj)
+		}
+
 	}
 
 	quit sc
@@ -98,8 +102,8 @@ Method Init()
 
 /// Save Python context on disk
 /// context - resulting context
-/// maxLength - maximum length of saved variable. If veriable serialization is longer than that, it would be ignored. Overrides mask. Set to 0 to get them all.
-/// mask - commaseparated list of variables to save. Special symbols * and ? are recognized.
+/// maxLength - maximum length of saved variable. If veriable serialization is longer than that, it would be ignored. Set to 0 to get them all.
+/// mask - comma separated list of variables to save. Special symbols * and ? are recognized. Set to * to get them all.
 /// set sc=##class(isc.py.data.Context).SaveContext()
 ClassMethod SaveContext(Output context As isc.py.data.Context, maxLength As %Integer = {$$$MaxStringLength}, mask As %String = "*", verbose As %Boolean = {$$$NO}) As %Status
 {
@@ -109,7 +113,7 @@ ClassMethod SaveContext(Output context As isc.py.data.Context, maxLength As %Int
 	//do obj.PopulateHistory()
 	set sc = context.PopulateModules()
 	quit:$$$ISERR(sc) sc
-	set sc = context.PopulateVariables()
+	set sc = context.PopulateVariables(maxLength, mask)
 	quit:$$$ISERR(sc) sc
 	do:verbose context.Display()
 

isc/py/data/Variable.cls

@@ -20,8 +20,9 @@ Property Pickle As %Stream.GlobalCharacter;
 Property JSON As %Stream.GlobalCharacter;
 
 /// Save variable on disk.
+/// Do not save if length > maxLength
 /// zw ##class(isc.py.data.Variable).SaveVariable()
-ClassMethod SaveVariable(variable As %String = "", Output obj As isc.py.data.Variable) As %Status
+ClassMethod SaveVariable(variable As %String = "", maxLength As %Integer = {$$$MaxStringLength}, Output obj As isc.py.data.Variable) As %Status
 {
 	#include Ensemble
 	kill obj
@@ -30,8 +31,8 @@ ClassMethod SaveVariable(variable As %String = "", Output obj As isc.py.data.Var
 	//$$$TRACE(variable)
 
 	set sc = ##class(isc.py.Main).GetVariableInfo(variable, ##class(isc.py.Callout).#SerializationRepr, .defined, .type, .length)
-	quit:$$$ISERR(sc) sc
-	quit:'defined $$$ERROR($$$GeneralError, "Variable '" _ variable _ "' is not defined")
+	quit:(($$$ISERR(sc)) || ((maxLength>0) && (length>maxLength))) sc
+	quit:'defined $$$ERROR($$$GeneralError, "Variable '" _ variable _ "' is not defined")	
 
 	#dim repr, pickle, json As %Stream.GlobalCharacter
 

isc/py/ens/Operation.cls

@@ -57,7 +57,7 @@ Method SaveContext(request As isc.py.msg.SaveRequest, Output response As Ens.Str
 {
 	#dim sc As %Status = $$$OK
 	#dim context As isc.py.data.Context
-	set sc = ##class(isc.py.data.Context).SaveContext(.context)
+	set sc = ##class(isc.py.data.Context).SaveContext(.context, request.MaxLength, request.Mask)
 	quit:$$$ISERR(sc) sc
 
 	set context.Name = request.Name

isc/py/msg/SaveRequest.cls

@@ -2,10 +2,17 @@
 Class isc.py.msg.SaveRequest Extends Ens.Request
 {
 
-/// TODO Only variables that satisfy Mask are saved.
-/// Wildcards * and ? are accepted, masks are commaseparated.
+/// Comma-separated list of variables to save.
+/// Only variables that satisfy Mask are saved.
+/// Wildcards * and ? are accepted.
+/// Example: "Data*,Figure?"
 Property Mask As %VarString [ InitialExpression = "*" ];
 
+/// Maximum length of saved variable. 
+/// If veriable serialization is longer than that, it would be ignored. 
+/// Set to 0 to get them all.
+Property MaxLength As %Integer [ InitialExpression = {$$$MaxStringLength} ];
+
 /// Short name for the context.
 Property Name As %String;
 
@@ -25,6 +32,9 @@ Storage Default
 <Value name="3">
 <Value>Description</Value>
 </Value>
+<Value name="4">
+<Value>MaxLength</Value>
+</Value>
 </Data>
 <DefaultData>SaveRequestDefaultData</DefaultData>
 <Type>%Library.CacheStorage</Type>