Index: vhLib/Logger.cls.xml
===================================================================
diff -u -r3532 -r3534
--- vhLib/Logger.cls.xml	(.../Logger.cls.xml)	(revision 3532)
+++ vhLib/Logger.cls.xml	(.../Logger.cls.xml)	(revision 3534)
@@ -226,61 +226,57 @@
 	Set OldDateTimeInformation = $$$CurrentDate-DaysInformation
 	Set OldDateTimeDebug = $$$CurrentDate-DaysDebug
 	
-	set Server = $$$Server do ExecQuery
-	set Server = $piece(##class(TECH.Config.ConfigMgr).Instance().GeefString("Makova_ServerEnNamespace"),"\",1) do ExecQuery
+	Do ..RemoveLogByItem(OldDateTimeError, "E")	
+	Do ..RemoveLogByItem(OldDateTimeWarning, "W")	
+	Do ..RemoveLogByItem(OldDateTimeInformation, "I")	
+	Do ..RemoveLogByItem(OldDateTimeDebug, "D")
 	
 	#dim Date = ""
 	for { set Date = $O(^ERRORS(Date)) Quit:Date=""
 		if Date < OldDateTimeError kill ^ERRORS(Date)
 	}
 
-	Quit $$$OK	
-	
-ExecQuery
-	Do ..RemoveLogByItem(OldDateTimeError, Server, "E")	
-	Do ..RemoveLogByItem(OldDateTimeWarning, Server, "W")	
-	Do ..RemoveLogByItem(OldDateTimeInformation, Server, "I")	
-	Do ..RemoveLogByItem(OldDateTimeDebug, Server, "D")
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="RemoveLogByItem">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Datum:%Date,Server:%String,Niveau:%String</FormalSpec>
+<FormalSpec>Datum:%Date,Niveau:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim QueryString As %String
 	
 	If $$$Not(Niveau = "I") {
-		Set QueryString = "SELECT %NOLOCK ID FROM vhLib.Logging WHERE Datum<=? AND Server=? AND Niveau=?"
-		Do ..VerwijderLogRecords(QueryString, Datum, Server, Niveau)
+		Set QueryString = "SELECT %NOLOCK ID FROM vhLib.Logging WHERE Datum<=? AND Niveau=?"
+		Do ..VerwijderLogRecords(QueryString, Datum, Niveau)
 	} Else {
-		Set QueryString = "SELECT %NOLOCK ID FROM vhLib.Logging WHERE Datum<=? AND Server=? AND Niveau=? AND Groep<>'WS.Vhisie4.Winkelkar.WinkelkarService'"
-		Do ..VerwijderLogRecords(QueryString, Datum, Server, Niveau)
+		Set QueryString = "SELECT %NOLOCK ID FROM vhLib.Logging WHERE Datum<=? AND Niveau=? AND Groep<>'WS.Vhisie4.Winkelkar.WinkelkarService'"
+		Do ..VerwijderLogRecords(QueryString, Datum, Niveau)
 		
 		Set Datum = Datum - 20
-		Set QueryString = "SELECT %NOLOCK ID FROM vhLib.Logging WHERE Datum<=? AND Server=? AND Niveau=? AND Groep='WS.Vhisie4.Winkelkar.WinkelkarService'"
-		Do ..VerwijderLogRecords(QueryString, Datum, Server, Niveau)
+		Set QueryString = "SELECT %NOLOCK ID FROM vhLib.Logging WHERE Datum<=? AND Niveau=? AND Groep='WS.Vhisie4.Winkelkar.WinkelkarService'"
+		Do ..VerwijderLogRecords(QueryString, Datum, Niveau)
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="VerwijderLogRecords">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>QueryString:%String,Datum:%Date,Server:%String,Niveau:%String</FormalSpec>
+<FormalSpec>QueryString:%String,Datum:%Date,Niveau:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Set LoggingIdsToDelete = ##class(%ListOfDataTypes).%New()
+	Set LoggingIdsToDelete = ##class(TECH.ListOfDataTypesOnDisk).%New()
 	
-	Set Query = ##class(TECH.DynamicQuery).%New(QueryString,$ListBuild(Datum, Server, Niveau))
+	Set Query = ##class(TECH.DynamicQuery).%New(QueryString,$ListBuild(Datum, Niveau))
 	#dim ResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GetResultSet(Query)
 	While ResultSet.Next() {
 		Do LoggingIdsToDelete.Insert(ResultSet.GetDataByName("ID"))
 	}
 	Do ResultSet.Close()
 	
 	#Dim Logger As vhLib.Logger = ..%New("vhLib.Logger")
-	Do Logger.%New("vhLib.Logger").Info("VerwijderLogRecords", "'" _ LoggingIdsToDelete.Count() _ "' te wissen voor server '" _ Server _ "', datum '" _ Datum _ "', Niveau '" _ Niveau _ "'.")
+	Do Logger.%New("vhLib.Logger").Info("VerwijderLogRecords", "'" _ LoggingIdsToDelete.Count() _ "' te wissen voor datum '" _ Datum _ "', Niveau '" _ Niveau _ "'.")
 		
 	Do $system.OBJ.SetTransactionMode(0)
 	#Dim AantalGewist As %Integer = 0