Index: svn/Helper.cls.xml
===================================================================
diff -u -r1554 -r1555
--- svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1554)
+++ svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1555)
@@ -146,14 +146,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefServerNaam">
+<ClassMethod>1</ClassMethod>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $ZU(110)
+]]></Implementation>
+</Method>
+
+<Method name="GeefNamespace">
+<ClassMethod>1</ClassMethod>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $ZU(5)
+]]></Implementation>
+</Method>
+
 <Method name="GetLatest">
 <ClassMethod>1</ClassMethod>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Try{
-		JOB ClassMethod^vhLib("svn.Helper","GetLatestJob",1,0)
-	}Catch E
-	{}
+	JOB ClassMethod^vhLib("svn.Helper","GetLatestJob",1,0)
 	Quit "GetLatest() uitgevoerd op "_##class(TECH.DateTime).CurrentTimeStamp()
 ]]></Implementation>
 </Method>
@@ -162,10 +173,7 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Try{
-		JOB ClassMethod^vhLib("svn.Helper","GetLatestJob",1,1)
-	}Catch E
-	{}
+	JOB ClassMethod^vhLib("svn.Helper","GetLatestJob",1,1)
 	Quit "GetLatest() uitgevoerd op "_##class(TECH.DateTime).CurrentTimeStamp()_"."_$C(13,10)_"UnitTesten gestart."
 ]]></Implementation>
 </Method>
@@ -174,28 +182,26 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>UitvoerenUnitTesten:%Boolean</FormalSpec>
 <Implementation><![CDATA[
-	Try{
-		Set SvnHelper = ##class(svn.Helper).%New()		
-		If SvnHelper.IsUnitTestBezig{
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Kan geen GetLatest uitvoeren omdat er nog unit testen aan het lopen zijn."))
-		}		
-		
-		Do SvnHelper.VoerUitGetLatest()	
-		If (SvnHelper.IsGetLatestGefaald){
-			Do SvnHelper.MailGefaaldeSvnCommands("GetLatest")
-		}ElseIf(UitvoerenUnitTesten && SvnHelper.IsCodeVeranderd){	
-			Do SvnHelper.VoerUitUnitTesten()		
-		}		
-		Do SvnHelper.Failed.Clear()
-	}Catch E{
-		#dim ServerNaam As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam()
-		#dim Namespace As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefNamespace()
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		#dim From As %String =  $$$SystemMail(ServerNaam_" - Subversion")
-		#dim MailTo As %String = $listbuild($$$SVNGlobal("SourceControl","SVN","MailWhenFailed"))
-		Do SendMiniMailForced^vhLib.Mail(From,MailTo,"Subversion GetLatest() failed on ["_ServerNaam_" => "_Namespace_"]",Exception.ToString(),0) 
-	}
-	Set SvnHelper.IsUnitTestBezig = 0
+	Set $ZTRAP = "OnError"
+	Set SvnHelper = ##class(svn.Helper).%New()		
+	If SvnHelper.IsUnitTestBezig{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Kan geen GetLatest uitvoeren omdat er nog unit testen aan het lopen zijn."))
+	}		
+	
+	Do SvnHelper.VoerUitGetLatest()	
+	If (SvnHelper.IsGetLatestGefaald){
+		Do SvnHelper.MailGefaaldeSvnCommands("GetLatest")
+	}ElseIf(UitvoerenUnitTesten && SvnHelper.IsCodeVeranderd){	
+		Do SvnHelper.VoerUitUnitTesten()		
+	}		
+	Do SvnHelper.Failed.Clear()
+	Quit
+OnError
+	Set $ZTRAP = ""
+	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	Set From  =  $$$SystemMail(..GeefServerNaam()_" - Subversion")
+	Set MailTo = $listbuild($$$SVNGlobal("SourceControl","SVN","MailWhenFailed"))
+	Do SendMiniMailForced^vhLib.Mail(From,MailTo,"Subversion GetLatest() failed on ["_..GeefServerNaam()_" => "_..GeefNamespace()_"]",Exception.ToString(),0)
 ]]></Implementation>
 </Method>
 
@@ -215,12 +221,10 @@
 <Implementation><![CDATA[
 	If ..Failed.Count() > 0 
 	{
-		#dim FeedbackStream As %CharacterStream = ..GeefFailedCharacterStream(Actie)		
-		#dim ServerNaam As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam()
-		#dim Namespace As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefNamespace()
-		#dim From As %String =  $$$SystemMail(ServerNaam_" - Subversion")
-		#dim MailTo As %String = $listbuild($$$SVNGlobal("SourceControl","SVN","MailWhenFailed"))
-		Do SendMiniMailForced^vhLib.Mail(From,MailTo,"Subversion failed on ["_ServerNaam_" => "_Namespace_"]",FeedbackStream,1)
+		Set FeedbackStream = ..GeefFailedCharacterStream(Actie)		
+		Set From =  $$$SystemMail(..GeefServerNaam()_" - Subversion")
+		Set MailTo = $listbuild($$$SVNGlobal("SourceControl","SVN","MailWhenFailed"))
+		Do SendMiniMailForced^vhLib.Mail(From,MailTo,"Subversion failed on ["_..GeefServerNaam()_" => "_..GeefNamespace()_"]",FeedbackStream,1)
 	}
 ]]></Implementation>
 </Method>
@@ -1291,8 +1295,9 @@
 </Method>
 
 <Method name="ShowFailed">
+<FormalSpec>Actie:%String=""</FormalSpec>
 <Implementation><![CDATA[
-	#dim FailedCharacterStream As %GlobalCharacterStream = ..GeefFailedCharacterStream()
+	#dim FailedCharacterStream As %GlobalCharacterStream = ..GeefFailedCharacterStream(Actie)
 	while 'FailedCharacterStream.AtEnd
 	{
 		w FailedCharacterStream.ReadLine(),!
@@ -1301,7 +1306,7 @@
 </Method>
 
 <Method name="GeefFailedCharacterStream">
-<FormalSpec>Actie:%String</FormalSpec>
+<FormalSpec>Actie:%String=""</FormalSpec>
 <ReturnType>%CharacterStream</ReturnType>
 <Implementation><![CDATA[
 	Set FailedFeedback = ##class(%GlobalCharacterStream).%New()
@@ -1935,7 +1940,7 @@
 			if ..Failed.Count() = 0 {
 				set Message = "Getting Latest done"
 			} else {
-				Do ..ShowFailed()
+				Do ..ShowFailed("GetLatest")
 				set ..IsGetLatestGefaald = 1
 				set Message ="Getting Latest **FAILED**"
 			}
@@ -1950,8 +1955,8 @@
 		if ..ToCompile.List.Count() {
 			w !!,"Hercompilatie voorgaande fouten",!
 			do ..CompileImportedSourceCode(1)
-			Do ..ShowFailed()
-			set IsGetLatestGefaald = ..Failed.Count()
+			Do ..ShowFailed("Hercompilatie bij GetLatest")
+			set ..IsGetLatestGefaald = (..Failed.Count()>0)
 			do ..Failed.Clear()
 		}
 	}