Index: zTryout/ARC/DOM/MAG/StockeerbaarProduct.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/DOM/MAG/StockeerbaarProduct.cls.xml	(.../StockeerbaarProduct.cls.xml)	(revision 1222)
+++ zTryout/ARC/DOM/MAG/StockeerbaarProduct.cls.xml	(.../StockeerbaarProduct.cls.xml)	(revision 1640)
@@ -49,6 +49,26 @@
 <ReturnType>%Boolean</ReturnType>
 </Method>
 
+<Method name="GeefAantalGereserveerdUitStock">
+<Abstract>1</Abstract>
+<ReturnType>%Integer</ReturnType>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[/* GeefAantalGereserveerdUitKomLink */
+]]></Content>
+</UDLText>
+
+<Method name="GeefAantalGereservUitKomLink">
+<Abstract>1</Abstract>
+<ReturnType>%Integer</ReturnType>
+</Method>
+
+<Method name="GeefNormaalAantalStuksOpPallet">
+<Abstract>1</Abstract>
+<ReturnType>%Integer</ReturnType>
+</Method>
+
 <Method name="Save">
 <Abstract>1</Abstract>
 </Method>
Index: zTryout/ARC/APP/impl/OrderExample.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/APP/impl/OrderExample.cls.xml	(.../OrderExample.cls.xml)	(revision 1222)
+++ zTryout/ARC/APP/impl/OrderExample.cls.xml	(.../OrderExample.cls.xml)	(revision 1640)
@@ -104,7 +104,7 @@
 	Set KlantAPI = Context.GeefKlantAPI()
 	Set ProductAPI = Context.GeefProductAPI()
 	Set OrderAPI = Context.GeefOrderAPI()
-	Set MagAPI = Context.GeefMagAPI()
+	Set MagAPI = Context.GeefMagazijnAPI()
 	
 	Set Order=OrderAPI.GeefOrder(OrderID)
 	w " ---- Tekstlijn toevoegen -----------------------------",!
@@ -160,8 +160,8 @@
 	. w "Product ", ProductNr, " (", Product.GeefOmschrijving(), "): ", ProductOrders(ProductNr), " items",!
 	. Set Classif = ProductAPI.GeefClassificatie(Product.Nr)
 	. If Classif '= "" { w "   Classificatie: ", Classif.GeefHoofdGroep(), " ", Classif.GeefGroep(), " ", Classif.GeefSubGroep(), ! }
-	. Set Mag = MagAPI.GeefMagazijnInfo(Product.Nr)
-	. w "   Magazijn info: Stock reservatie=", Mag.GeefStock(), ", PalletQty=", Mag.GeefPalletQty(),!
+	. Set StockeerbaarProduct = MagAPI.GeefStockeerbaarProduct(Product.Nr)
+	. w "   Magazijn info: Stock niveau=", StockeerbaarProduct.GeefFysiekStockNiveau(), " Aantal gereserveerd uit stock=", StockeerbaarProduct.GeefAantalGereserveerdUitStock(),!
 	w ProdCount, " products in order ", Order.GeefOrderNr(), !
 	w " ---- Order bewaren -----------------------------------",!
 	Do Order.Save()
Index: zTryout/ARC/APPS/PM/ProductService.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/APPS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 1222)
+++ zTryout/ARC/APPS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 1640)
@@ -39,7 +39,7 @@
 <Implementation><![CDATA[
 		Set ProductAPI = ##class(zTryout.ARC.APP.DomeinContext).Instance().GeefProductAPI()
 		Set FysiekProduct = ProductAPI.GeefFysiekProduct(ProductGewichtData.PRNr)
-		Do FysiekProduct.ZetGewicht(##class(zTryout.ARC.DOM.common.Gewicht).CreateKgPerDuizend(ProductGewichtData.GewichtInGram))
+		Do FysiekProduct.ZetGewicht(##class(zTryout.ARC.DOM.common.fysiek.Gewicht).CreateKgPerDuizend(ProductGewichtData.GewichtInGram))
 		Do FysiekProduct.Save()
 		
 		Set MagazijnAPI = ##class(zTryout.ARC.APP.DomeinContext).Instance().GeefMagazijnAPI()
Index: zTryout/ARC/TECH/Persistentie/GlobalUtils.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/TECH/Persistentie/GlobalUtils.cls.xml	(.../GlobalUtils.cls.xml)	(revision 1222)
+++ zTryout/ARC/TECH/Persistentie/GlobalUtils.cls.xml	(.../GlobalUtils.cls.xml)	(revision 1640)
@@ -17,19 +17,29 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>GlobalNaam:%String,Subscripts:%ListOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
-		Set NodeKey = GlobalNaam _ "("
-		
-		Set SubscriptsIterator = ##class(TECH.ListIterator).%New(Subscripts)
-		While (SubscriptsIterator.HasNext()) {
-			Set NodeKey = NodeKey _ ..OmringMetDubbeleQuotes(SubscriptsIterator.Next())
-			If (SubscriptsIterator.HasNext()) {
-				Set NodeKey = NodeKey _ ","
-			}
+	Set NodeKeyIsGeldig = 1
+	Set NodeKey = GlobalNaam _ "("
+	
+	Set SubscriptsIterator = ##class(TECH.ListIterator).%New(Subscripts)
+	While (SubscriptsIterator.HasNext()) {
+		Set SubscriptWaarde = SubscriptsIterator.Next()
+		If (' ..IsGeldigeSubscript(SubscriptWaarde)) {
+			Set NodeKeyIsGeldig = 0
 		}
 		
-		Set NodeKey = NodeKey _ ")"
-		
-		Quit NodeKey
+		Set NodeKey = NodeKey _ ..OmringMetDubbeleQuotes(SubscriptWaarde)
+		If (SubscriptsIterator.HasNext()) {
+			Set NodeKey = NodeKey _ ","
+		}
+	}
+	
+	Set NodeKey = NodeKey _ ")"
+	
+	If (NodeKeyIsGeldig) {
+		Quit NodeKey 
+	} Else {
+		Set $ECODE="NodeKeyIsOngeldig:[" _ NodeKey _ "]"
+	}
 ]]></Implementation>
 </Method>
 
@@ -40,5 +50,23 @@
 <Implementation><![CDATA[		Quit """" _ String _ """"
 ]]></Implementation>
 </Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/* Controleer dat de subscript geldig is.
+ * Elke niet-lege String is aanvaardbaar.
+ * Er is wel een beperking op lengte van een volledige node-referentie; die zouden we hier in principe ook kunnen controleren.
+ * Zie ook http://docs.intersystems.com/cache20101/csp/docbook/DocBook.UI.Page.cls?KEY=GGBL_structure#GGBL_structure_subscriptnaming
+ */
+]]></Content>
+</UDLText>
+
+<Method name="IsGeldigeSubscript">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Subscript:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ("" '= Subscript)
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhUnitTest/PRA/GlobalNode/PersistenceMgrTests.cls.xml
===================================================================
diff -u
--- vhUnitTest/PRA/GlobalNode/PersistenceMgrTests.cls.xml	(revision 0)
+++ vhUnitTest/PRA/GlobalNode/PersistenceMgrTests.cls.xml	(revision 1640)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.PRA.GlobalNode.PersistenceMgrTests">
+<Import>zTryout.ARC.TECH.Persistentie</Import>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ^vhUnitTestTECHGlobal(1,"a")="de waarde"
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Kill ^vhUnitTestTECHGlobal(1,"a")
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="TestGeefNode">
+<Implementation><![CDATA[
+	Set Node=##class(GlobalPersistenceMgr).Instance().GeefNode("^vhUnitTestTECHGlobal", 1, "a")
+	
+	Do $$$AssertTrue($IsObject(Node))
+	Do $$$AssertTrue(Node.IsPersistent())
+	Do $$$AssertEquals(Node.GeefPersistenteLokatie(),"^vhUnitTestTECHGlobal(""1"",""a"")")
+	Do $$$AssertFalse(Node.IsLeeg())
+	Do $$$AssertEquals(Node.GeefPiece(1),"de waarde")
+]]></Implementation>
+</Method>
+
+<Method name="TestStartStop">
+<Implementation><![CDATA[
+	Do ##class(GlobalPersistenceMgr).Start()
+
+	Set Node=##class(GlobalPersistenceMgr).Instance().GeefNode("^vhUnitTestTECHGlobal", 1, "a")
+
+	Do Node.ZetPiece(1,"gewijzigde waarde")
+	Do $$$AssertEquals(Node.GeefPiece(1),"gewijzigde waarde")
+
+	// Opnieuw opvragen van de node, geeft dezelfde, zolang dezelfde GlobalPersistenceMgr gebruikt wordt.
+	Set Node=##class(GlobalPersistenceMgr).Instance().GeefNode("^vhUnitTestTECHGlobal", 1, "a")
+	Do $$$AssertEquals(Node.GeefPiece(1),"gewijzigde waarde")
+	
+	Do ##class(GlobalPersistenceMgr).Stop()
+
+	// Na sluiten van een GlobalPersistenceMgr, krijg je een nieuwe in-memory representatie.
+	Set Node=##class(GlobalPersistenceMgr).Instance().GeefNode("^vhUnitTestTECHGlobal", 1, "a")
+	Do $$$AssertEquals(Node.GeefPiece(1),"de waarde")
+]]></Implementation>
+</Method>
+
+<Method name="TestMaakLegeNode">
+<Implementation><![CDATA[
+	Set Node=##class(GlobalPersistenceMgr).Instance().MaakLegeNode()
+	
+	Do $$$AssertFalse(Node.IsPersistent())
+	Do $$$AssertEquals(Node.GeefPersistenteLokatie(),"")
+]]></Implementation>
+</Method>
+
+<Method name="TestMaakNodePersistent">
+<Implementation><![CDATA[
+	Set Node=##class(GlobalPersistenceMgr).Instance().MaakLegeNode()
+	Do ##class(GlobalPersistenceMgr).Instance().MaakNodePersistent(Node, "^vhUnitTestTECHGlobal",2, "a")
+
+	Do $$$AssertTrue(Node.IsPersistent())
+	Do $$$AssertEquals(Node.GeefPersistenteLokatie(),"^vhUnitTestTECHGlobal(""2"",""a"")")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/PRA/GlobalNode/GlobalNodeTests.cls.xml
===================================================================
diff -u
--- vhUnitTest/PRA/GlobalNode/GlobalNodeTests.cls.xml	(revision 0)
+++ vhUnitTest/PRA/GlobalNode/GlobalNodeTests.cls.xml	(revision 1640)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.PRA.GlobalNode.GlobalNodeTests">
+<Import>zTryout.ARC.TECH.Persistentie</Import>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Node">
+<Type>GlobalNode</Type>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ^vhUnitTestTECHGlobal(1, "a")="de eerste waarde\de tweede waarde\de derde waarde"
+	Set ..Node = ##class(GlobalPersistenceMgr).Instance().GeefNode("^vhUnitTestTECHGlobal", 1, "a")
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Kill ^vhUnitTestTECHGlobal(1, "a")
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="TestGeefPiece">
+<Implementation><![CDATA[	Do $$$AssertEquals(..Node.GeefPiece(2), "de tweede waarde")
+]]></Implementation>
+</Method>
+
+<Method name="TestZetPiece">
+<Implementation><![CDATA[
+	Do ..Node.ZetPiece(2, "de tweede waarde is gewijzigd")
+	Do $$$AssertEquals(..Node.GeefPiece(2), "de tweede waarde is gewijzigd")
+]]></Implementation>
+</Method>
+
+<Method name="TestHeeftPiece">
+<Implementation><![CDATA[
+	Do $$$AssertTrue(..Node.HeeftPiece(1))
+	Do $$$AssertTrue(..Node.HeeftPiece(3))
+	Do $$$AssertFalse(..Node.HeeftPiece(4))
+	
+	Do ..Node.ZetPiece(5, "Piece 5")
+	Do $$$AssertFalse(..Node.HeeftPiece(4))
+	Do $$$AssertTrue(..Node.HeeftPiece(5))
+]]></Implementation>
+</Method>
+
+<Method name="TestIsGewijzigd">
+<Implementation><![CDATA[
+	Do $$$AssertFalse(..Node.IsGewijzigd())
+	Do ..Node.ZetPiece(2, "de tweede waarde is gewijzigd")
+	Do $$$AssertTrue(..Node.IsGewijzigd())
+]]></Implementation>
+</Method>
+
+<Method name="TestSave">
+<Implementation><![CDATA[
+	Do ..Node.ZetPiece(2, "de tweede waarde is gewijzigd")
+	Do ..Node.Save()
+	Do $$$AssertEquals("de tweede waarde is gewijzigd", $Piece(^vhUnitTestTECHGlobal(1, "a"), "\", 2))
+]]></Implementation>
+</Method>
+
+<Method name="TestGeefDelimitedString">
+<Implementation><![CDATA[
+	Do $$$AssertEquals("de eerste waarde\de tweede waarde\de derde waarde", ..Node.GeefDelimitedString())
+	
+	Do ..Node.ZetPiece(2, "de tweede waarde is gewijzigd")
+	Do $$$AssertEquals("de eerste waarde\de tweede waarde is gewijzigd\de derde waarde", ..Node.GeefDelimitedString())
+]]></Implementation>
+</Method>
+
+<Method name="TestIsLeeg">
+<Implementation><![CDATA[
+	Do $$$AssertFalse(..Node.IsLeeg())
+	
+	Do ..Node.ZetPiece(1, "")
+	Do ..Node.ZetPiece(2, "")
+	Do ..Node.ZetPiece(3, "")
+	Do ..Node.ZetPiece(4, "")
+	
+	Do $$$AssertTrue(..Node.IsLeeg())
+]]></Implementation>
+</Method>
+
+<Method name="TestDelete">
+<Implementation><![CDATA[
+	Do $$$AssertEquals(1, $Data(^vhUnitTestTECHGlobal(1, "a")))
+	Do ..Node.Delete()
+	Do $$$AssertEquals(0, $Data(^vhUnitTestTECHGlobal(1, "a")))
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: zTryout/ARC/DOM/MAG/impl/DataM/MagazijnAPI.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/DOM/MAG/impl/DataM/MagazijnAPI.cls.xml	(.../MagazijnAPI.cls.xml)	(revision 1222)
+++ zTryout/ARC/DOM/MAG/impl/DataM/MagazijnAPI.cls.xml	(.../MagazijnAPI.cls.xml)	(revision 1640)
@@ -8,7 +8,7 @@
 <Method name="GeefStockeerbaarProduct">
 <FormalSpec>PRNr:%String</FormalSpec>
 <ReturnType>zTryout.ARC.DOM.MAG.StockeerbaarProduct</ReturnType>
-<Implementation><![CDATA[		Quit ##class(DOM.MAG.impl.DataM.StockeerbaarProduct).%New(PRNr)
+<Implementation><![CDATA[		Quit ##class(zTryout.ARC.DOM.MAG.impl.DataM.StockeerbaarProduct).Open(PRNr)
 ]]></Implementation>
 </Method>
 </Class>
Index: zTryout/ARC/DOM/PM/impl/DataM/FysiekProduct.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/DOM/PM/impl/DataM/FysiekProduct.cls.xml	(.../FysiekProduct.cls.xml)	(revision 1222)
+++ zTryout/ARC/DOM/PM/impl/DataM/FysiekProduct.cls.xml	(.../FysiekProduct.cls.xml)	(revision 1640)
@@ -64,7 +64,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (' $IsObject(r%KprPrnr1)) {
-		Set r%KprPrnr1 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", "\", ..PRNr, 1)
+		Set r%KprPrnr1 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", ..PRNr, 1)
 	}
 	Quit r%KprPrnr1
 ]]></Implementation>
Index: zTryout/ARC/DOM/OV/impl/DataM/OrderlineFactory.cls.xml
===================================================================
diff -u -r1408 -r1640
--- zTryout/ARC/DOM/OV/impl/DataM/OrderlineFactory.cls.xml	(.../OrderlineFactory.cls.xml)	(revision 1408)
+++ zTryout/ARC/DOM/OV/impl/DataM/OrderlineFactory.cls.xml	(.../OrderlineFactory.cls.xml)	(revision 1640)
@@ -13,7 +13,7 @@
 <ReturnType>Orderlijn</ReturnType>
 <Implementation><![CDATA[
 		Set Type = LijnNode.GeefPiece(17)
-		if (Type = $$$LinetypeProduct) Quit ##class(DataMProductOrderlijn).%New(olijn,Order, LijnNode)
+		if (Type = $$$LinetypeProduct) Quit ##class(DataMProductOrderlijn).%New(olijn, Order, LijnNode)
 		if (Type = $$$LinetypeManual) Quit ##class(DataMManueleOrderlijn).%New(olijn, Order, LijnNode)
 		if (Type [ $$$LinetypeText) Quit ##class(DataMTextOrderlijn).%New(olijn, Order, LijnNode)
 		Quit ""
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMOrder.cls.xml
===================================================================
diff -u -r1408 -r1640
--- zTryout/ARC/DOM/OV/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 1408)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 1640)
@@ -292,7 +292,7 @@
 <ReturnType>Adres</ReturnType>
 <Implementation><![CDATA[
 	If (' $IsObject(r%Afleveradres)) {
-			Set CustInfoNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", "\", ..KlantNr, "F", ..Nr, 3)
+			Set CustInfoNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", ..KlantNr, "F", ..Nr, 3)
 			// TODO: deze lijn omzetten: Quit:$L($TR(CustInfo,$$$D,""))<5 ""
 			Set r%Afleveradres = ##class(DataMAdres).%New(CustInfoNode)
 	}
@@ -305,7 +305,7 @@
 <ReturnType>GlobalNode</ReturnType>
 <Implementation><![CDATA[
 	If (' $IsObject(r%HoofdingNode)) {
-		Set r%HoofdingNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", "\", ..KlantNr, "F", ..Nr, 1)
+		Set r%HoofdingNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", ..KlantNr, "F", ..Nr, 1)
 	}
 	Quit r%HoofdingNode
 ]]></Implementation>
@@ -316,7 +316,7 @@
 <ReturnType>GlobalNode</ReturnType>
 <Implementation><![CDATA[
 	If (' $IsObject(r%VolgendeOLUNrNode)) {
-		Set r%VolgendeOLUNrNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", "\", ..KlantNr, "F", ..Nr, 4)
+		Set r%VolgendeOLUNrNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", ..KlantNr, "F", ..Nr, 4)
 		If ("" = r%VolgendeOLUNrNode.GeefPiece(1)) {
 			Do r%VolgendeOLUNrNode.ZetPiece(1,1)
 		}
@@ -330,7 +330,7 @@
 <ReturnType>GlobalNode</ReturnType>
 <Implementation><![CDATA[
 	If (' $IsObject(r%LeegOLijnNrNode)) {
-		Set r%LeegOLijnNrNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", "\", ..KlantNr, "F", ..Nr, 0)
+		Set r%LeegOLijnNrNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", ..KlantNr, "F", ..Nr, 0)
 		If ("" = r%LeegOLijnNrNode.GeefPiece(1)) {
 			Do r%LeegOLijnNrNode.ZetPiece(1,101)
 		}
Index: zTryout/ARC/TECH/Persistentie/GlobalPersistenceMgr.cls.xml
===================================================================
diff -u -r1408 -r1640
--- zTryout/ARC/TECH/Persistentie/GlobalPersistenceMgr.cls.xml	(.../GlobalPersistenceMgr.cls.xml)	(revision 1408)
+++ zTryout/ARC/TECH/Persistentie/GlobalPersistenceMgr.cls.xml	(.../GlobalPersistenceMgr.cls.xml)	(revision 1640)
@@ -47,7 +47,7 @@
 </Method>
 
 <UDLText name="T">
-<Content><![CDATA[/* Op te roepen door OperatieScope. */
+<Content><![CDATA[/* Op te roepen door OperatieScope, opdat binnen die scope meerdere objecten dezelfde in-memory versie gebruiken. */
 ]]></Content>
 </UDLText>
 
@@ -77,14 +77,14 @@
 </UDLText>
 
 <Method name="GeefNodeViaSubscriptLijst">
-<FormalSpec>GlobalNaam:%String,Delimiter:%String="\",Subscripts:%ListOfDataTypes</FormalSpec>
+<FormalSpec>GlobalNaam:%String,Subscripts:%ListOfDataTypes</FormalSpec>
 <ReturnType>GlobalNode</ReturnType>
 <Implementation><![CDATA[
 		Set NodeKey = ##class(GlobalUtils).MaakNodeKey(GlobalNaam, Subscripts)
 		If (..OpenNodes.IsDefined(NodeKey)) {
 			Quit ..OpenNodes.GetAt(NodeKey)
 		} Else {
-			Set Node = ##class(GlobalNode).%New(Delimiter)
+			Set Node = ##class(GlobalNode).%New()
 			Do Node.ZetPersistenteLokatie(GlobalNaam, Subscripts)
 			Do ..OpenNodes.SetAt(Node, NodeKey)
 			Quit Node
@@ -98,7 +98,7 @@
 </UDLText>
 
 <Method name="GeefNode">
-<FormalSpec>GlobalNaam:%String,Delimiter:%String="\",Subscript1:%String,Subscript2:%String,Subscript3:%String,Subscript4:%String,Subscript5:%String,Subscript6:%String</FormalSpec>
+<FormalSpec>GlobalNaam:%String,Subscript1:%String,Subscript2:%String,Subscript3:%String,Subscript4:%String,Subscript5:%String,Subscript6:%String</FormalSpec>
 <ReturnType>GlobalNode</ReturnType>
 <Implementation><![CDATA[
 		Set Subscripts = ##class(%ListOfDataTypes).%New()
@@ -121,14 +121,13 @@
 			}
 		}
 		
-		Quit ..GeefNodeViaSubscriptLijst(GlobalNaam, Delimiter, Subscripts)
+		Quit ..GeefNodeViaSubscriptLijst(GlobalNaam, Subscripts)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakLegeNode">
-<FormalSpec>Delimiter:%String="\"</FormalSpec>
 <Implementation><![CDATA[
-	Set Node = ##class(GlobalNode).%New(Delimiter)
+	Set Node = ##class(GlobalNode).%New()
 	Quit Node
 ]]></Implementation>
 </Method>
Index: PRA tryout ARC.prj.xml
===================================================================
diff -u -r1408 -r1640
--- PRA tryout ARC.prj.xml	(.../PRA tryout ARC.prj.xml)	(revision 1408)
+++ PRA tryout ARC.prj.xml	(.../PRA tryout ARC.prj.xml)	(revision 1640)
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="PRA tryout ARC" LastModified="2011-06-10 12:03:21">
+<Project name="PRA tryout ARC" LastModified="2011-07-08 12:06:28">
   <Items>
+    <ProjectItem name="vhUnitTest.PRA.GlobalNode.GlobalNodeTests" type="CLS"/>
+    <ProjectItem name="vhUnitTest.PRA.GlobalNode.PersistenceMgrTests" type="CLS"/>
     <ProjectItem name="zTryout.ARC.APP.DomeinContext" type="CLS"/>
     <ProjectItem name="zTryout.ARC.APP.FlowOrder.Blockages" type="CLS"/>
     <ProjectItem name="zTryout.ARC.APP.FlowOrder.FlowOrder" type="CLS"/>
@@ -56,10 +58,6 @@
     <ProjectItem name="zTryout.ARC.DOM.MAG.enu.TelweegschaalTelwijze" type="CLS"/>
     <ProjectItem name="zTryout.ARC.DOM.MAG.impl.DataM.MagazijnAPI" type="CLS"/>
     <ProjectItem name="zTryout.ARC.DOM.MAG.impl.DataM.StockeerbaarProduct" type="CLS"/>
-    <ProjectItem name="zTryout.ARC.DOM.MB.MagAPI" type="CLS"/>
-    <ProjectItem name="zTryout.ARC.DOM.MB.ProductMagazijnInfo" type="CLS"/>
-    <ProjectItem name="zTryout.ARC.DOM.MB.impl.DataM.DataMMagAPI" type="CLS"/>
-    <ProjectItem name="zTryout.ARC.DOM.MB.impl.DataM.DataMProductMagazijnInfo" type="CLS"/>
     <ProjectItem name="zTryout.ARC.DOM.OV.ManueleOrderlijn" type="CLS"/>
     <ProjectItem name="zTryout.ARC.DOM.OV.Order" type="CLS"/>
     <ProjectItem name="zTryout.ARC.DOM.OV.OrderAPI" type="CLS"/>
Index: zTryout/ARC/APP/DomeinContext.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/APP/DomeinContext.cls.xml	(.../DomeinContext.cls.xml)	(revision 1222)
+++ zTryout/ARC/APP/DomeinContext.cls.xml	(.../DomeinContext.cls.xml)	(revision 1640)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="zTryout.ARC.APP.DomeinContext">
-<Import>zTryout.ARC.BASE,zTryout.ARC.DOM.PM,zTryout.ARC.DOM.OV,zTryout.ARC.DOM.KLANT</Import>
+<Import>zTryout.ARC.BASE,zTryout.ARC.DOM.PM,zTryout.ARC.DOM.OV,zTryout.ARC.DOM.KLANT,zTryout.ARC.DOM.MAG</Import>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <UDLText name="T">
 <Content><![CDATA[
@@ -101,7 +102,7 @@
 	Do ..PushOrderAPIClassName("zTryout.ARC.DOM.OV.impl.DataM.DataMOrderAPI")
 	Do ..PushProductAPIClassName("zTryout.ARC.DOM.PM.impl.DataM.DataMProductAPI")
 	Do ..PushKlantAPIClassName("zTryout.ARC.DOM.KLANT.impl.DataM.DataMKlantAPI")
-	Do ..PushMagAPIClassName("zTryout.ARC.DOM.MB.impl.DataM.DataMMagAPI")
+	Do ..PushMagAPIClassName("zTryout.ARC.DOM.MAG.impl.DataM.MagazijnAPI")
 ]]></Implementation>
 </Method>
 
@@ -180,8 +181,8 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefMagAPI">
-<ReturnType>KlantAPI</ReturnType>
+<Method name="GeefMagazijnAPI">
+<ReturnType>MagazijnAPI</ReturnType>
 <Implementation><![CDATA[
 	If ..MagAPI = "" {
 		Set ..MagAPI = $ZOBJCLASSMETHOD(..MagAPINames.Peek(), "%New")
FishEye: Tag 1640 refers to a dead (removed) revision in file `zTryout/ARC/DOM/MB/MagAPI.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: zTryout/ARC/DOM/MAG/impl/DataM/StockeerbaarProduct.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/DOM/MAG/impl/DataM/StockeerbaarProduct.cls.xml	(.../StockeerbaarProduct.cls.xml)	(revision 1222)
+++ zTryout/ARC/DOM/MAG/impl/DataM/StockeerbaarProduct.cls.xml	(.../StockeerbaarProduct.cls.xml)	(revision 1640)
@@ -85,12 +85,35 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAantalGereserveerdUitStock">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[		Quit $Piece(..KprPrnr2.GeefPiece(9), "#", 2)
+]]></Implementation>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[/* GeefAantalGereserveerdUitKomLink */
+]]></Content>
+</UDLText>
+
+<Method name="GeefAantalGereservUitKomLink">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[		Quit $P(..KprPrnr2.GeefPiece(9), "#", 3)
+]]></Implementation>
+</Method>
+
+<Method name="GeefNormaalAantalStuksOpPallet">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[		Quit ..KprPrnr2.GeefPiece(16)
+]]></Implementation>
+</Method>
+
 <Method name="KprPrnr0Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (' $IsObject(r%KprPrnr0)) {
-		Set r%KprPrnr0 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", "\", ..PRNr, 0)
+		Set r%KprPrnr0 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", ..PRNr, 0)
 	}
 	Quit r%KprPrnr0
 ]]></Implementation>
@@ -101,7 +124,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (' $IsObject(r%KprPrnr1)) {
-		Set r%KprPrnr1 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", "\", ..PRNr, 1)
+		Set r%KprPrnr1 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", ..PRNr, 1)
 	}
 	Quit r%KprPrnr1
 ]]></Implementation>
@@ -112,7 +135,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (' $IsObject(r%KprPrnr2)) {
-		Set r%KprPrnr2 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", "\", ..PRNr, 2)
+		Set r%KprPrnr2 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", ..PRNr, 2)
 	}
 	Quit r%KprPrnr2
 ]]></Implementation>
FishEye: Tag 1640 refers to a dead (removed) revision in file `zTryout/ARC/DOM/MB/ProductMagazijnInfo.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMTypedOrderlineIterator.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/DOM/OV/impl/DataM/DataMTypedOrderlineIterator.cls.xml	(.../DataMTypedOrderlineIterator.cls.xml)	(revision 1222)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMTypedOrderlineIterator.cls.xml	(.../DataMTypedOrderlineIterator.cls.xml)	(revision 1640)
@@ -26,11 +26,9 @@
 <Method name="IsValidItem">
 <Description>
 Override this method in derived classes to specify the types of entries to iterate over</Description>
-<FormalSpec>line:%String,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>LijnNode:GlobalNode</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
- //	w "Typed IsvalidItem line="_ line,!
-	Quit (LijnNode.GeefPiece(17) [ ..Type)		// Match only the lines whose type starts with the given type string
+<Implementation><![CDATA[	Quit (LijnNode.GeefPiece(17) [ ..Type)		// Match only the lines whose type starts with the given type string
 ]]></Implementation>
 </Method>
 </Class>
Index: zTryout/ARC/TECH/Persistentie/GlobalNode.cls.xml
===================================================================
diff -u -r1408 -r1640
--- zTryout/ARC/TECH/Persistentie/GlobalNode.cls.xml	(.../GlobalNode.cls.xml)	(revision 1408)
+++ zTryout/ARC/TECH/Persistentie/GlobalNode.cls.xml	(.../GlobalNode.cls.xml)	(revision 1640)
@@ -77,7 +77,7 @@
 
 <Method name="IsGewijzigd">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (0 = ..DirtyPieces.Count())
+<Implementation><![CDATA[	Quit (..DirtyPieces.Count() > 0)
 ]]></Implementation>
 </Method>
 
@@ -110,7 +110,7 @@
 </Method>
 
 <Method name="%OnNew">
-<FormalSpec>Delimiter:%String</FormalSpec>
+<FormalSpec>Delimiter:%String="\"</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..Persistent = 0
@@ -121,15 +121,66 @@
 ]]></Implementation>
 </Method>
 
+<UDLText name="T">
+<Content><![CDATA[
+/* Dit betekent: heeft de node een persistente lokatie, en kan er dus ge-Save'd worden.
+ * Dit betekent niet per sé dat er ook data staat.
+ */
+]]></Content>
+</UDLText>
+
 <Method name="IsPersistent">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit ..Persistent
 ]]></Implementation>
 </Method>
 
+<Method name="IsLeeg">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..ZijnOrigEnOverschrPiecesLeeg() && ..ZijnExtraGewijzigdePiecesLeeg()
+]]></Implementation>
+</Method>
+
+<Method name="ZijnOrigEnOverschrPiecesLeeg">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set VolledigLeeg = 1
+	
+	Set LengteVanOrigineleNode = $Length(..NodeDataString, ..Delimiter)
+	For Index = 0 : 1 : LengteVanOrigineleNode
+	{
+		Set VolledigLeeg = (' ..HeeftPiece(Index))
+		Quit:('VolledigLeeg)
+	}
+	
+	Quit VolledigLeeg
+]]></Implementation>
+</Method>
+
+<Method name="ZijnExtraGewijzigdePiecesLeeg">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set VolledigLeeg = 1
+	
+	Set LengteVanOrigineleNode = $Length(..NodeDataString, ..Delimiter)
+	Set DirtyPiecesIterator = ##class(TECH.ListIterator).%New(..DirtyPieces)
+	While (VolledigLeeg && DirtyPiecesIterator.HasNext()) {
+		Set VolgendeWaarde = DirtyPiecesIterator.Next()
+		If (DirtyPiecesIterator.Key() >= LengteVanOrigineleNode)
+		{
+			Set VolledigLeeg = ("" = VolgendeWaarde)
+		}
+	}
+		
+	Quit VolledigLeeg
+]]></Implementation>
+</Method>
+
 <Method name="ZetPersistenteLokatie">
 <Description>
-Deze method mag alleen opgeroepen worden door de GlobalPersistenceMgr.
+LET OP: Deze method mag alleen opgeroepen worden door de GlobalPersistenceMgr.
 Omdat die deze node moet registreren in zijn lijst van "open" nodes.</Description>
 <FormalSpec>GlobalNaam:%String,Subscripts:%ListOfDataTypes</FormalSpec>
 <ReturnType>%Status</ReturnType>
Index: zTryout/ARC/DOM/MAG/MagazijnAPI.cls.xml
===================================================================
diff -u -r1222 -r1640
--- zTryout/ARC/DOM/MAG/MagazijnAPI.cls.xml	(.../MagazijnAPI.cls.xml)	(revision 1222)
+++ zTryout/ARC/DOM/MAG/MagazijnAPI.cls.xml	(.../MagazijnAPI.cls.xml)	(revision 1640)
@@ -8,8 +8,10 @@
 <Method name="GeefStockeerbaarProduct">
 <FormalSpec>PRNr:%String</FormalSpec>
 <ReturnType>zTryout.ARC.DOM.MAG.StockeerbaarProduct</ReturnType>
-<Implementation><![CDATA[	
-]]></Implementation>
 </Method>
+
+<Method name="GeefMagazijnInfo">
+<FormalSpec>Nr:%Integer</FormalSpec>
+</Method>
 </Class>
 </Export>
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMOrderLineIterator.cls.xml
===================================================================
diff -u -r1408 -r1640
--- zTryout/ARC/DOM/OV/impl/DataM/DataMOrderLineIterator.cls.xml	(.../DataMOrderLineIterator.cls.xml)	(revision 1408)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMOrderLineIterator.cls.xml	(.../DataMOrderLineIterator.cls.xml)	(revision 1640)
@@ -32,11 +32,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Lijn">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="LijnNode">
 <Type>GlobalNode</Type>
 <Private>1</Private>
@@ -58,7 +53,6 @@
 	Set ..LaatsteOLijn = Order.GeefLeegOLijn() - 1
 	If (..LaatsteOLijn = "") { Set ..LaatsteOLijn = 100 }
 	Set ..OLijn = 100
-	Set ..Lijn = ""
 	set ..LijnNode = ""
 	// Advance to the first relevant line, if any
 	Do ..GotoNext()
@@ -82,7 +76,6 @@
 <ReturnType>%RegisteredObject</ReturnType>
 <Implementation><![CDATA[
 	// Causes an error if '..HasNext()
-	Set result = ..Lijn
 	Set LijnNodeTeGeven = ..LijnNode
 	Set olijn = ..OLijn
 	Set obj = ..CurrentInMemoryOrderline
@@ -107,17 +100,16 @@
 		If ((MemOLijn '= "")) { // TODO: waarom stond hier deze extra conditie:  && MemOLijn.IsDirty()
 			// Prefer in-memory version if it exists
 			w ..OLijn, " in memory", !
-			Set ..Lijn = MemOLijn.AsString()
 			Set ..LijnNode = MemOLijn.GeefNode()
 			Set ..CurrentInMemoryOrderline = MemOLijn
 		} Else {
-			Set ..Lijn = $G(^KOD(..KLNr,"F",..ORDNr,..OLijn))
-			Set ..LijnNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", "\", ..KLNr, "F", ..ORDNr, ..OLijn)
+			Set ..LijnNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", ..KLNr, "F", ..ORDNr, ..OLijn)
 			Set ..CurrentInMemoryOrderline = ""
-			w:(..Lijn '= "") ..OLijn, " in db", !
+			w:('..LijnNode.IsLeeg()) ..OLijn, " in db", !
 		}
 		// Lijn kan ook niet bestaan
-		Set LookFurther = ((..Lijn = "") || '..IsValidItem(..Lijn, ..LijnNode)) && ..HasNext() 
+		Set IsGeenBruikbareLijn = (..LijnNode.IsLeeg() || '..IsValidItem(..LijnNode))
+		Set LookFurther = (IsGeenBruikbareLijn && ..HasNext())
  //		w "GotoNext LF=", LookFurther,!
 	}
 ]]></Implementation>
@@ -126,13 +118,10 @@
 <Method name="IsValidItem">
 <Description>
 Override this method in derived classes to specify the types of entries to iterate over</Description>
-<FormalSpec>InternalRepr:%String,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>LijnNode:GlobalNode</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
- //	w "ÏsvalidItem line="_line,!
- Quit (LijnNode.GeefPiece(17) [ $$$LinetypeAllLines)		// Match all lines by default
- //	Quit ($P(InternalRepr, "\", 17) [ $$$LinetypeAllLines)		// Match all lines by default
+<Implementation><![CDATA[ Quit (LijnNode.GeefPiece(17) [ $$$LinetypeAllLines)		// Match all lines by default
 ]]></Implementation>
 </Method>
 </Class>
FishEye: Tag 1640 refers to a dead (removed) revision in file `zTryout/ARC/DOM/MB/impl/DataM/DataMProductMagazijnInfo.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1640 refers to a dead (removed) revision in file `zTryout/ARC/DOM/MB/impl/DataM/DataMMagAPI.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?