Index: Tools/Install.cls.xml
===================================================================
diff -u -r1246 -r1430
--- Tools/Install.cls.xml	(.../Install.cls.xml)	(revision 1246)
+++ Tools/Install.cls.xml	(.../Install.cls.xml)	(revision 1430)
@@ -6,55 +6,31 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
 
+<Property name="PoortOpComputerNaamArray">
+<Type>%String</Type>
+<Collection>array</Collection>
+<Private>1</Private>
+</Property>
+
 <Method name="SetupLocal">
-<ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
 
 	If ($G(^SYS("IsDataMOmgeving"),0))
 	{
+		Do ..InitieerPoortOpComputerNaamArray()
+		
 		write "opzetten DATA",!
-		set idxUser =""
-		for  { set idxUser = $order(^DATA(0,"SYS",idxUser)) quit:idxUser="" 
-			set $piece(^DATA(0,"SYS",idxUser,0),"\",1)=$$$NSpace
-		}
+		Do ..StelInDATA()
 		
 		write "opzetten cQSYS",!
 		set ^cQSYS(0,"FIXED","NBN","LOCALHOST")=$get(^cQSYS(0,"FIXED","NBN",$$$Server))
 		
 		write "opzetten cLOG",!
-		if $data(^cLOG("CACHE01")) {		
-			merge ^cLOG($$$Server)=^cLOG("CACHE01")
-			if $$$Server'="CACHE01" Kill ^cLOG("CACHE01")
-		}
+		Do ..StelIncLOG()
 		
-		if '$data(^cLOG($$$Server)) write "/!\ cLOG voor server '"_$$$Server_"' niet opgezet /!\"
+		write "opzetten KBA",!
+		Do ..StelInKBA()
 		
-		if $data(^cLOG("ADMIN1")) {		
-			merge ^cLOG($$$NSpace)=^cLOG("ADMIN1")
-			if $$$NSpace'="ADMIN1" Kill ^cLOG("ADMIN1")
-		}
-		
-		if '$data(^cLOG($$$NSpace)) write "/!\ cLOG voor namespace niet opgezet /!\"
-
-		set device = ""
-		for { set device = $order(^cLOG($$$Server,"QQM",device)) quit:device=""
-			Kill ^cLOG($$$Server,"QQM",device)
-			set ^cLOG($$$Server,"QQM",device,$$$NSpace)="K\1\"
-		}
-		set ^cLOG($$$NSpace,"DESCRIPTION",0,0)=$$$Server_" - "_$$$NSpace
-		
-		set ^KBA(99,1)=$$$Server_" - "_$$$NSpace
-		set ^KBA(99,"D",1)=$$$Server_" - "_$$$NSpace
-		
-		set ^cLOG(0,"OS",1,"system")="\"_$$$Server_"\"
-		set ^cLOG(0,"OS",2,"system")="\"_$$$Server_"\"
-				
-		set ^cLOG(0,"LOGON","MC")="do ##class(TECH.Logon).AlternateUserNamespace()"
-		
-		set ^cLOG($$$NSpace,"SYSTEM","MASTER")=$$$Server
-		
-		do ..StelInGebruikerEigenschappen()
-		
 		do ..FixMenuItems()
 	}
 	else {
@@ -63,24 +39,107 @@
 ]]></Implementation>
 </Method>
 
-<Method name="FixMenuItems">
-<ClassMethod>1</ClassMethod>
+<Method name="InitieerPoortOpComputerNaamArray">
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim GlobalNode As %String = "^DAMBA(""MENU"")"
-	for { set GlobalNode = $query(@GlobalNode) quit:GlobalNode=""
-		if $qlength(GlobalNode)=3 {
-			if $piece(@GlobalNode,"\",9)["ADMIN" {
-				#dim NameSpace As %String = $zstrip($$$NSpace,"*N")
-				set $piece(@GlobalNode,"\",9)=##class(TECH.StringUtils).Replace($piece(@GlobalNode,"\",9),"ADMIN",NameSpace)
-			}
-		}
+	Do ..PoortOpComputerNaamArray.SetAt("PV",1015)
+	Do ..PoortOpComputerNaamArray.SetAt("PBO",1026)
+	Do ..PoortOpComputerNaamArray.SetAt("MVI",1042)
+	Do ..PoortOpComputerNaamArray.SetAt("WV",1097)
+	Do ..PoortOpComputerNaamArray.SetAt("JBL",1127)
+	Do ..PoortOpComputerNaamArray.SetAt("PRA",1150)
+	Do ..PoortOpComputerNaamArray.SetAt("PJE",1191)
+	Do ..PoortOpComputerNaamArray.SetAt("JCL",1195)
+	Do ..PoortOpComputerNaamArray.SetAt("FMA",1204)
+]]></Implementation>
+</Method>
+
+<Method name="StelInDATA">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim idxUser As %String = ""
+	for  { set idxUser = $order(^DATA(0,"SYS",idxUser)) quit:idxUser="" 
+		set $piece(^DATA(0,"SYS",idxUser,0),"\",1)=$$$NSpace
+	}
+]]></Implementation>
+</Method>
+
+<Method name="StelIncLOG">
+<Private>1</Private>
+<Implementation><![CDATA[
+	if $data(^cLOG("CACHE01")) {		
+		merge ^cLOG($$$Server)=^cLOG("CACHE01")
+		if $$$Server'="CACHE01" Kill ^cLOG("CACHE01")
+	}
 	
+	if '$data(^cLOG($$$Server)) write "/!\ cLOG voor server '"_$$$Server_"' niet opgezet /!\"
+	
+	if $data(^cLOG("ADMIN1")) {		
+		merge ^cLOG($$$NSpace)=^cLOG("ADMIN1")
+		if $$$NSpace'="ADMIN1" Kill ^cLOG("ADMIN1")
+	}		
+		
+	if '$data(^cLOG($$$NSpace)) write "/!\ cLOG voor namespace niet opgezet /!\"
+
+	set ^cLOG($$$NSpace,"DESCRIPTION",0,0)=$$$Server_" - "_$$$NSpace
+	
+	set ^cLOG(0,"OS",1,"system")="\"_$$$Server_"\"
+	set ^cLOG(0,"OS",2,"system")="\"_$$$Server_"\"
+	
+	set ^cLOG($$$Server,"TTT") = 1
+	Set ^cLOG($$$Server,"UPDATE",0)	= 	"0\A:\d:/datam/temp/"
+	Set ^cLOG($$$Server,"Q",$$$NSpace) = "DAM\K"
+			
+	set ^cLOG(0,"LOGON","MC")="do ##class(TECH.Logon).AlternateUserNamespace()"
+	
+	set ^cLOG($$$NSpace,"SYSTEM","MASTER")=$$$Server
+	
+	Do ..StelIncLOGQQM()
+	Do ..StelIncLOGTERMINAL()
+	Do ..StelInGebruikerEigenschappen()
+]]></Implementation>
+</Method>
+
+<Method name="StelIncLOGQQM">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim device As %String = ""
+	for { set device = $order(^cLOG($$$Server,"QQM",device)) quit:device=""
+		Kill ^cLOG($$$Server,"QQM",device)
+		set ^cLOG($$$Server,"QQM",device,$$$NSpace)="K\1\"
 	}
+	
+	Set PoortOpComputerNaamIt = ##class(TECH.ListIterator).%New(..PoortOpComputerNaamArray)
+	While PoortOpComputerNaamIt.HasNext(){
+		#dim ComputerNaam As %String = PoortOpComputerNaamIt.Next()
+		#dim Poort As %Integer = PoortOpComputerNaamIt.Key()		
+		set ^cLOG($$$Server,"QQM",Poort,$$$NSpace)="K\1\"
+	}
 ]]></Implementation>
 </Method>
 
+<Method name="StelIncLOGTERMINAL">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim device As %String = ""
+	for { set device = $order(^cLOG($$$Server,"TERMINAL",device)) quit:device=""
+		Kill ^cLOG($$$Server,"TERMINAL",device)
+		set ^cLOG($$$Server,"TERMINAL",device)="D ^vhINITML"
+		set ^cLOG($$$NSpace,"TERMINAL",device)="D ^vhINITML"
+	}
+	
+	Set PoortOpComputerNaamIt = ##class(TECH.ListIterator).%New(..PoortOpComputerNaamArray)
+	While PoortOpComputerNaamIt.HasNext(){
+		#dim ComputerNaam As %String = PoortOpComputerNaamIt.Next()
+		#dim Poort As %Integer = PoortOpComputerNaamIt.Key()		
+		set ^cLOG($$$Server,"TERMINAL",Poort)="D ^vhINITML"
+		set ^cLOG($$$NSpace,"TERMINAL",Poort)="D ^vhINITML"
+	}
+]]></Implementation>
+</Method>
+
 <Method name="StelInGebruikerEigenschappen">
-<ClassMethod>1</ClassMethod>
+<Private>1</Private>
 <Implementation><![CDATA[
 	Do ..CreateICTPinningNodes()
     #dim Key As %String = ""
@@ -92,27 +151,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="StelInKBA">
+<Private>1</Private>
+<Implementation><![CDATA[
+	set ^KBA(99,1)=$$$Server_" - "_$$$NSpace
+	set ^KBA(99,"D",1)=$$$Server_" - "_$$$NSpace
+]]></Implementation>
+</Method>
+
 <Method name="CreateICTPinningNodes">
-<ClassMethod>1</ClassMethod>
 <Private>1</Private>
 <Implementation><![CDATA[
 	kill ^cLOG($$$Server,"PIN")
-	set ^cLOG($$$Server,"PIN",1015)="PV"
-    set ^cLOG($$$Server,"PIN",1027)="CW"
-    set ^cLOG($$$Server,"PIN",1097)="WV"
-    set ^cLOG($$$Server,"PIN",1127)="JBL"
-    set ^cLOG($$$Server,"PIN",1150)="PRA"
-    set ^cLOG($$$Server,"PIN",1191)="CSC"
-    set ^cLOG($$$Server,"PIN",1195)="JCL"
-    set ^cLOG($$$Server,"PIN",1204)="FMA"
-    set ^cLOG($$$Server,"PIN",1026)="PBO"
-    set ^cLOG($$$Server,"PIN",1042)="MVI"
-    set ^cLOG($$$Server,"PIN",1191)="PJE"
+	
+	Set PoortOpComputerNaamIt = ##class(TECH.ListIterator).%New(..PoortOpComputerNaamArray)
+	While PoortOpComputerNaamIt.HasNext(){
+		#dim ComputerNaam As %String = PoortOpComputerNaamIt.Next()
+		#dim Poort As %Integer = PoortOpComputerNaamIt.Key()		
+		set ^cLOG($$$Server,"PIN",Poort) = ComputerNaam
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="CreatecQSYS">
-<ClassMethod>1</ClassMethod>
 <FormalSpec>Naam:%String,Key:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -122,7 +183,6 @@
 </Method>
 
 <Method name="CreatePAPTYP">
-<ClassMethod>1</ClassMethod>
 <FormalSpec>Naam:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -137,6 +197,22 @@
 	Set ^cLOG($$$Server,"PAP","BZ","SE")="Spooretiketten\18\80\0\0\0"
 ]]></Implementation>
 </Method>
+
+<Method name="FixMenuItems">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim GlobalNode As %String = "^DAMBA(""MENU"")"
+	for { set GlobalNode = $query(@GlobalNode) quit:GlobalNode=""
+		if $qlength(GlobalNode)=3 {
+			if $piece(@GlobalNode,"\",9)["ADMIN" {
+				#dim NameSpace As %String = $zstrip($$$NSpace,"*N")
+				set $piece(@GlobalNode,"\",9)=##class(TECH.StringUtils).Replace($piece(@GlobalNode,"\",9),"ADMIN",NameSpace)
+			}
+		}
+	
+	}
+]]></Implementation>
+</Method>
 </Class>