Index: zTryout/CSC/Try.cls.xml
===================================================================
diff -u -r1842 -r1858
--- zTryout/CSC/Try.cls.xml	(.../Try.cls.xml)	(revision 1842)
+++ zTryout/CSC/Try.cls.xml	(.../Try.cls.xml)	(revision 1858)
@@ -6,117 +6,6 @@
 <Super>%RegisteredObject,TECH.Comparator.IComparator</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Method name="Try">
-<Description>
-Do ##class(zTryout.CSC.Try).Try()</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>Input</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	
-	Set DossierCode = ""
-	Set Grens = 475254
-	If (Input > Grens)
-	{
-		Set AAACombo = 703
-		Set Max3LetterCombo = 26*26*26
-		
-		If (Input > Grens+(Max3LetterCombo*36))
-		{
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Maximum grens dossiercode overschreden"))
-		}
-		
-		Set i = 3
-		While (i '< 0)
-		{
-			Set max = Grens+(i*9*Max3LetterCombo)
-			If (Input > max)
-			{
-				Set Overschot = Input-max
-				Set AlfaKey = ##class(%VHSys.Library).AlfaKey((Overschot-1)#(Max3LetterCombo)+AAACombo,"A")
-				Set DossierCode = $E(AlfaKey,1,(3-i))_##class(TECH.Math).Ceil(Overschot/(Max3LetterCombo))_$E(AlfaKey,4-i,3)
-				Set i = 0
-			}
-			Set i = i - 1
-		}
-	}
-	Else
-	{
-		Set DossierCode = ##class(%VHSys.Library).AlfaKey(Input,"A")
-	}
-	Quit DossierCode
-]]></Implementation>
-</Method>
-
-<Method name="GeefVolgendeDossierCode">
-<Description>
-w ##class(zTryout.CSC.Try).GeefDossierCode("tryout")</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>Node:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	
-	Lock +^KPR(0,Node)
-	Set DosNr=$G(^KPR(0,Node))+1
-	Set DossierCode = ""
-	Set Grens = 475254
-	If (DosNr > Grens)
-	{
-		Set DosNr = DosNr - Grens + 47989
-		Set DossierCode = ##class(%VHSys.Library).AlfaKey(DosNr,"AN")
-		While ((DossierCode?4A) || (DossierCode[0))
-		{
-			Set DosNr = DosNr + 1
-			Set DossierCode = ##class(%VHSys.Library).AlfaKey(DosNr,"AN")
-		}
-		Set DosNr = DosNr + Grens - 47989
-	}
-	Else
-	{
-		Set DossierCode = ##class(%VHSys.Library).AlfaKey(DosNr,"A")
-	}
-	Set $P(^KPR(0,Node),"\")=DosNr
-	Lock -^KPR(0,Node)
-	Quit DossierCode
-]]></Implementation>
-</Method>
-
-<Method name="GeefDossier2">
-<Description>
-Do ##class(zTryout.CSC.Try).GeefDossier2("tryout")</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>Node:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	
-	Set Node = "tryout"
-	Set ^KPR(0,Node) = 475254
-	While (1)
-	{
-		Lock +^KPR(0,Node)
-		Set DosNr=$G(^KPR(0,Node))+1, $P(^KPR(0,Node),"\")=DosNr
-		Set DossierCode = ""
-		Set Grens = 475254
-		If (DosNr > Grens)
-		{
-			Set Overflow = DosNr - Grens
-			Set GeheleDelingen = ##class(TECH.Math).Floor((Overflow-1)/10)
-			Set Rest = Overflow - (GeheleDelingen * 10)
-			Set DossierCode = ##class(%VHSys.Library).AlfaKey(GeheleDelingen*36+Rest+48014,"AN")
-		}
-		Else
-		{
-			Set DossierCode = ##class(%VHSys.Library).AlfaKey(DosNr,"A")
-		}
-		Set $P(^KPR(0,Node),"\")=DosNr
-		Lock -^KPR(0,Node)
-		w DossierCode,!
-		h 0.1
-	}
-	Quit DossierCode
-]]></Implementation>
-</Method>
-
 <Method name="Try2">
 <Description>
 Do ##class(zTryout.CSC.Try).Try2()</Description>
@@ -147,18 +36,16 @@
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
 	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
-	Set PRNr = $Order(^KPR(""))
+	Set ProductIterator = ProductAPI.GeefProductIterator()
 	
-	While (PRNr '= "")
+	While (ProductIterator.HasNext())
 	{
-		Set Product = ProductAPI.GeefProduct(PRNr)
+		Set Product = ProductIterator.Next()
 		
-		If (Product.%Extends("DOM.PM.TBXProduct.TBXLade")) && Product.IsSifonLade()
+		If (Product.%Extends("DOM.PM.TBXProduct.TBXLadeMetUitsparing")) && (Product.GeefUitsparingen().Count() = 2)
 		{
-			w PRNr,!
-			d WLIP^vhDBG(97,PRNr_" "_Product.GeefKorttekst())
+			w Product.GeefPRNr(),!
 		}
-		Set PRNr = $Order(^KPR(PRNr))
 	}
 ]]></Implementation>
 </Method>
@@ -281,6 +168,39 @@
 ]]></Implementation>
 </Method>
 
+<Method name="SchrijfProduct">
+<Description>
+Do ##class(zTryout.CSC.Try).SchrijfProduct(575276)</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ProductID:%Integer,VerplaatsNaarProductID:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	w !,"*** ON BEFORE ALL TESTS ***",!!
+	
+	Set Node = $Order(^KPR(ProductID,""))
+	While (Node '= "")
+	{
+		If ("L" ] $E(Node,1,1))
+		{
+			w "Set ^KPR("_VerplaatsNaarProductID_","_Node_") = """_^KPR(ProductID,Node)_"""",!
+		}
+		Set Node = $Order(^KPR(ProductID,Node))
+	}
+	
+	Set ResultSet = ##class(%ResultSet).%New()
+	Do ResultSet.Prepare("SELECT KenmerkGroep, KenmerkNaam, Waarden FROM Prod_Kenmerk.DataDefinitie WHERE PRNr = ?")
+	Do ResultSet.Execute(ProductID)
+	While (ResultSet.Next())
+	{
+		w "Do ##class(Prod.Kenmerk.DataDefinitie).WijzigOfMaak("""_ResultSet.Data("KenmerkGroep")_""", """_VerplaatsNaarProductID_""", """_ResultSet.Data("KenmerkNaam")_""", """_ResultSet.Data("Waarden")_""")",!
+	}
+	
+	
+	w !,"*** AFTER ALL TESTS ***",!!
+	w "Kill ^KPR("_VerplaatsNaarProductID_")",!
+	w "Do ##class(Prod.Kenmerk.DataDefinitie).DeleteViaPRNr("_VerplaatsNaarProductID_")",!
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^zTryout.CSC.TryD</DataLocation>