Index: svn/Helper.cls.xml
===================================================================
diff -u -r1824 -r1831
--- svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1824)
+++ svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1831)
@@ -81,6 +81,26 @@
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<FormalSpec>Username:%String="",Password:%String="",SvnLogger:svn.Logger=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..SvnLogger = $$$Inject(SvnLogger, ##class(svn.Logger).%New())
+	
+	Set ..IsCodeVeranderd = 0
+	set ..TECHCSPApplicatie = ##class(TECH.CSP.CSPApplicatie).Instance()
+	if ##class(svn.CompileList).%ExistsId(1) { set ..ToCompile = ##class(svn.CompileList).%OpenId(1) }
+	else { set ..ToCompile = ##class(svn.CompileList).%New() }
+	
+	set ..Username = Username
+	set ..Password = Password
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="ImportDirectory">
 <Description>
 IgnorePattern ; delimeted string</Description>
@@ -430,26 +450,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="%OnNew">
-<FormalSpec>Username:%String="",Password:%String="",SvnLogger:svn.Logger=""</FormalSpec>
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..SvnLogger = $$$Inject(SvnLogger, ##class(svn.Logger).%New())
-	
-	Set ..IsCodeVeranderd = 0
-	set ..TECHCSPApplicatie = ##class(TECH.CSP.CSPApplicatie).Instance()
-	if ##class(svn.CompileList).%ExistsId(1) { set ..ToCompile = ##class(svn.CompileList).%OpenId(1) }
-	else { set ..ToCompile = ##class(svn.CompileList).%New() }
-	
-	set ..Username = Username
-	set ..Password = Password
-	
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="SVNExport">
 <FormalSpec>InternalName:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -591,42 +591,19 @@
 	
 	#dim VoerUitGetLatest As %Boolean = (('..Conflicten() )  && ( '..WerktOffline()))
 	#dim StopBackgroundJobsStatus As %Status = $$$OK
-	#dim IsSvnLoggingUitTeVoeren As %Boolean = $$$False
 	
 	If VoerUitGetLatest {
 		Set StopBackgroundJobsStatus = ..VoerUitStopBackgroundJobs()
 		If $$$ISOK(StopBackgroundJobsStatus){
-			#dim Server As %String = ..GeefServerNaam()
-			#dim Namespace As %String = ..GeefNamespace()
-			#dim Branch As %String = ""
-			#dim Path As %String = ""
-			Set SvnLogLocatieLijst = ##class(%ListOfDataTypes).%New()
 			Set rsRepos = ##class(%ResultSet).%New("svn.Repository:Extent")
 			Do rsRepos.Execute()
 			While rsRepos.Next() {
-				#dim MoetInSvnGelogdWorden As %Boolean = $$$False
 				#dim Repo As svn.Repository = ..OpenRepository(rsRepos.Get("ID"))
 				Do Repo.CheckOut()
 				If Repo.IsCodeVeranderd set ..IsCodeVeranderd = 1
 				Do ##class(TECH.ListUtils).CopyListOfDataTypes(Repo.Failed,..Failed)
 				Do ##class(TECH.ListUtils).CopyListOfDataTypes(Repo.ToCompile,..ToCompile.List)
-				
-				Set Branch = Repo.Branch
-				Set MoetInSvnGelogdWorden = (##class(TECH.StringUtils).Contains(Server, "cache01","cacheaccept2010","cachetest2010"))
-				Set MoetInSvnGelogdWorden = (##class(TECH.StringUtils).Contains(Branch, "deploy2010"))
-				
-				If MoetInSvnGelogdWorden {
-					Set Path = Repo.Path
-					Set SvnLogLocatie = ##class(svn.dto.SvnLogLocatie).%New()
-					Set SvnLogLocatie.Branch = Branch
-					Set SvnLogLocatie.Namespace = Namespace
-					Set SvnLogLocatie.Path = Path
-					Set SvnLogLocatie.Repository = Repo
-					Set SvnLogLocatie.Server = Server
-					
-					Do SvnLogLocatieLijst.Insert(SvnLogLocatie)
-					Set IsSvnLoggingUitTeVoeren = $$$True
-				}
+				Do ..SvnLogger.VoegToeTeLoggenRepository(Repo)
 	 		}
 		}
 	}
@@ -661,30 +638,15 @@
 		Do ..DisplayMessage(Message)				
 	}
 	
-	If IsSvnLoggingUitTeVoeren {
-		try {
-			;Do ..LogInSvnLog(SvnLogLocatieLijst, Message)
-		} catch {
-			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		}
+	try {
+		Do ..SvnLogger.LogGetLatest(..GeefServerNaam(), Message)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ..LogMessage("Het loggen van GetLatest op SvnLogging is mislukt omwille van deze reden: "_Exception)
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="LogInSvnLog">
-<FormalSpec>SvnLogLocatieLijst:%ListOfDataTypes,Message:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim SvnLogLocatie As svn.dto.SvnLogLocatie
-	Set SvnLogLocatieLijstIterator = ##class(TECH.ListIterator).%New(SvnLogLocatieLijst)
-	
-	While SvnLogLocatieLijstIterator.HasNext() {
-		Set SvnLogLocatie = SvnLogLocatieLijstIterator.Next()
-		Do ..SvnLogger.LogGetLatest(SvnLogLocatie, Message)
-	}
-]]></Implementation>
-</Method>
-
 <Method name="VoerUitCompile">
 <Private>1</Private>
 <Implementation><![CDATA[
Index: svn/dto/SvnLogLocatie.cls.xml
===================================================================
diff -u -r1820 -r1831
--- svn/dto/SvnLogLocatie.cls.xml	(.../SvnLogLocatie.cls.xml)	(revision 1820)
+++ svn/dto/SvnLogLocatie.cls.xml	(.../SvnLogLocatie.cls.xml)	(revision 1831)
@@ -11,21 +11,9 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="Namespace">
-<Type>%String</Type>
-</Property>
-
 <Property name="Path">
 <Type>%String</Type>
 </Property>
-
-<Property name="Repository">
-<Type>svn.Repository</Type>
-</Property>
-
-<Property name="Server">
-<Type>%String</Type>
-</Property>
 </Class>
 
 
Index: svn/Logger.cls.xml
===================================================================
diff -u -r1826 -r1831
--- svn/Logger.cls.xml	(.../Logger.cls.xml)	(revision 1826)
+++ svn/Logger.cls.xml	(.../Logger.cls.xml)	(revision 1831)
@@ -4,6 +4,11 @@
 <IncludeCode>svn.Include</IncludeCode>
 <Super>TECH.RegisteredObject</Super>
 
+<Parameter name="Filename">
+<Type>%String</Type>
+<Default>000GetLatestLijst.csv</Default>
+</Parameter>
+
 <Property name="BestandGenerator">
 <Type>APPS.common.Rapport.impl.BestandGenerator</Type>
 <Private>1</Private>
@@ -34,6 +39,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="SvnLogLocatieLijst">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
+</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>
 <Private>1</Private>
@@ -51,47 +61,99 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeTeLoggenRepository">
+<FormalSpec>Repository:svn.Repository</FormalSpec>
+<Implementation><![CDATA[
+	If $$$Not($IsObject(..SvnLogLocatieLijst)) {
+		Set ..SvnLogLocatieLijst = ##class(%ListOfDataTypes).%New()
+	}
+	
+	Set SvnLogLocatie = ##class(svn.dto.SvnLogLocatie).%New()
+	Set SvnLogLocatie.Branch = Repository.Branch
+	Set SvnLogLocatie.Path = Repository.Path
+	
+	Do ..SvnLogLocatieLijst.Insert(SvnLogLocatie)
+	
+	Quit
+]]></Implementation>
+</Method>
+
 <Method name="LogGetLatest">
-<FormalSpec>SvnLogLocatie:svn.dto.SvnLogLocatie,Message:%String</FormalSpec>
+<FormalSpec>Server:%String,Message:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim Path As %String = SvnLogLocatie.Path
-	#dim Branch As %String = SvnLogLocatie.Branch
-	#dim FullPath As %String = Path_Branch_"\"
-	#dim Filename As %String = "000GetLatestLijst.csv"
-	#dim IsBestaandBestand As %Boolean = ..IsBestaandBestand(FullPath, Filename)
-	Set ..IsTeAdden = $$$False
+	Quit:($$$Not(..MagGetLatestGelogdWordenVolgensServer(Server)))
+	Quit:($$$Not($IsObject(..SvnLogLocatieLijst)))
 	
-	If IsBestaandBestand {
-		Do ..VulAanBestaandBestand(FullPath, Filename, Message)
-	} Else {
-		Do ..GenereerBestand(FullPath, Filename, Message)
-		Set ..IsTeAdden = $$$True
-	}
+	#dim Branch, Path, FullPath As %String
+	#dim IsBestaandBestand As %Boolean = $$$False
+	#dim SvnLogLocatie As svn.dto.SvnLogLocatie
+	Set SvnLogLocatieLijstIterator = ##class(TECH.ListIterator).%New(..SvnLogLocatieLijst)
 	
-	/// Extra check voor mocht het genereren van het bestand mislukken, 
-	/// zodat zeker niet gecommit wordt met een lege filename en een commit all zou gebeuren!
-	Set IsBestaandBestand = ..IsBestaandBestand(FullPath, Filename)
-	If IsBestaandBestand {
-		Do ..CommitBestand(FullPath, Filename, Message)
+	While SvnLogLocatieLijstIterator.HasNext() {
+		Set SvnLogLocatie = SvnLogLocatieLijstIterator.Next()
+		Set Branch = SvnLogLocatie.Branch
+		
+		If ($$$Not(..MagGetLatestGelogdWordenVolgensBranch(Branch))) {
+			Continue
+		}
+		
+		Set Path = SvnLogLocatie.Path
+		Set FullPath = Path_Branch_"\"
+		Set IsBestaandBestand = ..IsBestaandBestand(FullPath)
+		Set ..IsTeAdden = $$$False
+		
+		If IsBestaandBestand {
+			Do ..VulAanBestaandBestand(FullPath, Message)
+		} Else {
+			Do ..GenereerBestand(FullPath, Message)
+			Set ..IsTeAdden = $$$True
+		}
+		
+		/// Extra check voor mocht het genereren van het bestand mislukken, 
+		/// zodat zeker niet gecommit wordt met een lege filename en een commit all zou gebeuren!
+		Set IsBestaandBestand = ..IsBestaandBestand(FullPath)
+		If IsBestaandBestand {
+			Do ..CommitBestand(FullPath, Message)
+		}
 	}
+	
+	Set ..SvnLogLocatieLijst = ""
+	
+	Quit
 ]]></Implementation>
 </Method>
 
+<Method name="MagGetLatestGelogdWordenVolgensServer">
+<FormalSpec>Server:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Contains(Server, "cache01","cacheaccept2010","cachetest2010")
+]]></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>
+</Method>
+
 <Method name="IsBestaandBestand">
-<FormalSpec>FullPath:%String,Filename:%String</FormalSpec>
+<FormalSpec>FullPath:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..FileApi.FileExists(FullPath_Filename)
+<Implementation><![CDATA[	Quit ..FileApi.FileExists(FullPath_..#Filename)
 ]]></Implementation>
 </Method>
 
 <Method name="VulAanBestaandBestand">
-<FormalSpec>FullPath:%String,Filename:%String,Message:%String</FormalSpec>
+<FormalSpec>FullPath:%String,Message:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim RegelStream As %Library.GlobalCharacterStream = ..GeefRegelStreamBestaandBestand(FullPath, Filename)
+	#dim RegelStream As %Library.GlobalCharacterStream = ..GeefRegelStreamBestaandBestand(FullPath)
 	#dim HuidigGetLatestRapport As svn.dto.GetLatestRapport = ..GeefHuidigGetLatestRapport(Message)
-	#dim Bestand As %String = FullPath_Filename
+	#dim Bestand As %String = FullPath_..#Filename
 	
 	Do RegelStream.WriteLine(HuidigGetLatestRapport.Timestamp_";"_HuidigGetLatestRapport.Message_";"_HuidigGetLatestRapport.Uitvoerder)
 	
@@ -102,11 +164,11 @@
 </Method>
 
 <Method name="GeefRegelStreamBestaandBestand">
-<FormalSpec>FullPath:%String,Filename:%String</FormalSpec>
+<FormalSpec>FullPath:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Library.GlobalCharacterStream</ReturnType>
 <Implementation><![CDATA[
-	#dim BestaandeGetLatestRapportLijst As %ListOfDataTypes = ..GeefBestaandeGetLatestRapportLijst(FullPath, Filename)
+	#dim BestaandeGetLatestRapportLijst As %ListOfDataTypes = ..GeefBestaandeGetLatestRapportLijst(FullPath)
 	#dim BestaandeGetLatestRapportLijstIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(BestaandeGetLatestRapportLijst)
 	#dim BestaandGetLatestRapport As svn.dto.GetLatestRapport
 	
@@ -137,12 +199,12 @@
 </Method>
 
 <Method name="GeefBestaandeGetLatestRapportLijst">
-<FormalSpec>FullPath:%String,Filename:%String</FormalSpec>
+<FormalSpec>FullPath:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	Set GetLatestRapportLijst = ##class(%ListOfDataTypes).%New()
-	Set FileReader = ##class(TECH.FileReader).%New(FullPath_Filename,";")
+	Set FileReader = ##class(TECH.FileReader).%New(FullPath_..#Filename,";")
 	
 	While FileReader.HasNext() {
 		Do FileReader.Next()
@@ -160,7 +222,7 @@
 </Method>
 
 <Method name="GenereerBestand">
-<FormalSpec>FullPath:%String,Filename:%String,Message:%String</FormalSpec>
+<FormalSpec>FullPath:%String,Message:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set GetLatestRapportLijst = ##class(%ListOfDataTypes).%New()
@@ -175,22 +237,22 @@
 	
 	Set Bestand.ScheidingsTeken = ";"
 	Set Bestand.Iterator = GetLatestRapportLijstIterator
-	Set Bestand.BestandVolledigeNaam = ##class(TECH.Files).AppendFile(FullPath,Filename)
+	Set Bestand.BestandVolledigeNaam = ##class(TECH.Files).AppendFile(FullPath,..#Filename)
 	
 	Do ..BestandGenerator.MaakBestand(Bestand)
 ]]></Implementation>
 </Method>
 
 <Method name="CommitBestand">
-<FormalSpec>FullPath:%String,Filename:%String,Message:%String</FormalSpec>
+<FormalSpec>FullPath:%String,Message:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	If ..IsTeAdden {
-		Do ..AddFile(FullPath, Filename)
+		Do ..AddFile(FullPath)
 	}
 	
 	Set ..svnCommand.LocalWorkspace = FullPath
-	Set ..svnCommand.File = FullPath_Filename
+	Set ..svnCommand.File = FullPath_..#Filename
 	Set ..svnCommand.Message = "GetLatest met als resultaat: "_Message
 	Set ..svnCommand.SubCommand = "commit"
 	Do ..svnCommand.GlobalOptions.SetAt(..GetUsername(),"--username")
@@ -200,11 +262,11 @@
 </Method>
 
 <Method name="AddFile">
-<FormalSpec>FullPath:%String,Filename:%String</FormalSpec>
+<FormalSpec>FullPath:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set ..svnCommand.LocalWorkspace = FullPath
-	Set ..svnCommand.File = FullPath_Filename
+	Set ..svnCommand.File = FullPath_..#Filename
 	Set ..svnCommand.SubCommand = "add"
 	Do ..svnCommand.GlobalOptions.SetAt(..GetUsername(),"--username")
 	Do ..svnCommand.GlobalOptions.SetAt("fixed","--password")