Index: Tools/GlobalSizeMonitor/Analyser.cls.xml
===================================================================
diff -u -r3462 -r3711
--- Tools/GlobalSizeMonitor/Analyser.cls.xml	(.../Analyser.cls.xml)	(revision 3462)
+++ Tools/GlobalSizeMonitor/Analyser.cls.xml	(.../Analyser.cls.xml)	(revision 3711)
@@ -3,63 +3,52 @@
 <Class name="Tools.GlobalSizeMonitor.Analyser">
 <Super>TECH.RegisteredObject</Super>
 
-<Method name="BepaalHuidigeGroottes">
+<Method name="BerekenEnBewaarHuidigeGroottes">
 <Description>
 Oproepen via: 
-   Do ##class(Tools.GlobalSizeMonitor.Analyser).BepaalHuidigeGroottes()</Description>
+   Do ##class(Tools.GlobalSizeMonitor.Analyser).BerekenEnBewaarHuidigeGroottes()</Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
 	Kill ^Tools.GlobalSizA716.GlobalSizeD(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
-
-	;Do ..%New().Analyseer("E:\datam\Database\ADMIN\T\0")
-	Do ..%New().Analyseer("F:\datam\Database\DEV\T\0")
-
-	zw ^Tools.GlobalSizA716.GlobalSizeD(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
+	
+	#Dim Databases As %ArrayOfDataTypes = ##class(TECH.System).GeefDatabases()
+	#Dim DatabaseName As %String = Databases.Next("")
+	While ("" '= DatabaseName) {
+		Write ##class(TECH.System).GeefDirectory(DatabaseName), !
+		Do ..Analyseer(DatabaseName)
+		Set DatabaseName = Databases.Next(DatabaseName)
+	}
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-// Do ##class(Tools.GlobalSizeMonitor.Analyser).InputHuidigeGroottes()
-
-]]></Content>
-</UDLText>
-
-<Method name="InputHuidigeGroottes">
+<Method name="SchrijfBewaardeGroottesNaarConsole">
+<Description>
+Do ##class(Tools.GlobalSizeMonitor.Analyser)SchrijfBewaardeGroottesNaarConsole()</Description>
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[
-	Kill ^Tools.GlobalSizA716.GlobalSizeD(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
-	;Do ..Analyseer("E:\datam\Database\DEV\G\0")
-	Do ..Analyseer("E:\datam\Database\DEV\G\1")
-	;Do ..Analyseer("E:\datam\Database\DEV\G\2")
-	zw ^Tools.GlobalSizA716.GlobalSizeD(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
+<Implementation><![CDATA[	zw ^Tools.GlobalSizA716.GlobalSizeD(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
 ]]></Implementation>
 </Method>
 
 <Method name="Analyseer">
+<Description>
+@Param DatabaseName %String Dit is in de vorm van "DEV-G1".</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>DatabaseDirectory:%String</FormalSpec>
+<FormalSpec>DatabaseName:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	#Dim DatabaseDirectory As %String = ##class(TECH.System).GeefDirectory(DatabaseName)
 	Set ResultSet = ##class(%ResultSet).%New("%SYS.GlobalQuery:Size")
 	Do ResultSet.Execute(DatabaseDirectory)
 	While (ResultSet.Next()) {
 		#dim GlobalName As %String = ResultSet.Data("Name")
+		Write GlobalName, "   "
 		#dim AllocatedMB As %Decimal = ResultSet.Data("Allocated MB")
 		#dim UsedMB As %Decimal = ResultSet.Data("Used MB")
-		set GlobalSizeInfo = ##class(Tools.GlobalSizeMonitor.GlobalSize).%New(GlobalName,AllocatedMB,UsedMB)
+		set GlobalSizeInfo = ##class(Tools.GlobalSizeMonitor.GlobalSize).%New(GlobalName,AllocatedMB,UsedMB, DatabaseName)
 		do GlobalSizeInfo.Save()		
 	}
 ]]></Implementation>
 </Method>
-
-<Method name="GetDictoriesToAnalyseIterator">
-<ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[
-	;
-	;quit ##class(TECH.
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: Tools/GlobalSizeMonitor/GlobalSize.cls.xml
===================================================================
diff -u -r1605 -r3711
--- Tools/GlobalSizeMonitor/GlobalSize.cls.xml	(.../GlobalSize.cls.xml)	(revision 1605)
+++ Tools/GlobalSizeMonitor/GlobalSize.cls.xml	(.../GlobalSize.cls.xml)	(revision 3711)
@@ -24,14 +24,19 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Database">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Index name="ZoekIndex">
 <IdKey>1</IdKey>
-<Properties>Datum,GlobalNaam</Properties>
+<Properties>Datum,GlobalNaam,Database</Properties>
 <Unique>1</Unique>
 </Index>
 
 <Method name="%OnNew">
-<FormalSpec>GlobalNaam:%String,Allocated:%Decimal,Used:%Decimal</FormalSpec>
+<FormalSpec>GlobalNaam:%String,Allocated:%Decimal,Used:%Decimal,Database:%String=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -41,6 +46,7 @@
 	Set ..GlobalNaam = GlobalNaam
 	Set ..Allocated = Allocated
 	Set ..Used = Used
+	Set ..Database = Database
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -62,6 +68,9 @@
 <Value name="3">
 <Value>Used</Value>
 </Value>
+<Value name="4">
+<Value>Database</Value>
+</Value>
 </Data>
 </Storage>
 </Class>