Index: TECH/Iterator.cls.xml
===================================================================
diff -u -r28 -r54
--- TECH/Iterator.cls.xml	(.../Iterator.cls.xml)	(revision 28)
+++ TECH/Iterator.cls.xml	(.../Iterator.cls.xml)	(revision 54)
@@ -1,29 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="TECH.Iterator">
-<Description><![CDATA[
+<Description>
 Generic iterator interface.  Since we're not typed this interface
 is most useful as a template to quickly and consistently implement
-the right methods.
-
-De HasNext method moet zo licht mogelijk geimplementeerd worden.
-Daarvoor moet de iterator steeds op het volgende element staan.
-
-<BR/> Eg:
-<BR/> Set Iterator=##class(<i>classname</i>).%New()
-<BR/> While Iterator.HasNext() 
-<BR/> {
-<BR/> 	Set object=Iterator.Next()
-<BR/> }
-]]></Description>
+the right methods.</Description>
 <Abstract>1</Abstract>
 <ProcedureBlock>1</ProcedureBlock>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="HasNext">
 <Description>
 Returns true if the iteration has more elements.</Description>
-<Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
 </Method>
 
@@ -32,7 +20,6 @@
 Returns the next element in the iteration.
 Only returns a valid element if HasNext() returns true
 Causes an error if HasNext() returns false</Description>
-<Abstract>1</Abstract>
 <ReturnType>%CacheString</ReturnType>
 </Method>
 </Class>
Index: TECH/Files.cls.xml
===================================================================
diff -u -r28 -r54
--- TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 28)
+++ TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 54)
@@ -143,5 +143,18 @@
 	quit $$$OK
 ]]></Implementation>
 </Method>
+
+<Method name="CopyFile">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>FromPath:%String,ToPath:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ToDir = ##class(%File).GetDirectory(ToPath)
+	Set Status = ##class(%File).CreateDirectoryChain(ToDir)
+	If $$$ERROR(Status) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.FileException).%New("Kon directory structuur niet aanmaken :"_ToDir,Status)) 
+	
+	Set Status = ##class(%File).CopyFile(FromPath,ToPath)
+	If $$$ERROR(Status) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.FileException).%New("Kon bestand niet kopieren van "_FromPath_" naar "_ToPath,Status))
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: TECH/StringUtils.cls.xml
===================================================================
diff -u -r28 -r54
--- TECH/StringUtils.cls.xml	(.../StringUtils.cls.xml)	(revision 28)
+++ TECH/StringUtils.cls.xml	(.../StringUtils.cls.xml)	(revision 54)
@@ -62,5 +62,73 @@
 <Implementation><![CDATA[	Quit $ZCVT(String,"I","HTML")
 ]]></Implementation>
 </Method>
+
+<Method name="MatchesPattern">
+<Description>
+Nagaan of Input match aan het opgegeven pattern.
+Volgende mogelijkheden
+* : 0 of meer characters
+? : exact 1 character
+
+Voorbeelden
+w ##class(TECH.StringUtils).MatchesWildCard("abcmqsldkfmlsqkfjdef","abc*def")
+w ##class(TECH.StringUtils).MatchesWildCard("adm","a?m")
+w ##class(TECH.StringUtils).MatchesPattern("a1mqsfd","a?m*")
+</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Input:%String,Pattern:%String,CaseSensitive:%Boolean=0</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	new tmpPattern, PatternOK , Code
+	If ('CaseSensitive){
+		set Input = $zconvert(Input,"U"),Pattern=$zconvert(Pattern,"U")
+	}
+	set tmpPattern = ..WildCardToPattern(Pattern)
+	set Code = "set PatternOK = Input?"_tmpPattern	xecute Code
+	quit PatternOK
+]]></Implementation>
+</Method>
+
+<Method name="WildCardToPattern">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>WildCard:%String,StartWith:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	 Set NeedToEnd=0,Pattern="",EscapeChar=0
+
+	 If $E(WildCard)="§" Quit $E(WildCard,2,999) ; Zelf patternmatch ingegeven ipv van wildcard
+
+	 For Pos=1:1:$L(WildCard) Do
+	 . Set CurChar=$E(WildCard,Pos)
+	 . If (CurChar="\") && 'EscapeChar Do  Quit
+	 ..  Set EscapeChar=1
+	 . Else  If (CurChar="*") && 'EscapeChar Do
+	 ..  If NeedToEnd Do
+	 ...   Set Pattern=Pattern_""""
+	 ...   Set NeedToEnd=0
+	 ..  Set Pattern=Pattern_".E"
+	 . Else  If (CurChar="?") && 'EscapeChar Do
+	 ..  If NeedToEnd Do
+	 ...   Set Pattern=Pattern_""""
+	 ...   Set NeedToEnd=0
+	 ..  Set Pattern=Pattern_"1E"
+	 . Else  Do
+	 ..  If 'NeedToEnd Do
+	 ...   Set NeedToEnd=1
+	 ...  Set Pattern=Pattern_"1"""_CurChar
+	 ..  Else  Do
+	 ...  Set Pattern=Pattern_CurChar
+	 ..  Set EscapeChar=0
+
+	 If NeedToEnd Do
+	 . Set Pattern=Pattern_""""
+
+	 If $G(StartWith) Do
+	 . Set PatternLen=$L(Pattern)
+	 . Set:($E(Pattern,PatternLen-1,PatternLen)'=".E") Pattern=Pattern_".E"
+
+	 Quit Pattern
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: TECH/ClassInfo/ClassDefinition.cls.xml
===================================================================
diff -u -r28 -r54
--- TECH/ClassInfo/ClassDefinition.cls.xml	(.../ClassDefinition.cls.xml)	(revision 28)
+++ TECH/ClassInfo/ClassDefinition.cls.xml	(.../ClassDefinition.cls.xml)	(revision 54)
@@ -100,6 +100,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefMethod">
+<FormalSpec>MethodName:%String</FormalSpec>
+<ReturnType>TECH.ClassInfo.MethodDefinition</ReturnType>
+<Implementation><![CDATA[
+	Set Method = ""	
+	Set MethodIt = ..GeefMethods()
+	While ('$IsObject(Method) & MethodIt.HasNext()){
+		Set CurrentMethod = MethodIt.Next()
+		If (CurrentMethod.GeefNaam() = MethodName){
+			Set Method = CurrentMethod	
+		}
+	}
+	Quit Method
+]]></Implementation>
+</Method>
+
 <Method name="GeefMethods">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
Index: TECH/SourceCodeUtils.cls.xml
===================================================================
diff -u -r28 -r54
--- TECH/SourceCodeUtils.cls.xml	(.../SourceCodeUtils.cls.xml)	(revision 28)
+++ TECH/SourceCodeUtils.cls.xml	(.../SourceCodeUtils.cls.xml)	(revision 54)
@@ -70,6 +70,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsGeneratedCode">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[InternalName:%String,&GeneratedBy:%String]]></FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	set IsGeneratedCode = 0
+	
+	if ..Exists(InternalName) {
+		set Type = ..Type(InternalName) 
+		if Type = "class" {
+			set ClassName = $piece(InternalName,".",1,$length(InternalName,".")-1)
+				set ClassDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(ClassName)
+				if $IsObject(ClassDefinition) { 
+					set GeneratedBy = ClassDefinition.GeneratedBy
+					set IsGeneratedCode = $length(GeneratedBy) 
+				}
+			}
+		}	
+	
+	Quit IsGeneratedCode
+]]></Implementation>
+</Method>
+
 <Method name="IsDataType">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>InternalName:%String</FormalSpec>
Index: TECH/CSP/CSPApplicatie.cls.xml
===================================================================
diff -u -r28 -r54
--- TECH/CSP/CSPApplicatie.cls.xml	(.../CSPApplicatie.cls.xml)	(revision 28)
+++ TECH/CSP/CSPApplicatie.cls.xml	(.../CSPApplicatie.cls.xml)	(revision 54)
@@ -159,9 +159,37 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>cspFile:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
+<Implementation><![CDATA[	quit $system.CSP.GetFileName(cspFile)
+]]></Implementation>
+</Method>
 
-	quit $system.CSP.GetFileName(cspFile)
+<Method name="GenereerVolledigeURL">
+<Description>
+Geeft de volledige url terug :  http://server/csp-dir/csp-naam?querystringparams 
+vertrekkende van de gegeven CspClassName. 
+De QueryStringParameterList is een list bvb.  item1 : "key=value"  , item2 : "key2=value2"  , ... </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>CspClassName:%String,QueryStringParameterList:%ListOfDataTypes=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If '(##class(TECH.ClassUtils).ClassDerivesFrom(CspClassName,"%CSP.Page")) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("De klasse "_CspClassName_" is geen CSP-klasse"))
+	}
+	
+	Set Server=$zconvert($zu(110),"L")
+	Set CspClassURL=##class(TECH.ClassUtils).GetClassParameterValue(CspClassName,"CSPURL")
+	
+	Set QueryString=""
+	If $IsObject(QueryStringParameterList) {
+		Set ParamsIterator=##class(TECH.ListIterator).%New(QueryStringParameterList)
+		While ParamsIterator.HasNext() {
+			Set KeyValuePair=ParamsIterator.Next()
+			Set QueryString=QueryString_$S($L(QueryString):"&",1:"")_KeyValuePair
+		}
+	}
+	
+	Set URL=##class(TECH.Files).AppendFile("http://"_Server, CspClassURL)_"?"_QueryString   ; Built-in versie van Caché werkt niet : ##class(%CSP.Page).Link(CspBasisURL, .mdQueryString, 0) 
+	Quit URL
 ]]></Implementation>
 </Method>
 </Class>
Index: Tools/CompileEnumerator.cls.xml
===================================================================
diff -u -r28 -r54
--- Tools/CompileEnumerator.cls.xml	(.../CompileEnumerator.cls.xml)	(revision 28)
+++ Tools/CompileEnumerator.cls.xml	(.../CompileEnumerator.cls.xml)	(revision 54)
@@ -63,8 +63,15 @@
 			If $IsObject(ClassDefinition) {
 				If (..BevatProperty(ClassDefinition, EnumeratorKlasse))
 				{
-					Set mdToCompile(ClassName_".cls")=""
-					w "Gebruikt als property in klasse: "_ClassName,!
+					set IsGenerated = ##class(TECH.SourceCodeUtils).IsGeneratedCode(ClassName_".cls",.GeneratedBy) 
+					if IsGenerated {
+						w "Gebruikt als property in klasse "_ClassName_" ( gegenereerd door "_GeneratedBy_" )",!
+						Set mdToCompile(GeneratedBy_".cls")=""
+					}
+					else {
+					    w "Gebruikt als property in klasse: "_ClassName,!	
+					    Set mdToCompile(ClassName_".cls")=""
+					}
 				}
 				
 				If (ClassDefinition.IsWebservice())
@@ -123,10 +130,9 @@
 					}
 				}
 			}
-		}		
-	}
-	
-	Quit
+		}
+}
+Quit
 ]]></Implementation>
 </Method>
 
Index: TECH/File.cls.xml
===================================================================
diff -u -r28 -r54
--- TECH/File.cls.xml	(.../File.cls.xml)	(revision 28)
+++ TECH/File.cls.xml	(.../File.cls.xml)	(revision 54)
@@ -5,6 +5,13 @@
 <Super>%Library.File</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Method name="GeefBestandsnaam">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>BestandLocatie:%String</FormalSpec>
+<Implementation><![CDATA[	Quit ##class(%File).GetFilename(BestandLocatie)
+]]></Implementation>
+</Method>
+
 <Method name="ParentDirectoryName">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>directory:%String</FormalSpec>