Index: svn/Logger.cls.xml
===================================================================
diff -u -r1841 -r1859
--- svn/Logger.cls.xml	(.../Logger.cls.xml)	(revision 1841)
+++ svn/Logger.cls.xml	(.../Logger.cls.xml)	(revision 1859)
@@ -9,11 +9,6 @@
 <Default>000GetLatestLijst.csv</Default>
 </Parameter>
 
-<Property name="BestandGenerator">
-<Type>APPS.common.Rapport.impl.BestandGenerator</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="DateTimeApi">
 <Type>TECH.DateTime.DateTimeAPI</Type>
 <Private>1</Private>
@@ -49,13 +44,12 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>BestandGenerator:APPS.common.Rapport.impl.BestandGenerator="",DateTimeApi:TECH.DateTime.DateTimeAPI="",FileApi:TECH.File.FileAPI="",FileWriter:TECH.File.FileWriter="",svnCommand:svn.Command=""</FormalSpec>
+<FormalSpec>DateTimeApi:TECH.DateTime.DateTimeAPI="",FileApi:TECH.File.FileAPI="",FileWriter:TECH.File.FileWriter="",svnCommand:svn.Command=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..BestandGenerator = $$$Inject(BestandGenerator, ##class(APPS.common.Rapport.impl.BestandGenerator).%New())
 	Set ..DateTimeApi = $$$Inject(DateTimeApi, ##class(TECH.DateTime.impl.DateTimeAPI).%New())
 	Set ..FileApi = $$$Inject(FileApi, ##class(TECH.File.impl.FileAPI).%New())
 	Set ..FileWriter = $$$Inject(FileWriter, ##class(TECH.File.impl.FileWriter).%New())
@@ -111,7 +105,7 @@
 		If IsBestaandBestand {
 			Do ..VulAanBestaandBestand(FullPath, Message, Server)
 		} Else {
-			Do ..GenereerBestand(FullPath, Message, Server)
+			Do ..GenereerNieuwBestand(FullPath, Message, Server)
 			Set ..IsTeAdden = $$$True
 		}
 		
@@ -153,23 +147,38 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GenereerNieuwBestand">
+<FormalSpec>FullPath:%String,Message:%String,Server:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim BestandStream As %Library.GlobalCharacterStream = ..GeefStreamMetEnkelHoofding()
+	
+	Do ..VulAanEnMaakEnSchrijfBestand(BestandStream, FullPath, Message, Server)
+]]></Implementation>
+</Method>
+
 <Method name="VulAanBestaandBestand">
 <FormalSpec>FullPath:%String,Message:%String,Server:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim BestandStream As %Library.GlobalCharacterStream = ..GeefStreamVanBestand(FullPath)
-	#dim HuidigGetLatestRapport As svn.dto.GetLatestRapport = ..GeefHuidigGetLatestRapport(Message, Server)
-	#dim Bestand As %String = ##class(TECH.Files).AppendFile(FullPath,..#Filename)
+	#dim BestandStream As %Library.GlobalCharacterStream = ..GeefStreamVanBestaandBestand(FullPath)
 	
-	Do BestandStream.WriteLine(HuidigGetLatestRapport.Timestamp_";"_HuidigGetLatestRapport.Message_";"_HuidigGetLatestRapport.Uitvoerder_";"_Server)
+	Do ..VulAanEnMaakEnSchrijfBestand(BestandStream, FullPath, Message, Server)
+]]></Implementation>
+</Method>
+
+<Method name="GeefStreamMetEnkelHoofding">
+<Private>1</Private>
+<ReturnType>%Library.GlobalCharacterStream</ReturnType>
+<Implementation><![CDATA[
+	Set BestandStream = ##class(%Library.GlobalCharacterStream).%New()
+	Do BestandStream.WriteLine("Timestamp"_";"_"Message"_";"_"Uitvoerder"_";"_"Server")
 	
-	Do ..FileWriter.Open(Bestand)
-	Do ..FileWriter.WriteStream(BestandStream)
-	Do ..FileWriter.Close()
+	Quit BestandStream
 ]]></Implementation>
 </Method>
 
-<Method name="GeefStreamVanBestand">
+<Method name="GeefStreamVanBestaandBestand">
 <FormalSpec>FullPath:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Library.GlobalCharacterStream</ReturnType>
@@ -178,8 +187,7 @@
 	#dim BestaandeGetLatestRapportLijstIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(BestaandeGetLatestRapportLijst)
 	#dim BestaandGetLatestRapport As svn.dto.GetLatestRapport
 	
-	Set BestandStream = ##class(%Library.GlobalCharacterStream).%New()
-	Do BestandStream.WriteLine("Timestamp"_";"_"Message"_";"_"Uitvoerder"_";"_"Server")
+	#dim BestandStream As %Library.GlobalCharacterStream = ..GeefStreamMetEnkelHoofding()
 	
 	While BestaandeGetLatestRapportLijstIterator.HasNext() {
 		Set BestaandGetLatestRapport = BestaandeGetLatestRapportLijstIterator.Next()
@@ -190,6 +198,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VulAanEnMaakEnSchrijfBestand">
+<FormalSpec>BestandStream:%Library.GlobalCharacterStream,FullPath:%String,Message:%String,Server:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim HuidigGetLatestRapport As svn.dto.GetLatestRapport = ..GeefHuidigGetLatestRapport(Message, Server)
+	#dim Bestand As %String = ##class(TECH.Files).AppendFile(FullPath,..#Filename)
+	
+	Do BestandStream.WriteLine(HuidigGetLatestRapport.Timestamp_";"_HuidigGetLatestRapport.Message_";"_HuidigGetLatestRapport.Uitvoerder_";"_HuidigGetLatestRapport.Server)
+	
+	Do ..MaakEnSchrijfBestand(Bestand, BestandStream)
+]]></Implementation>
+</Method>
+
 <Method name="GeefHuidigGetLatestRapport">
 <FormalSpec>Message:%String,Server:%String</FormalSpec>
 <Private>1</Private>
@@ -229,29 +250,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GenereerBestand">
-<FormalSpec>FullPath:%String,Message:%String,Server:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set GetLatestRapportLijst = ##class(%ListOfDataTypes).%New()
-	Do GetLatestRapportLijst.Insert(..GeefHuidigGetLatestRapport(Message, Server))
-	
-	Set GetLatestRapportLijstIterator = ##class(TECH.ListIterator).%New(GetLatestRapportLijst)
-	
-	Set Bestand = ##class(APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased).%New()
-	Do Bestand.VoegToeVeld("svn.dto.GetLatestRapport", "Timestamp")
-	Do Bestand.VoegToeVeld("svn.dto.GetLatestRapport", "Message")
-	Do Bestand.VoegToeVeld("svn.dto.GetLatestRapport", "Uitvoerder")
-	Do Bestand.VoegToeVeld("svn.dto.GetLatestRapport", "Server")
-	
-	Set Bestand.ScheidingsTeken = ";"
-	Set Bestand.Iterator = GetLatestRapportLijstIterator
-	Set Bestand.BestandVolledigeNaam = ##class(TECH.Files).AppendFile(FullPath,..#Filename)
-	
-	Do ..BestandGenerator.MaakBestand(Bestand)
-]]></Implementation>
-</Method>
-
 <Method name="CommitBestand">
 <FormalSpec>Server:%String,FullPath:%String,Message:%String</FormalSpec>
 <Private>1</Private>
@@ -282,6 +280,16 @@
 	Do ..svnCommand.Execute()
 ]]></Implementation>
 </Method>
+
+<Method name="MaakEnSchrijfBestand">
+<FormalSpec>Bestand:%String,BestandStream:%Library.GlobalCharacterStream</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ..FileWriter.Open(Bestand)
+	Do ..FileWriter.WriteStream(BestandStream)
+	Do ..FileWriter.Close()
+]]></Implementation>
+</Method>
 </Class>