Index: EXT/Optima/String.cls.xml
===================================================================
diff -u -r32001 -r32003
--- EXT/Optima/String.cls.xml	(.../String.cls.xml)	(revision 32001)
+++ EXT/Optima/String.cls.xml	(.../String.cls.xml)	(revision 32003)
@@ -2,6 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="EXT.Optima.String">
 <ClassType>datatype</ClassType>
+<ProcedureBlock>0</ProcedureBlock>
 <Super>%String,EXT.Optima.Parameters</Super>
 
 <Method name="IsValid">
@@ -12,9 +13,51 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>0</ServerOnly>
 <Implementation><![CDATA[
-	if %parameter("OptimaEnu")'="" { $$$GENERATE($$$TAB_"quit $classmethod("""_%parameter("OptimaEnu")_""",""IsValid"",%val)") }
-	$$$GENERATE($$$TAB_"quit 1")
-	quit $$$OK
+			#; Validate MAXLEN parameter - either NULL, "", or a positive integer
+	If ($Get(%parameter("MAXLEN")) '= "") && (('$isvalidnum(%parameter("MAXLEN"),,1)) || (((+%parameter("MAXLEN")\1)) '= +%parameter("MAXLEN"))) { Quit $$$ERROR($$$DatatypeParameterIntegerNotPositive,%class_"::"_%property,"MAXLEN",%parameter("MAXLEN")) }
+		#; If subclass has a IsValidDT then call this
+	If %property'="",$$$comSubMemberDefined(%class,$$$cCLASSproperty,%property,$$$cPROPmethod,"IsValidDT"),$$$comSubMemberKeyGet(%class,$$$cCLASSproperty,%property,$$$cPROPmethod,"IsValidDT",$$$cXXXXorigin)'="%Library.DataType" {
+		Set %codemode=$$$cMETHCODEMODEEXPRESSION
+		Set %code="$select(##class("_%class_")."_%property_"IsValidDT(%val):1,1:$$$ERROR($$$DTFailure,%val))"
+		Quit $$$OK
+	}
+	n err,flag,sep,str
+	s %code=0
+	s %codemode=$$$cMETHCODEMODEEXPRESSION
+	i %parameter("VALUELIST")'="" d   QUIT $$$OK
+	. s sep=$e(%parameter("VALUELIST")) ;for now
+	. s %code="$select(%val'["""_sep_"""&&("_$$$quote(%parameter("VALUELIST")_sep)_"[("""_sep_"""_%val_"""_sep_""")):$$$OK,1:$$$ERROR($$$DTValueList,%val,"_$$$quote(%parameter("VALUELIST"))_"))"
+	s str="",err=""
+	If %parameter("MINLEN")'="" {
+		Set str=str_"($s(%val'=$c(0):$length(%val),1:0)'<"_(+%parameter("MINLEN"))_")"
+		If %parameter("PATTERN")="",%parameter("MAXLEN")=""||(%parameter("TRUNCATE")) {
+			Set err="1"
+		} Else {
+			Set err="$s(%val'=$c(0):$length(%val),1:0)<"_(+%parameter("MINLEN"))
+		}
+		Set err=err_":$$$ERROR($$$DTMinLen,%val,"_(+%parameter("MINLEN"))_")"
+	}
+	If '%parameter("TRUNCATE"),%parameter("MAXLEN")'="" {
+		Set str=str_"&&($length(%val)'>"_(+%parameter("MAXLEN"))_")"
+		If %parameter("PATTERN")="" {
+			Set err=err_$select(err="":"",1:",")_"1"
+		} Else {
+			Set err=err_$select(err="":"",1:",")_"$length(%val)>"_(+%parameter("MAXLEN"))
+		}
+		Set err=err_":$$$ERROR($$$DTMaxLen,%val,"_(+%parameter("MAXLEN"))_")"
+	}
+	If %parameter("PATTERN")'="" Set str=str_"&&(%val?"_%parameter("PATTERN")_")",err=err_$select(err="":"",1:",")_"1:$$$ERROR($$$DTPattern,%val,"_$$$quote(%parameter("PATTERN"))_")"
+	i str="" s %code=1 QUIT $$$OK
+	i $e(str,1,2)="&&" s str=$e(str,3,*)
+	s %code="$select("_str_":1,"_err_")"
+	
+	new ValueList
+	if %parameter("OptimaEnu")'="" d  quit $$$OK
+	. set ValueList = ##class(TECH.ClassUtils).GetClassParameterValue(%parameter("OptimaEnu"),"VALUELIST")
+	. set sep = $e(ValueList)
+	. s %code="$select(%val'["""_sep_"""&&("_$$$quote(ValueList_sep)_"[("""_sep_"""_%val_"""_sep_""")):$$$OK,1:$$$ERROR($$$DTValueList,%val,"_$$$quote(ValueList)_"))"
+
+	QUIT $$$OK
 ]]></Implementation>
 </Method>
 </Class>