Index: svn/Logger.cls.xml
===================================================================
diff -u -r1834 -r1877
--- svn/Logger.cls.xml	(.../Logger.cls.xml)	(revision 1834)
+++ svn/Logger.cls.xml	(.../Logger.cls.xml)	(revision 1877)
@@ -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>
@@ -44,14 +39,17 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Username">
+<Type>%String</Type>
+</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())
@@ -79,11 +77,13 @@
 </Method>
 
 <Method name="LogGetLatest">
-<FormalSpec>Server:%String,Message:%String</FormalSpec>
+<FormalSpec>Server:%String,Message:%String,Username:%String</FormalSpec>
 <Implementation><![CDATA[
 	Quit:($$$Not(..MagGetLatestGelogdWordenVolgensServer(Server)))
 	Quit:($$$Not($IsObject(..SvnLogLocatieLijst)))
 	
+	Set ..Username = Username
+	
 	#dim Branch, Path, FullPath As %String
 	#dim IsBestaandBestand As %Boolean = $$$False
 	#dim SvnLogLocatie As svn.dto.SvnLogLocatie
@@ -103,9 +103,9 @@
 		Set ..IsTeAdden = $$$False
 		
 		If IsBestaandBestand {
-			Do ..VulAanBestaandBestand(FullPath, Message)
+			Do ..VulAanBestaandBestand(FullPath, Message, Server)
 		} Else {
-			Do ..GenereerBestand(FullPath, Message)
+			Do ..GenereerNieuwBestand(FullPath, Message, Server)
 			Set ..IsTeAdden = $$$True
 		}
 		
@@ -127,15 +127,15 @@
 <FormalSpec>Server:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Contains(Server, "cache01","cacheaccept2010","cachetest2010")
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Contains($$$LCase(Server), "cache01","cacheacp2010","cachetst2010")
 ]]></Implementation>
 </Method>
 
 <Method name="MagGetLatestGelogdWordenVolgensBranch">
 <FormalSpec>Branch:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Contains(Branch, "deploy2010")
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Contains($$$LCase(Branch), "deploy2010")
 ]]></Implementation>
 </Method>
 
@@ -147,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</FormalSpec>
+<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)
-	#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)
+	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>
@@ -172,27 +187,40 @@
 	#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")
+	#dim BestandStream As %Library.GlobalCharacterStream = ..GeefStreamMetEnkelHoofding()
 	
 	While BestaandeGetLatestRapportLijstIterator.HasNext() {
 		Set BestaandGetLatestRapport = BestaandeGetLatestRapportLijstIterator.Next()
-		Do BestandStream.WriteLine(BestaandGetLatestRapport.Timestamp_";"_BestaandGetLatestRapport.Message_";"_BestaandGetLatestRapport.Uitvoerder)
+		Do BestandStream.WriteLine(BestaandGetLatestRapport.Timestamp_";"_BestaandGetLatestRapport.Message_";"_BestaandGetLatestRapport.Uitvoerder_";"_BestaandGetLatestRapport.Server)
 	}
 	
 	Quit BestandStream
 ]]></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</FormalSpec>
+<FormalSpec>Message:%String,Server:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>svn.dto.GetLatestRapport</ReturnType>
 <Implementation><![CDATA[
 	Set HuidigGetLatestRapport = ##class(svn.dto.GetLatestRapport).%New()
 	Set HuidigGetLatestRapport.Timestamp = ..DateTimeApi.CurrentTimeStamp()
 	Set HuidigGetLatestRapport.Message = Message
-	Set HuidigGetLatestRapport.Uitvoerder = ..GetUsername()
+	Set HuidigGetLatestRapport.Uitvoerder = ..Username
+	Set HuidigGetLatestRapport.Server = Server
 	
 	Quit HuidigGetLatestRapport
 ]]></Implementation>
@@ -212,6 +240,7 @@
 		Set GetLatestRapport.Timestamp = FileReader.GetData(1)
 		Set GetLatestRapport.Message = FileReader.GetData(2)
 		Set GetLatestRapport.Uitvoerder = FileReader.GetData(3)
+		Set GetLatestRapport.Server = FileReader.GetData(4)
 		If $$$Not(GetLatestRapport.Timestamp = "") {
 			Do GetLatestRapportLijst.Insert(GetLatestRapport)
 		}
@@ -221,28 +250,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GenereerBestand">
-<FormalSpec>FullPath:%String,Message:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set GetLatestRapportLijst = ##class(%ListOfDataTypes).%New()
-	Do GetLatestRapportLijst.Insert(..GeefHuidigGetLatestRapport(Message))
-	
-	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")
-	
-	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>
@@ -255,7 +262,7 @@
 	Set ..svnCommand.File = ##class(TECH.Files).AppendFile(FullPath,..#Filename)
 	Set ..svnCommand.Message = "*** "_##class(TECH.StringUtils).ToUpper(Server)_": GetLatest met als resultaat: '"_Message_"'."
 	Set ..svnCommand.SubCommand = "commit"
-	Do ..svnCommand.GlobalOptions.SetAt(..GetUsername(),"--username")
+	Do ..svnCommand.GlobalOptions.SetAt(..Username,"--username")
 	Do ..svnCommand.GlobalOptions.SetAt("fixed","--password")
 	Do ..svnCommand.Execute()
 ]]></Implementation>
@@ -268,16 +275,19 @@
 	Set ..svnCommand.LocalWorkspace = FullPath
 	Set ..svnCommand.File = ##class(TECH.Files).AppendFile(FullPath,..#Filename)
 	Set ..svnCommand.SubCommand = "add"
-	Do ..svnCommand.GlobalOptions.SetAt(..GetUsername(),"--username")
+	Do ..svnCommand.GlobalOptions.SetAt(..Username,"--username")
 	Do ..svnCommand.GlobalOptions.SetAt("fixed","--password")
 	Do ..svnCommand.Execute()
 ]]></Implementation>
 </Method>
 
-<Method name="GetUsername">
+<Method name="MaakEnSchrijfBestand">
+<FormalSpec>Bestand:%String,BestandStream:%Library.GlobalCharacterStream</FormalSpec>
 <Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$$SVNGlobal("SourceControl","SVN", "Username")
+<Implementation><![CDATA[
+	Do ..FileWriter.Open(Bestand)
+	Do ..FileWriter.WriteStream(BestandStream)
+	Do ..FileWriter.Close()
 ]]></Implementation>
 </Method>
 </Class>