Index: Prod/Kenmerk/DataDefinitie.cls.xml
===================================================================
diff -u -r1689 -r1690
--- Prod/Kenmerk/DataDefinitie.cls.xml	(.../DataDefinitie.cls.xml)	(revision 1689)
+++ Prod/Kenmerk/DataDefinitie.cls.xml	(.../DataDefinitie.cls.xml)	(revision 1690)
@@ -234,12 +234,13 @@
 #define Groep 	$P(ID,"||",2)
 #define Kenm 	$P(ID,"||",3) 	  
 
+	set ID = {ID}
+	
 	// Een "delete" is ook een modify. De waardenlijst wordt van "gevuld" naar "leeg" gewijzigd. 
 	Set EventData = ##class(TECH.Events.KenmerkModifiedEventData).%New($$$UnID,$$$Groep,$$$Kenm,##class(%ListOfDataTypes).%New())
 	Set Event = ##class(TECH.Events.KenmerkModifiedEvent).%New(EventData)
 	Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(Event)
 
-	set ID = {ID}
 	Do ##class(Prod.Kenmerk.DataIndex).DeleteWaarden($$$Groep,$$$Kenm,$$$UnID)</Code>
 <Event>DELETE</Event>
 <Time>AFTER</Time>
Index: vhDeploy/JCL/D20110712x1409.cls.xml
===================================================================
diff -u
--- vhDeploy/JCL/D20110712x1409.cls.xml	(revision 0)
+++ vhDeploy/JCL/D20110712x1409.cls.xml	(revision 1690)
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.JCL.D20110712x1409">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>Verwijderen ongebruikte orgalux kenmerken</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	write "START TRANS",! 
+	TSTART
+
+	set listKenmerken = ##class(%ListOfDataTypes).%New()
+	
+	do listKenmerken.Insert("Afmetingen")
+	do listKenmerken.Insert("Breedte")
+	do listKenmerken.Insert("DynSpace")
+	do listKenmerken.Insert("HoofdGroep")
+	do listKenmerken.Insert("TandemboxType")
+	do listKenmerken.Insert("Toepassing")
+	do listKenmerken.Insert("Vereist")
+	
+	set itKenmerken = ##class(TECH.ListIterator).%New(listKenmerken)
+	set scDelete = $$$OK
+	while (itKenmerken.HasNext() ) && ( scDelete = $$$OK ) {
+		set KenmerkNaam = itKenmerken.Next()
+		set scDelete = ..DeleteDataDefinitie(KenmerkNaam)
+		continue:$$$ISERR(scDelete)
+		set scDelete = ..DeleteMetaDefinitie(KenmerkNaam)
+	}
+	
+	if scDelete=$$$OK {
+		write "COMMIT TRANS",! 
+		TCOMMIT
+	}
+	else  {
+		write "ROLLBACK TRANS",!
+		TROLLBACK
+	}
+	
+	
+	quit
+]]></Implementation>
+</Method>
+
+<Method name="DeleteDataDefinitie">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>KenmerkNaam</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set $ztrap="ztDeleteDataDefintie"
+	
+	write "Deleting DataDefinitie "_KenmerkNaam,!
+
+	set ResultSet = ..GeefDataDefResultSet(KenmerkNaam)
+	while ResultSet.Next() {
+		set ID = ResultSet.Get("ID")
+		set scDelete = ##class(Prod.Kenmerk.DataDefinitie).%DeleteId(ID) 
+		if 'scDelete { 
+			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Delete failed",scDelete))  
+		}
+	}
+	set ResultSet = ""
+	
+	set ResultSet = ..GeefDataDefResultSet(KenmerkNaam)
+	if ResultSet.Next() {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Toch nog item gevonden"))  
+	}
+	set ResultSet = ""
+	
+	quit $$$OK
+	
+ztDeleteDataDefintie
+	set $ztrap=""
+	write "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",!
+	write "!!!!!!!!!!!!!!!! FAILED !!!!!!!!!!!!!!!!!",!
+	write "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",!
+	
+	write ##class(TECH.ExceptionHandler).Catch().ToString(),!
+	
+	write "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",!
+	write "!!!!!!!!!!!!!!!! FAILED !!!!!!!!!!!!!!!!!",!
+	write "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",!
+	quit $$$ERROR($$$GeneralError,"Failed")
+]]></Implementation>
+</Method>
+
+<Method name="GeefDataDefResultSet">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>KenmerkNaam:%String</FormalSpec>
+<ReturnType>%ResultSet</ReturnType>
+<Implementation><![CDATA[
+	set ResultSet = ##class(%Library.ResultSet).%New()
+	if 'ResultSet.Prepare("SELECT ID FROM Prod_Kenmerk.DataDefinitie WHERE KenmerkGroep = ? AND KenmerkNaam = ?") {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Prepare failed"))  
+	}
+	set scExecute = ResultSet.Execute("OL",KenmerkNaam)
+	if 'scExecute {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Execute failed",scExecute))  
+	}
+	quit ResultSet
+]]></Implementation>
+</Method>
+
+<Method name="DeleteMetaDefinitie">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>KenmerkNaam</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set $ztrap="ztDeleteMetaDefinitie"
+	
+	write "Deleting MetaDefinitie "_KenmerkNaam,!
+	
+	set ResultSet = ..GeefDeleteMetaDefResultSet(KenmerkNaam)
+
+	while ResultSet.Next() {
+		set ID = ResultSet.Get("ID")
+		set scDelete = ##class(Prod.Kenmerk.MetaDefinitie).%DeleteId(ID)
+		if 'scDelete {
+			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Delete failed",scDelete))  
+		}
+	}
+	
+	set ResultSet = ""
+	set ResultSet = ..GeefDeleteMetaDefResultSet(KenmerkNaam)
+	if ResultSet.Next() {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Toch nog item gevonden"))  
+	}
+	
+	set ResultSet = ""
+
+	quit $$$OK
+	
+ztDeleteMetaDefinitie
+	set $ztrap=""
+	write "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",!
+	write "!!!!!!!!!!!!!!!! FAILED !!!!!!!!!!!!!!!!!",!
+	write "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",!
+	
+	write ##class(TECH.ExceptionHandler).Catch().ToString(),!
+	
+	write "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",!
+	write "!!!!!!!!!!!!!!!! FAILED !!!!!!!!!!!!!!!!!",!
+	write "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",!
+	quit $$$ERROR($$$GeneralError,"Failed")
+]]></Implementation>
+</Method>
+
+<Method name="GeefDeleteMetaDefResultSet">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>KenmerkNaam:%String</FormalSpec>
+<ReturnType>%ResultSet</ReturnType>
+<Implementation><![CDATA[
+	set ResultSet = ##class(%Library.ResultSet).%New()
+	if 'ResultSet.Prepare("SELECT ID FROM Prod_Kenmerk.MetaDefinitie WHERE Groep = ? AND Kenmerk = ?") {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Prepare failed"))  
+	}
+	set scExecute = ResultSet.Execute("OL",KenmerkNaam)
+	if 'scExecute {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Execute failed",scExecute))  
+	}
+
+	quit ResultSet
+]]></Implementation>
+</Method>
+</Class>
+</Export>