Index: TECH/Files.cls.xml
===================================================================
diff -u -r3417 -r3418
--- TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 3417)
+++ TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 3418)
@@ -60,18 +60,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GetResultSetForDirectory">
+<FormalSpec>Directory:%String,FileMask:%String</FormalSpec>
+<ReturnType>%ResultSet</ReturnType>
+<Implementation><![CDATA[
+	set rset = ##class(%ResultSet).%New("%File:FileSet")
+	do rset.Execute(Directory,FileMask,"",1)
+	quit rset
+]]></Implementation>
+</Method>
+
 <Method name="GetFileList">
 <FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0,NumberOfFiles:%Numeric=0</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	set rset = ##class(%ResultSet).%New("%File:FileSet")
-	do rset.Execute(Directory,FileMask,"",1)
+	#dim rset as %ResultSet = ..GetResultSetForDirectory(Directory,FileMask)
 	#dim ContinueLoop as %Boolean = $$$True
 	while (rset.Next() & ContinueLoop) { 
 		if (..List.Count() < NumberOfFiles) || (NumberOfFiles = 0 ) {
-			Set FullName = ..AppendFile(Directory,rset.Data("ItemName"))
-          	if (rset.Data("Type") = "D") { 
-          		set SubDirectory = FullName
+			#dim FullName as %String = ..AppendFile(Directory,rset.GetDataByName("ItemName"))
+          	if (rset.GetDataByName("Type") = "D") { 
+          		#dim SubDirectory as %String = FullName
 	        	if AddSubDir Do ..GetFileList(SubDirectory,FileMask,AddSubDir,IncludeDirs,NumberOfFiles)
 	        	if IncludeDirs Do ..AddToList(Directory,rset)
           	} else {
@@ -96,8 +105,8 @@
 	set rset = ##class(%ResultSet).%New("%File:FileSet")
 	do rset.Execute(Directory,"*","",1)
 	while (rset.Next()) { 
-		if (rset.Data("Type") = "D") { 
-			set SubDirectory = ..AppendFile(Directory,rset.Data("ItemName"))
+		if (rset.GetDataByName("Type") = "D") { 
+			set SubDirectory = ..AppendFile(Directory,rset.GetDataByName("ItemName"))
 			Do ..AddToList(SubDirectory,rset)
 			if AddSubDir Do ..GetDirectoryList(SubDirectory,AddSubDir)
 		}
@@ -122,12 +131,12 @@
 
 	quit:'$length(FullName)
 	
-	set Info = ##class(FileInfo).%New()
+	set Info = ##class(TECH.FileInfo).%New()
 	set Info.Name = FullName
-	set Info.DateCreated = rset.Data("DateCreated")
-	set Info.DateModified = rset.Data("DateModified")
-	set Info.Size = rset.Data("Size")
-	set Info.Type = rset.Data("Type")
+	set Info.DateCreated = rset.GetDataByName("DateCreated")
+	set Info.DateModified = rset.GetDataByName("DateModified")
+	set Info.Size = rset.GetDataByName("Size")
+	set Info.Type = rset.GetDataByName("Type")
 	
 	do ..List.Insert(Info)
 	
@@ -232,10 +241,10 @@
 	Set ResultSet = ##class(%ResultSet).%New("%File:FileSet")
 	Do ResultSet.Execute(Path,"*")
 	While(ResultSet.Next()) {
-		#dim FileType As %String = ResultSet.Data("Type")
-		#dim DateModified As %TimeStamp = ##class(%TimeStamp).DisplayToLogical(ResultSet.Data("DateModified"))
+		#dim FileType As %String = ResultSet.GetDataByName("Type")
+		#dim DateModified As %TimeStamp = ##class(%TimeStamp).DisplayToLogical(ResultSet.GetDataByName("DateModified"))
 		If (FileType = "D") && (Tijdstip ]] DateModified){
-			#dim FileLocation As %String = ResultSet.Data("Name")
+			#dim FileLocation As %String = ResultSet.GetDataByName("Name")
 			Do ##class(%File).RemoveDirectoryTree(FileLocation)
 		}
 	}
@@ -249,10 +258,10 @@
 	Set ResultSet = ##class(%ResultSet).%New("%File:FileSet")
 	Do ResultSet.Execute(Path,"*")
 	While(ResultSet.Next()) {
-		#dim FileType As %String = ResultSet.Data("Type")
-		#dim DateModified As %TimeStamp = ##class(%TimeStamp).DisplayToLogical(ResultSet.Data("DateModified"))
+		#dim FileType As %String = ResultSet.GetDataByName("Type")
+		#dim DateModified As %TimeStamp = ##class(%TimeStamp).DisplayToLogical(ResultSet.GetDataByName("DateModified"))
 		If (FileType = "F") && (Tijdstip ]] DateModified){
-			#dim FileLocation As %String = ResultSet.Data("Name")		
+			#dim FileLocation As %String = ResultSet.GetDataByName("Name")		
 			Do ##class(TECH.File).Delete(FileLocation)
 		}
 	}