Index: vhLib/Logger.cls.xml
===================================================================
diff -u -r3536 -r3540
--- vhLib/Logger.cls.xml	(.../Logger.cls.xml)	(revision 3536)
+++ vhLib/Logger.cls.xml	(.../Logger.cls.xml)	(revision 3540)
@@ -213,83 +213,6 @@
 	quit
 ]]></Implementation>
 </Method>
-
-<Method name="ClearOldLogItems">
-<Description>
-Do ##class(vhLib.Logger).ClearOldLogItems(30,30,10,10)</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>DaysError:%Integer=30,DaysWarning:%Integer=30,DaysInformation:%Integer=10,DaysDebug:%Integer=10</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set OldDateTimeError = $$$CurrentDate-DaysError	
-	Set OldDateTimeWarning = $$$CurrentDate-DaysWarning
-	Set OldDateTimeInformation = $$$CurrentDate-DaysInformation
-	Set OldDateTimeDebug = $$$CurrentDate-DaysDebug
-	
-	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
-]]></Implementation>
-</Method>
-
-<Method name="RemoveLogByItem">
-<ClassMethod>1</ClassMethod>
-<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 Niveau=?"
-		Do ..VerwijderLogRecords(QueryString, Datum, Niveau)
-	} Else {
-		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 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,Niveau:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set LoggingIdsToDelete = ##class(TECH.ListOfDataTypesOnDisk).%New()
-	
-	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 datum '" _ Datum _ "', Niveau '" _ Niveau _ "'.")
-		
-	Do $system.OBJ.SetTransactionMode(0)
-	#Dim AantalGewist As %Integer = 0
-	Set IdsToDeleteIterator = ##class(TECH.ListIterator).%New( LoggingIdsToDelete )
-	While IdsToDeleteIterator.HasNext() {
-		Set IdToDelete = IdsToDeleteIterator.Next()
-		Do ##class(vhLib.Logging).DeleteLogging(IdToDelete)
-		Set AantalGewist = AantalGewist + 1
-	}
-	
-	Do:(LoggingIdsToDelete.Count() > 0) Logger.Info("VerwijderLogRecords", "'" _ AantalGewist _ "' gewist voor datum '" _ Datum _ "', Niveau '" _ Niveau _ "'.")
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhLib/LogOpkuiser.cls.xml
===================================================================
diff -u
--- vhLib/LogOpkuiser.cls.xml	(revision 0)
+++ vhLib/LogOpkuiser.cls.xml	(revision 3540)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhLib.LogOpkuiser">
+<ClassType/>
+<IncludeCode>vhLib.Macro</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Mockable</Super>
+
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BulkAantal">
+<Type>%Integer</Type>
+<InitialExpression>1000</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Logger = ##class(vhLib.Logger).%New("vhLib.LogOpkuiser")
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ZetBulkAantal">
+<FormalSpec>BulkAantal:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..BulkAantal = BulkAantal
+]]></Implementation>
+</Method>
+
+<Method name="KuisOpOudeLogs">
+<Description>
+Do ##class(vhLib.LogOpkuiser).KuisOpOudeLogs(30,30,10,10)</Description>
+<FormalSpec>DaysError:%Integer=30,DaysWarning:%Integer=30,DaysInformation:%Integer=10,DaysDebug:%Integer=10</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set OldDateTimeError = $$$CurrentDate-DaysError	
+	Set OldDateTimeWarning = $$$CurrentDate-DaysWarning
+	Set OldDateTimeInformation = $$$CurrentDate-DaysInformation
+	Set OldDateTimeDebug = $$$CurrentDate-DaysDebug
+	
+	Do ..KuisOpLogsVanNiveau(OldDateTimeError, "E")	
+	Do ..KuisOpLogsVanNiveau(OldDateTimeWarning, "W")	
+	Do ..KuisOpLogsVanNiveau(OldDateTimeInformation, "I")	
+	Do ..KuisOpLogsVanNiveau(OldDateTimeDebug, "D")
+	
+	#dim Date = ""
+	for { set Date = $O(^ERRORS(Date)) Quit:Date=""
+		if Date < OldDateTimeError kill ^ERRORS(Date)
+	}
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="KuisOpLogsVanNiveau">
+<FormalSpec>Datum:%Date,Niveau:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim QueryString As %String
+	
+	If $$$Not(Niveau = "I") {
+		Set QueryString = "SELECT %NOLOCK TOP " _ ..BulkAantal _ " ID FROM vhLib.Logging WHERE Datum<=? AND Niveau=?"
+		Do ..KuisOpLogsViaSelectieQuery(QueryString, Datum, Niveau)
+	} Else {
+		Set QueryString = "SELECT %NOLOCK TOP " _ ..BulkAantal _ " ID FROM vhLib.Logging WHERE Datum<=? AND Niveau=? AND Groep<>'WS.Vhisie4.Winkelkar.WinkelkarService'"
+		Do ..KuisOpLogsViaSelectieQuery(QueryString, Datum, Niveau)
+		
+		Set Datum = Datum - 20
+		Set QueryString = "SELECT %NOLOCK TOP " _ ..BulkAantal _ " ID FROM vhLib.Logging WHERE Datum<=? AND Niveau=? AND Groep='WS.Vhisie4.Winkelkar.WinkelkarService'"
+		Do ..KuisOpLogsViaSelectieQuery(QueryString, Datum, Niveau)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="KuisOpLogsViaSelectieQuery">
+<FormalSpec>QueryString:%String,Datum:%Date,Niveau:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim NogLogsOpTeKuisen As %Boolean = 1
+	#Dim AantalGewist As %Integer = 0
+	While NogLogsOpTeKuisen {
+		Set AantalGewist = ..KuisOpLogsViaSelectieQueryEénRonde(QueryString, Datum, Niveau)
+		Set NogLogsOpTeKuisen = (AantalGewist > 0)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="KuisOpLogsViaSelectieQueryEénRonde">
+<Description>
+@Return Het aantal gewiste records.</Description>
+<FormalSpec>QueryString:%String,Datum:%Date,Niveau:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	Set LoggingIdsToDelete = ##class(TECH.ListOfDataTypesOnDisk).%New()
+	
+	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()
+	
+	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
+	Set IdsToDeleteIterator = ##class(TECH.ListIterator).%New( LoggingIdsToDelete )
+	While IdsToDeleteIterator.HasNext() {
+		Set IdToDelete = IdsToDeleteIterator.Next()
+		Do ##class(vhLib.Logging).DeleteLogging(IdToDelete)
+		Set AantalGewist = AantalGewist + 1
+	}
+	
+	Do:(LoggingIdsToDelete.Count() > 0) ..Logger.Info("VerwijderLogRecords", "'" _ AantalGewist _ "' gewist voor datum '" _ Datum _ "', Niveau '" _ Niveau _ "'.")
+	
+	Quit AantalGewist
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>