Index: DOM/PM/Maatwerk/Calc/Common/impl/IKIDHashData.cls.xml
===================================================================
diff -u -r1809 -r1818
--- DOM/PM/Maatwerk/Calc/Common/impl/IKIDHashData.cls.xml	(.../IKIDHashData.cls.xml)	(revision 1809)
+++ DOM/PM/Maatwerk/Calc/Common/impl/IKIDHashData.cls.xml	(.../IKIDHashData.cls.xml)	(revision 1818)
@@ -9,6 +9,7 @@
 <Property name="CanonischeWaarde">
 <Type>%String</Type>
 <Private>1</Private>
+<Parameter name="MAXLEN" value="32000"/>
 </Property>
 
 <Property name="IKID">
Index: DOM/PM/Maatwerk/Calc/Common/impl/IKIDHash.cls.xml
===================================================================
diff -u -r1809 -r1818
--- DOM/PM/Maatwerk/Calc/Common/impl/IKIDHash.cls.xml	(.../IKIDHash.cls.xml)	(revision 1809)
+++ DOM/PM/Maatwerk/Calc/Common/impl/IKIDHash.cls.xml	(.../IKIDHash.cls.xml)	(revision 1818)
@@ -12,12 +12,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="CanonischeWaarden">
-<Type>DOM.PM.Maatwerk.Calc.Common.impl.IKIDHashData</Type>
-<Collection>array</Collection>
-<Private>1</Private>
-</Property>
-
 <Property name="Hash">
 <Type>%Binary</Type>
 <Private>1</Private>
@@ -53,31 +47,40 @@
 ]]></Implementation>
 </Method>
 
-<Method name="CanonischeWaardeBestaat">
+<Method name="GeefIKIDHashData">
 <FormalSpec>CanonischeWaarde:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..CanonischeWaarden.IsDefined(CanonischeWaarde)
+<Private>1</Private>
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.impl.IKIDHashData</ReturnType>
+<Implementation><![CDATA[
+	Set IKIDHashData = ""
+	Set Iterator = ##class(TECH.ListIterator).%New(..OverflowIDs)
+	While ('$IsObject(IKIDHashData)) && (Iterator.HasNext())
+	{
+		Set IKIDHashDataNext = Iterator.Next()
+		If (IKIDHashDataNext.GeefCanonischeWaarde() = CanonischeWaarde)
+		{
+			Set IKIDHashData = IKIDHashDataNext
+		}
+	}
+	Quit IKIDHashData
 ]]></Implementation>
 </Method>
 
 <Method name="VoegToe">
 <FormalSpec>CanonischeWaarde:%String,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</FormalSpec>
 <ReturnType>DOM.PM.Maatwerk.Calc.Common.IKID</ReturnType>
 <Implementation><![CDATA[
-	Set IKID = ""
-	If ('..CanonischeWaardeBestaat(CanonischeWaarde))
+
+	Set IKIDHashData = ..GeefIKIDHashData(CanonischeWaarde)
+	If ('$IsObject(IKIDHashData))
 	{
 		Set OverflowID = ..OverflowIDs.Count()+1
 		Set IKID = ##class(DOM.PM.Maatwerk.Calc.Common.IKID).%New(..Hash,OverflowID)
 		Set IKIDHashData = ##class(DOM.PM.Maatwerk.Calc.Common.impl.IKIDHashData).%New(IKID,CanonischeWaarde,IngegevenKenmerken)
 		Do ..OverflowIDs.SetAt(IKIDHashData,OverflowID)
-		Do ..CanonischeWaarden.SetAt(IKIDHashData,CanonischeWaarde)
 	}
-	Else
-	{
-		Set IKID = ..CanonischeWaarden.GetAt(CanonischeWaarde).GeefIKID()
-	}
-	Quit IKID
+	
+	Quit IKIDHashData.GeefIKID()
 ]]></Implementation>
 </Method>
 
Index: DOM/PM/Maatwerk/Calc/Common/ProductSpecificatie.cls.xml
===================================================================
diff -u -r1075 -r1818
--- DOM/PM/Maatwerk/Calc/Common/ProductSpecificatie.cls.xml	(.../ProductSpecificatie.cls.xml)	(revision 1075)
+++ DOM/PM/Maatwerk/Calc/Common/ProductSpecificatie.cls.xml	(.../ProductSpecificatie.cls.xml)	(revision 1818)
@@ -18,6 +18,10 @@
 
 <Property name="IngegevenKenmerken">
 <Type>DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</Type>
+</Property>
+
+<Property name="IKID">
+<Type>DOM.PM.Maatwerk.Calc.Common.IKID</Type>
 <Private>1</Private>
 </Property>
 
@@ -71,14 +75,7 @@
 <Description>
 Deze method zou niet mogen gebruikt worden. Deze is enkel aanwezig ter ondersteuning van de generatie van oude producten.</Description>
 <FormalSpec>IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</FormalSpec>
-<Implementation><![CDATA[
-	Set KenmerkID = ..IngegevenKenmerkenGetObjectId()
-	If (KenmerkID '= "")
-	{
-		Set ..IngegevenKenmerken=""   ; object must be unswizzled 
-		Set sc=##class(DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken).%DeleteId(KenmerkID)
-	}
-	Set ..IngegevenKenmerken = IngegevenKenmerken
+<Implementation><![CDATA[	Set ..IKID = ##class(DOM.DomeinContext).Instance().GeefIngegevenKenmerkenAPI().BewaarIngegevenKenmerken(IngegevenKenmerken)
 ]]></Implementation>
 </Method>
 
@@ -107,6 +104,9 @@
 <Value name="4">
 <Value>Variant</Value>
 </Value>
+<Value name="5">
+<Value>IKID</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: CSC IKID.prj.xml
===================================================================
diff -u -r1809 -r1818
--- CSC IKID.prj.xml	(.../CSC IKID.prj.xml)	(revision 1809)
+++ CSC IKID.prj.xml	(.../CSC IKID.prj.xml)	(revision 1818)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC IKID" LastModified="2011-08-16 13:20:59">
+<Project name="CSC IKID" LastModified="2011-08-16 16:23:21">
   <Items>
     <ProjectItem name="DOM.DomeinContext" type="CLS"/>
     <ProjectItem name="DOM.PM.IngegevenKenmerkenAPI" type="CLS"/>
@@ -20,8 +20,10 @@
     <ProjectItem name="DOM.PM.Maatwerk.Calc.Common.impl.TAOOKenmerken" type="CLS"/>
     <ProjectItem name="DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken" type="CLS"/>
     <ProjectItem name="DOM.PM.impl.IngegevenKenmerkenAPIimpl" type="CLS"/>
+    <ProjectItem name="DOM.PM.impl.MaatwerkProductImpl" type="CLS"/>
     <ProjectItem name="vhUnitTest.DOM.PM.impl.TestIKCanonischeWaarde" type="CLS"/>
     <ProjectItem name="vhUnitTest.DOM.PM.impl.TestIngegevenKenmerkenAPI" type="CLS"/>
+    <ProjectItem name="zTryout.CSC.IKnaarIKID" type="CLS"/>
   </Items>
 </Project>
 </Export>
Index: DOM/PM/impl/IngegevenKenmerkenAPIimpl.cls.xml
===================================================================
diff -u -r1809 -r1818
--- DOM/PM/impl/IngegevenKenmerkenAPIimpl.cls.xml	(.../IngegevenKenmerkenAPIimpl.cls.xml)	(revision 1809)
+++ DOM/PM/impl/IngegevenKenmerkenAPIimpl.cls.xml	(.../IngegevenKenmerkenAPIimpl.cls.xml)	(revision 1818)
@@ -29,16 +29,12 @@
 <Private>1</Private>
 <ReturnType>DOM.PM.Maatwerk.Calc.Common.impl.IKIDHash</ReturnType>
 <Implementation><![CDATA[
-	
 	Set Hash = $System.Encryption.MD5Encode(CanonischeWaarde)
-	
 	Set IKIDHash = ##class(DOM.PM.Maatwerk.Calc.Common.impl.IKIDHash).%OpenId(Hash)
-	
 	If ('$IsObject(IKIDHash))
 	{
 		Set IKIDHash = ##class(DOM.PM.Maatwerk.Calc.Common.impl.IKIDHash).%New(Hash)
 	}
-	
 	Quit IKIDHash
 ]]></Implementation>
 </Method>
Index: zTryout/CSC/IKnaarIKID.cls.xml
===================================================================
diff -u
--- zTryout/CSC/IKnaarIKID.cls.xml	(revision 0)
+++ zTryout/CSC/IKnaarIKID.cls.xml	(revision 1818)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="zTryout.CSC.IKnaarIKID">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="Do">
+<Description>
+Do ##class(zTryout.CSC.IKnaarIKID).Do()</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set IKAPI = ##class(DOM.DomeinContext).Instance().GeefIngegevenKenmerkenAPI()
+	Set IDResultSet = ##class(%ResultSet).%New("DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie:Extent")
+	Do IDResultSet.Execute()
+	While (IDResultSet.Next())
+	{
+		Set ID = IDResultSet.Data("ID")
+		Set ProductSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie).%OpenId(ID)
+		Do ProductSpecificatie.ZetIngegevenKenmerken(ProductSpecificatie.GeefIngegevenKenmerken())
+		Set Status = ProductSpecificatie.%Save()
+		If ($$$ISERR(Status))
+		{
+			w "Kon "_ID_" niet opslaan: "_$$ParseStatus^vhLib(Status),!
+		}
+		Else
+		{
+			w "Success "_ID_$c(13)
+		}		
+	}
+]]></Implementation>
+</Method>
+
+<Method name="CleanProductBerekening">
+<Description>
+Do ##class(zTryout.CSC.IKnaarIKID).CleanProductBerekening()</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set Products = ##class(%ArrayOfDataTypes).%New()
+	Set Berekening = ##class(%ArrayOfDataTypes).%New()
+	
+	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
+	Set ProductIterator = ProductAPI.GeefProductIterator()
+	While (ProductIterator.HasNext())
+	{
+		Set Product = ProductIterator.Next()
+		w Product.GeefPRNr()_$c(13)
+		If (Product.%Extends("DOM.PM.MaatwerkProduct"))
+		{
+			If (Product.GeefProductSpecificatie()'="")
+			{
+				Do Products.SetAt("",Product.GeefProductSpecificatie().%Id())
+			}
+			If (Product.GeefBerekeningsSpecificatie().%Id()'="")
+			{
+				Do Berekening.SetAt("",Product.GeefBerekeningsSpecificatie().%Id())
+			}
+		}
+	}
+	
+	Set ProductResultSet = ##class(%ResultSet).%New("DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie:Extent")
+	Do ProductResultSet.Execute()
+	While (ProductResultSet.Next())
+	{
+		Set ID = ProductResultSet.Data("ID")
+		If ('Products.IsDefined(ID))
+		{
+			Do ##class(DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie).%DeleteId(ID)
+		}
+	}
+	
+	Set BerekeningResultSet = ##class(%ResultSet).%New("DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie:Extent")
+	Do BerekeningResultSet.Execute()
+	While (BerekeningResultSet.Next())
+	{
+		Set ID = BerekeningResultSet.Data("ID")
+		If ('Berekening.IsDefined(ID))
+		{
+			Do ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%DeleteId(ID)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="CleanIngegevenKenmerken">
+<Description>
+Do ##class(zTryout.CSC.IKnaarIKID).CleanIngegevenKenmerken()</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set ResultSet = ##class(%ResultSet).%New()
+	Do ResultSet.Prepare("SELECT IK.ID As ID FROM DOM_PM_Maatwerk_Calc_Common.IngegevenKenmerken IK LEFT JOIN DOM_PM_Maatwerk_Calc_Common_impl.IKIDHashData Ha ON IK.ID = Ha.IngegevenKenmerken WHERE Ha.ID is null")
+	Do ResultSet.Execute()
+	While (ResultSet.Next())
+	{
+		Set Status = ##class(DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken).%DeleteId(ResultSet.Data("ID"))
+		If ($$$ISERR(Status))
+		{
+			w "Kon "_ResultSet.Data("ID")_" niet verwijderen: "_$$ParseStatus^vhLib(Status),!
+		}
+		Else
+		{
+			w "Success "_ResultSet.Data("ID")_$c(13)
+		}
+	}
+]]></Implementation>
+</Method>
+</Class>
+</Export>