Index: TECH/Algo/SQL/SelectBuilder/InputParameters.cls.xml
===================================================================
diff -u -r947 -r951
--- TECH/Algo/SQL/SelectBuilder/InputParameters.cls.xml	(.../InputParameters.cls.xml)	(revision 947)
+++ TECH/Algo/SQL/SelectBuilder/InputParameters.cls.xml	(.../SelectieCriteria.cls.xml)	(revision 951)
@@ -1,12 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="TECH.Algo.SQL.SelectBuilder.InputParameters">
+<Class name="TECH.Algo.SQL.SelectBuilder.SelectieCriteria">
 <Abstract>1</Abstract>
 <Super>TECH.DataTransferObject</Super>
 
 <Parameter name="TabelNaam">
 <Type>%String</Type>
 </Parameter>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	do ..InitProperties()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="InitProperties">
+<Implementation><![CDATA[
+	#dim Properties As %ListOfDataTypes = ##class(TECH.ClassUtils).GeefProperties(..%ClassName(1))
+	set PropertyIterator = ##class(TECH.ListIterator).%New(Properties)
+	while PropertyIterator.HasNext() {
+		set $property($this,PropertyIterator.Next()) = ##class(TECH.Algo.SQL.SelectBuilder.Criteria).%New()	
+	}
+]]></Implementation>
+</Method>
+
+<Storage name="Custom">
+<Type>%Library.CompleteCustomStorage</Type>
+</Storage>
 </Class>
 
 
Index: TECH/Algo/SQL/SelectBuilder/SelectBuilder.cls.xml
===================================================================
diff -u -r950 -r951
--- TECH/Algo/SQL/SelectBuilder/SelectBuilder.cls.xml	(.../SelectBuilder.cls.xml)	(revision 950)
+++ TECH/Algo/SQL/SelectBuilder/SelectBuilder.cls.xml	(.../SelectBuilder.cls.xml)	(revision 951)
@@ -82,26 +82,28 @@
 	set PropertyIterator = ##class(TECH.ListIterator).%New(Properties)
 	while PropertyIterator.HasNext() {
 		#dim PropertyNaam As %String = PropertyIterator.Next()
-		#dim Waarden As %ListOfDataTypes = $property(Parameters,PropertyNaam)
-		if Waarden.Count() > 0 {
+		#dim InputParameters As TECH.Algo.SQL.SelectBuilder.Criteria = $property(Parameters,PropertyNaam)
+		if InputParameters.Count() > 0 {
 			do:'..SelecteerEnkelID ..QueryBuilder.SelecteerVeldVanTabel(PropertyNaam,..Tabel)		
-			do ..VerwerkPropertyWaarden(PropertyNaam,Waarden)
-					
+			do ..VerwerkPropertyWaarden(PropertyNaam,InputParameters)
 		}
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkPropertyWaarden">
-<FormalSpec>PropertyNaam:%String,Waarden:%ListOfDataTypes</FormalSpec>
+<FormalSpec>PropertyNaam:%String,Criteria:TECH.Algo.SQL.SelectBuilder.Criteria</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set CombinatieConditie = ##class(TECH.Algo.SQL.QueryEngine.CombinatieConditie).%New(##class(TECH.Algo.SQL.QueryEngine.enu.CombinatieConditieOperator).Of())
 	
-	set WaardenIterator = ##class(TECH.ListIterator).%New(Waarden)
+	#dim WaardenIterator As TECH.Iterator = Criteria.GeefIterator()
 	while WaardenIterator.HasNext() {
-		set ..QueryParameters = ..QueryParameters _ $listbuild(WaardenIterator.Next())
-		do CombinatieConditie.VoegToeSubconditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New(PropertyNaam_" = ?"))
+		#dim InputParameter As TECH.Algo.SQL.SelectBuilder.InputParameter = WaardenIterator.Next()
+		set:InputParameter.Waarde'="NULL" ..QueryParameters = ..QueryParameters _ $listbuild(InputParameter.Waarde)
+		#dim ConditieString As %String = PropertyNaam_" "_InputParameter.ComparatorType_$select(InputParameter.Waarde="NULL":" NULL",1:" ?")
+		Set EnkelvoudigeConditie = ##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New(ConditieString)
+		do CombinatieConditie.VoegToeSubconditie(EnkelvoudigeConditie)
 	}
 	do ..WhereConditie.VoegToeSubconditie(CombinatieConditie)
 ]]></Implementation>
Index: TECH/Algo/SQL/SelectBuilder/Criteria.cls.xml
===================================================================
diff -u
--- TECH/Algo/SQL/SelectBuilder/Criteria.cls.xml	(revision 0)
+++ TECH/Algo/SQL/SelectBuilder/Criteria.cls.xml	(revision 951)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Algo.SQL.SelectBuilder.Criteria">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="List">
+<Type>TECH.Algo.SQL.SelectBuilder.InputParameter</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
+<Method name="VoegToeCriteria">
+<FormalSpec>ComparatorType:%String,Waarde:%String=""</FormalSpec>
+<Implementation><![CDATA[	do ..List.Insert(##class(TECH.Algo.SQL.SelectBuilder.InputParameter).%New(ComparatorType,Waarde))
+]]></Implementation>
+</Method>
+
+<Method name="Count">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..List.Count()
+]]></Implementation>
+</Method>
+
+<Method name="GeefIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ##class(TECH.ListIterator).%New(..List)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 951 refers to a dead (removed) revision in file `TECH/Algo/SQL/SelectBuilder/InputParameters.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: TECH/Algo/SQL/SelectBuilder/InputParameter.cls.xml
===================================================================
diff -u
--- TECH/Algo/SQL/SelectBuilder/InputParameter.cls.xml	(revision 0)
+++ TECH/Algo/SQL/SelectBuilder/InputParameter.cls.xml	(revision 951)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Algo.SQL.SelectBuilder.InputParameter">
+<Super>%RegisteredObject</Super>
+
+<Property name="ComparatorType">
+<Type>%String</Type>
+</Property>
+
+<Property name="Waarde">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ComparatorType:%String,Waarde:%String=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ComparatorType = ComparatorType
+	set ..Waarde = Waarde
+	
+	if ..Waarde = "" set ..Waarde = "NULL"
+	
+	if ..Waarde = "NULL" {
+		if ..ComparatorType = "<>" set ..ComparatorType = "IS NOT"
+		if ..ComparatorType = "=" set ..ComparatorType = "IS"
+	}
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>