Index: TECH/GlobalMultiDimIterator.cls.xml
===================================================================
diff -u
--- TECH/GlobalMultiDimIterator.cls.xml	(revision 0)
+++ TECH/GlobalMultiDimIterator.cls.xml	(revision 3134)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.GlobalMultiDimIterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="InitialGlobalReference">
+<Type>TECH.String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="InitialGlobalReferenceSubscriptLength">
+<Type>TECH.Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="CurrentGlobalReference">
+<Type>TECH.String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>GlobalReference:TECH.String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..InitialGlobalReference = GlobalReference
+	set ..InitialGlobalReferenceSubscriptLength = $qlength(GlobalReference)
+	do ..Reset()
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim HasNext As %Boolean = $query(@..CurrentGlobalReference) '= ""
+	quit HasNext
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[
+	set ..CurrentGlobalReference = $query(@..CurrentGlobalReference)
+	#dim Next As %CacheString = $select(..CurrentGlobalReference="":"",1:$get(@..CurrentGlobalReference))
+	quit Next
+]]></Implementation>
+</Method>
+
+<Method name="Key">
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[
+	#dim Counter As %Integer
+	#dim Key As TECH.String = ""
+	#dim CurrentGlobalReferenceSubscriptLength As TECH.Integer = $qlength(..CurrentGlobalReference)
+	for Counter = 1 : 1 : CurrentGlobalReferenceSubscriptLength {
+		#dim Value As %String = $qsubscript(..CurrentGlobalReference,Counter)
+		set Key = Key _ $$$If(Value?.N,Value,$$$TussenQuotes(Value))
+		set:Counter<CurrentGlobalReferenceSubscriptLength Key = Key_","
+	}
+	quit $$$If($Length(Key),"("_Key_")",Key)
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[	set ..CurrentGlobalReference = ..InitialGlobalReference
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/GlobalMultiDimIterator/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/GlobalMultiDimIterator/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/GlobalMultiDimIterator/Test.cls.xml	(revision 3134)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.GlobalMultiDimIterator.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="DataGlobal">
+<Type>%String</Type>
+<Default>^vhUnitTest.TECH.GlobalMultiDimIterator</Default>
+</Parameter>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:TECH.String</FormalSpec>
+<Implementation><![CDATA[
+	do ##super(aTestName)
+	do ..DeleteData()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:TECH.String</FormalSpec>
+<Implementation><![CDATA[
+	do ..DeleteData()
+	do ##super(aTestName)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Multiple integer items">
+<Implementation><![CDATA[
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1)="Item1"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(2)="Item2"
+	
+	set Iterator = ##class(TECH.GlobalMultiDimIterator).%New("^vhUnitTest.TECH.GlobalMultiDimIterator")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item1")
+	do $$$AssertEquals(Iterator.Key(),"(1)")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item2")
+	do $$$AssertEquals(Iterator.Key(),"(2)")
+	do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Multiple items - string and integers">
+<Implementation><![CDATA[
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1)="Item1"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator("A")="ItemA"
+	
+	set Iterator = ##class(TECH.GlobalMultiDimIterator).%New("^vhUnitTest.TECH.GlobalMultiDimIterator")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item1")
+	do $$$AssertEquals(Iterator.Key(),"(1)")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"ItemA")
+	do $$$AssertEquals(Iterator.Key(),"(""A"")")
+	do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Multiple nodes waarvan er één geskipped wordt">
+<Implementation><![CDATA[
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1)="SkippedNode"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1,1)="Item1.1"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1,2)="Item1.2"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1,3,1)="Item1.3.1"
+	
+	set Iterator = ##class(TECH.GlobalMultiDimIterator).%New("^vhUnitTest.TECH.GlobalMultiDimIterator(1)")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item1.1")
+	do $$$AssertEquals(Iterator.Key(),"(1,1)")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item1.2")
+	do $$$AssertEquals(Iterator.Key(),"(1,2)")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item1.3.1")
+	do $$$AssertEquals(Iterator.Key(),"(1,3,1)")
+	do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Reset">
+<Implementation><![CDATA[
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1)="SkippedNode"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1,1)="Item1.1"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1,2)="Item1.2"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1,3,1)="Item1.3.1"
+	
+	set Iterator = ##class(TECH.GlobalMultiDimIterator).%New("^vhUnitTest.TECH.GlobalMultiDimIterator(1)")
+	
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item1.1")
+	do $$$AssertEquals(Iterator.Key(),"(1,1)")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item1.2")
+	do $$$AssertEquals(Iterator.Key(),"(1,2)")
+	do Iterator.Reset()
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item1.1")
+	do $$$AssertEquals(Iterator.Key(),"(1,1)")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Level 2 in combinatie met Level 1">
+<Implementation><![CDATA[
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1,1)="Item1.1"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(2)="Item2"
+	
+	set Iterator = ##class(TECH.GlobalMultiDimIterator).%New("^vhUnitTest.TECH.GlobalMultiDimIterator")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item1.1")
+	do $$$AssertEquals(Iterator.Key(),"(1,1)")
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next(),"Item2")
+	do $$$AssertEquals(Iterator.Key(),"(2)")
+	do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als we lager in de tree vertrekken dan komen we geen nodes meer tegen">
+<Implementation><![CDATA[
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(1,1)="SkippedNode"
+	set ^vhUnitTest.TECH.GlobalMultiDimIterator(2,1)="SkippedNode"
+	
+	set Iterator = ##class(TECH.GlobalMultiDimIterator).%New("^vhUnitTest.TECH.GlobalMultiDimIterator(3)")
+	do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="DeleteData">
+<Private>1</Private>
+<Implementation><![CDATA[	kill @..#DataGlobal
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>