Index: Tools/SQLExporter.cls.xml
===================================================================
diff -u -r3161 -r3174
--- Tools/SQLExporter.cls.xml	(.../SQLExporter.cls.xml)	(revision 3161)
+++ Tools/SQLExporter.cls.xml	(.../SQLExporter.cls.xml)	(revision 3174)
@@ -2,73 +2,135 @@
 <Export generator="Cache" version="9">
 <Class name="Tools.SQLExporter">
 <Description>
-// Do ##class(Tools.SQLExporter).ExportUsers("C:\temp\users.xml")</Description>
+// Do ##class(Tools.SQLExporter).ExportSettings("C:\temp\users.xml")</Description>
 <IncludeCode>vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Method name="ExportUsers">
-<Description>
-genereer tab gescheiden bestand met Usernaam in eerste kolom, gevolgd door alle groepen waarin de user zit.</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>UsersBestand:%String</FormalSpec>
+<Property name="Settings">
+<Type>Tools.dto.SQL.Settings</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Filename">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="ExportSettings">
+<FormalSpec>Filename:%String</FormalSpec>
 <Implementation><![CDATA[
-	Set OriginalNamespace = $zu(5)
+	set ..Filename = Filename
+	set ..Settings = ##class(Tools.dto.SQL.Settings).%New()
 	
-	Set Bestand = ##class(TECH.File.FileWriter).%New(UsersBestand)
+	set ..Settings.Users = ..GeefGebruikers()
+	set ..Settings.Roles = ..GeefRollen()
 	
-	Set Settings = ##class(Tools.dto.SQL.Settings).%New()
-			
-	zn "%SYS"
-	Set UserName = ""
-	Set UserName = $O(^%SYS("sql","users","1",UserName))
-	zn OriginalNamespace
-	While (UserName '= ""){
-		
-		S UserProperties = ##class(%Library.SQLCatalog).Roles(UserName)				
-		
-		If (UserName '[ "_") {
-			Set User = ##class(Tools.dto.SQL.User).%New()
-			Set User.Naam = UserName
-			w "Geef het paswoord voor gebruiker '"_User.Naam_"' : " 
-			Read Paswoord
-			Set User.Paswoord = Paswoord
-			w ! 
-			for i=3:1:$ll(UserProperties) {
-				Set Role = ##class(Tools.dto.SQL.Role).%New()
-				Set Role.Naam = $LG(UserProperties,i)
-				Do User.Roles.Insert(Role)
-			}
-			Do Settings.Users.Insert(User)
-		}			
-		
-		zn "%SYS"		
-		Set UserName = $O(^%SYS("sql","users","1",UserName))		
-		zn OriginalNamespace
-	}
+	do ..ExporteerBestand()
 	
-	DO Bestand.WriteXML(Settings)
+	quit
 ]]></Implementation>
 </Method>
 
-<Method name="ExportTableNames">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>TableBestand:%String</FormalSpec>
+<Method name="ExporteerBestand">
+<Private>1</Private>
 <Implementation><![CDATA[
-	//Set Bestand = ##class(TECH.File.FileWriter).%New(TableBestand)
+	set Filewriter =  ##class(TECH.File.FileWriter).%New(..Filename)
+	do Filewriter.WriteXML(..Settings)
+	do Filewriter.Close()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRollen">
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	set Rollen = ##class(%ListOfObjects).%New()
+	set itRollen = ##class(TECH.ListIterator).%New(##class(TECH.SQLUtils).GeefRollen())
+	while itRollen.HasNext() {
+		set Rol = itRollen.Next()
+		do Rollen.Insert(..GeefRolInformatie(Rol))
+	}
+	quit Rollen
+]]></Implementation>
+</Method>
+
+<Method name="GeefRolInformatie">
+<FormalSpec>Rol:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>Tools.dto.SQL.Role</ReturnType>
+<Implementation><![CDATA[
+	Set dtoRol = ##class(Tools.dto.SQL.User).%New()
+	Set dtoRol.Naam = Rol
+	set dtoRol.Tables = ..GeefTabelPrivileges(Rol)
+	set dtoRol.Views = ..GeefViewPrivileges(Rol)
+	quit dtoRol
+]]></Implementation>
+</Method>
+
+<Method name="GeefGebruikers">
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	set Gebruikers = ##class(%ListOfObjects).%New()
+	set itGebruikers = ##class(TECH.ListIterator).%New(##class(TECH.SQLUtils).GeefGebruikers())
+	while itGebruikers.HasNext() {
+		set Gebruiker = itGebruikers.Next()
+		do Gebruikers.Insert(..GeefGebruikerInformatie(Gebruiker))
+	}
+	quit Gebruikers
+]]></Implementation>
+</Method>
+
+<Method name="GeefGebruikerInformatie">
+<FormalSpec>Gebruiker:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>Tools.dto.SQL.User</ReturnType>
+<Implementation><![CDATA[
+	Set dtoUser = ##class(Tools.dto.SQL.User).%New()
+	Set dtoUser.Naam = Gebruiker
+	set dtoUser.Paswoord = ##class(TECH.SQLUtils).GeefPassword(Gebruiker)
+	set dtoUser.Roles = ..GeefGebruikersRollen(Gebruiker)
+	set dtoUser.Tables = ..GeefTabelPrivileges(Gebruiker)
+	set dtoUser.Views = ..GeefViewPrivileges(Gebruiker)
+	quit dtoUser
+]]></Implementation>
+</Method>
+
+<Method name="GeefTabelPrivileges">
+<FormalSpec>Gebruiker:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ArrayOfObjects</ReturnType>
+<Implementation><![CDATA[
+	set TabelPrivilege = ##class(Tools.SQLExporter.impl.TabelPrivileges).%New(Gebruiker)
+	quit TabelPrivilege.GeefPrivileges()
+]]></Implementation>
+</Method>
+
+<Method name="GeefViewPrivileges">
+<FormalSpec>Gebruiker:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ArrayOfObjects</ReturnType>
+<Implementation><![CDATA[
+	set ViewPrivilege = ##class(Tools.SQLExporter.impl.ViewPrivileges).%New(Gebruiker)
+	quit ViewPrivilege.GeefPrivileges()
+]]></Implementation>
+</Method>
+
+<Method name="GeefGebruikersRollen">
+<FormalSpec>Gebruiker:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	set Rollen = ##class(%ListOfDataTypes).%New()
 	
-	zn "%SYS"
-	Set ResultSet = ##class(%ResultSet).%New("%Library.SQLCatalog:SQLTables")
-	Set Status = ResultSet.Execute()
-	w Status,!
-	While (ResultSet.Next())
-	{	
-		w ResultSet.Data("SQL_RESERVED_WORD"),!	
+	set UserProperties = ##class(%Library.SQLCatalog).Roles(Gebruiker)
+	for ctr=3:1:$listlength(UserProperties) {
+		do Rollen.Insert($listget(UserProperties,ctr))
 	}
-	w $g(%objlasterror),!
 	
-	zn "DEV"
+	quit Rollen
 ]]></Implementation>
 </Method>
 </Class>