Index: APPS/common/ProductCriteria/ProductCodeStartMetCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/ProductCodeStartMetCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/ProductCodeStartMetCriterium.cls.xml	(revision 3045)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.ProductCodeStartMetCriterium">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.ProductCriteria.ProductCriterium</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="StartMet">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>StartMet:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..StartMet = StartMet
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefStartMet">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..StartMet
+]]></Implementation>
+</Method>
+
+<Method name="Accept">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.ProductCriteriumVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkProductCodeStartMetCrit(##this)
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DefaultData>ProductCodeStartMetCriteriumDefaultData</DefaultData>
+<Data name="ProductCodeStartMetCriteriumDefaultData">
+<Structure>listnode</Structure>
+<Subscript>"ProductCodeStartMetCriterium"</Subscript>
+<Value name="1">
+<Value>StartMet</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>
Index: vhUnitTest/APPS/common/ProductCriteria/TestProductCriteria.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/common/ProductCriteria/TestProductCriteria.cls.xml	(revision 0)
+++ vhUnitTest/APPS/common/ProductCriteria/TestProductCriteria.cls.xml	(revision 3045)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.common.ProductCriteria.TestProductCriteria">
+<Description>
+do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.common.ProductCriteria.TestProductCriteria")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestKorttekstStartMet">
+<Implementation><![CDATA[
+	Set StartMet = ##class(APPS.common.ProductCriteria.ProductCodeStartMetCriterium).%New("OL.VLI%")
+	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
+	Set Query = ProductZoekOpCriteria.BouwZoekQuery(StartMet)
+	
+	Do $$$AssertEquals(Query,"SELECT Prod.Product.ID FROM Prod.Product WHERE KortTekst LIKE 'OL.VLI%'","De Query")
+]]></Implementation>
+</Method>
+
+<Method name="TestClassificatie">
+<Implementation><![CDATA[
+	Set Classificatie = ##class(APPS.common.ProductCriteria.ClassificatieCriterium).%New(374)
+	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
+	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Classificatie)
+	
+	Do $$$AssertEquals(Query,"SELECT Prod.ProductKlas.ID FROM Prod.ProductKlas JOIN Prod_Klas.Klas ON Prod_Klas.Klas.ID = Prod.ProductKlas.Klas WHERE Prod_Klas.Klas.ID = 374","De Query")
+]]></Implementation>
+</Method>
+
+<Method name="TestKTStarMetEnClassificatie">
+<Implementation><![CDATA[
+	Set StartMet = ##class(APPS.common.ProductCriteria.ProductCodeStartMetCriterium).%New("AFV%")
+	Set Classificatie = ##class(APPS.common.ProductCriteria.ClassificatieCriterium).%New(605)
+	Set Of = ##class(APPS.common.ProductCriteria.OfCriterium).%New()
+	Do Of.VoegToeCriteria(StartMet)
+	Do Of.VoegToeCriteria(Classificatie)
+	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
+	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Of)
+	
+	Do $$$AssertEquals(Query,"SELECT Prod.Product.ID FROM Prod.Product JOIN Prod.ProductKlas ON Prod.ProductKlas.ID = Prod.Product.Klas JOIN Prod_Klas.Klas ON Prod_Klas.Klas.ID = Prod.ProductKlas.Klas WHERE (KortTekst LIKE 'AFV%' OR Prod_Klas.Klas.ID = 605)","De Query")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/OfCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/OfCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/OfCriterium.cls.xml	(revision 3045)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.OfCriterium">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.ProductCriteria.ProductCriterium</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Criteria">
+<Type>APPS.common.ProductCriteria.ProductCriterium</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
+<Method name="Accept">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.ProductCriteriumVisitor</FormalSpec>
+<Implementation><![CDATA[
+	Do Visitor.VerwerkOfCriterium(##this)
+	Set CriteriaIterator = ..GeefCriteriaIterator()
+	While (CriteriaIterator.HasNext())
+	{
+		Do CriteriaIterator.Next().Accept(Visitor)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefCriteriaIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Criteria)
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeCriteria">
+<FormalSpec>Waarde:APPS.common.ProductCriteria.ProductCriterium</FormalSpec>
+<Implementation><![CDATA[	Do ..Criteria.Insert(Waarde)
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DefaultData>OfCriteriumDefaultData</DefaultData>
+<Data name="OfCriteriumDefaultData">
+<Structure>listnode</Structure>
+<Subscript>"OfCriterium"</Subscript>
+<Value name="1">
+<Value>Criteria</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/impl/ProductZoekOpCriteria.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/impl/ProductZoekOpCriteria.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/impl/ProductZoekOpCriteria.cls.xml	(revision 3045)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.impl.ProductZoekOpCriteria">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,APPS.common.ProductCriteria.ProductCriteriumVisitor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="DiepteEerstBoomBuilder">
+<Type>TECH.Algo.Boom.DiepteEerstBoomBuilder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="QueryBuilder">
+<Type>TECH.Algo.SQL.QueryEngine.QueryBuilder</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set Boom = ##class(TECH.Algo.Boom.Boom).%New(##class(TECH.Algo.SQL.QueryEngine.CombinatieConditie).%New(##class(TECH.Algo.SQL.QueryEngine.enu.CombinatieConditieOperator).Of()))
+	Set ..DiepteEerstBoomBuilder = ##class(TECH.Algo.Boom.DiepteEerstBoomBuilder).%New(Boom)
+	Set ..QueryBuilder = ##class(TECH.Algo.SQL.QueryEngine.QueryBuilder).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="BouwZoekQuery">
+<FormalSpec>Criterium:APPS.common.ProductCriteria.ProductCriterium</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Do Criterium.Accept(##this)
+	Do ..QueryBuilder.ZetWhereConditie(..DiepteEerstBoomBuilder.GeefBoom().GeefWortel().GeefKindIterator().Next())
+	Set FromTabel = ..QueryBuilder.GeefTabelIterator().Next()
+	Do ..QueryBuilder.SelecteerVeldVanTabel("ID",FromTabel)
+	Quit ..QueryBuilder.GeefQueryString()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkProductCodeStartMetCrit">
+<FormalSpec>ProductCodeStartMetCriterium:APPS.common.ProductCriteria.ProductCodeStartMetCriterium</FormalSpec>
+<Implementation><![CDATA[
+	Set Tabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod.Product")
+	Do ..QueryBuilder.VoegToeTabel(Tabel)
+	Do ..VoegToeEnkelvoudigeConditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("KortTekst LIKE '"_ProductCodeStartMetCriterium.GeefStartMet()_"'"))
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkClassificatieCriterium">
+<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.ClassificatieCriterium</FormalSpec>
+<Implementation><![CDATA[
+	Set ProductTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod.Product")
+	Set ProductKlasTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod.ProductKlas")
+	Set ProductKlasKlasTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod_Klas.Klas")
+	Do ..QueryBuilder.VoegToeTabel(ProductKlasTabel)
+	Do ..QueryBuilder.VoegToeTabel(ProductKlasKlasTabel)
+	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("ID", ProductKlasTabel, "Klas", ProductTabel)
+	Do ..QueryBuilder.VoegToeForeignKey(ForeignKey)
+	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("ID", ProductKlasKlasTabel, "Klas", ProductKlasTabel)
+	Do ..QueryBuilder.VoegToeForeignKey(ForeignKey)
+	Do ..VoegToeEnkelvoudigeConditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("Prod_Klas.Klas.ID = "_ClassificatieCriterium.GeefClassificatieID()))
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkOfCriterium">
+<FormalSpec>OfCriterium:APPS.common.ProductCriteria.OfCriterium</FormalSpec>
+<Implementation><![CDATA[	Do ..DiepteEerstBoomBuilder.VoegToeKind(##class(TECH.Algo.SQL.QueryEngine.CombinatieConditie).%New(##class(TECH.Algo.SQL.QueryEngine.enu.CombinatieConditieOperator).Of()))
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeEnkelvoudigeConditie">
+<FormalSpec>EnkelvoudigeConditie:TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ..DiepteEerstBoomBuilder.VoegToeKind(EnkelvoudigeConditie)
+	Do ..DiepteEerstBoomBuilder.StijgNiveau()
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/BewaardProductCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/BewaardProductCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/BewaardProductCriterium.cls.xml	(revision 3045)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.BewaardProductCriterium">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%Persistent</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/ProductCriteriumVisitor.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/ProductCriteriumVisitor.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/ProductCriteriumVisitor.cls.xml	(revision 3045)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.ProductCriteriumVisitor">
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="VerwerkProductCodeStartMetCrit">
+<Abstract>1</Abstract>
+<FormalSpec>ProductCodeStartMetCriterium:APPS.common.ProductCriteria.ProductCodeStartMetCriterium</FormalSpec>
+</Method>
+
+<Method name="VerwerkClassificatieCriterium">
+<Abstract>1</Abstract>
+<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.ClassificatieCriterium</FormalSpec>
+</Method>
+
+<Method name="VerwerkOfCriterium">
+<Abstract>1</Abstract>
+<FormalSpec>OfCriterium:APPS.common.ProductCriteria.OfCriterium</FormalSpec>
+</Method>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/ProductCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/ProductCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/ProductCriterium.cls.xml	(revision 3045)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.ProductCriterium">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%Persistent</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="Accept">
+<Abstract>1</Abstract>
+<FormalSpec>Visitor:APPS.common.ProductCriteria.ProductCriteriumVisitor</FormalSpec>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^APPS.commonA2D.ProductCrite695D</DataLocation>
+<DefaultData>ProductCriteriumDefaultData</DefaultData>
+<IdLocation>^APPS.commonA2D.ProductCrite695D</IdLocation>
+<IndexLocation>^APPS.commonA2D.ProductCrite695I</IndexLocation>
+<StreamLocation>^APPS.commonA2D.ProductCrite695S</StreamLocation>
+<Data name="ProductCriteriumDefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/ClassificatieCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/ClassificatieCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/ClassificatieCriterium.cls.xml	(revision 3045)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.ClassificatieCriterium">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.ProductCriteria.ProductCriterium</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="ClassificatieID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ClassificatieID:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..ClassificatieID = ClassificatieID
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefClassificatieID">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..ClassificatieID
+]]></Implementation>
+</Method>
+
+<Method name="Accept">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.ProductCriteriumVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkClassificatieCriterium(##this)
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DefaultData>ClassificatieCriteriumDefaultData</DefaultData>
+<Data name="ClassificatieCriteriumDefaultData">
+<Structure>listnode</Structure>
+<Subscript>"ClassificatieCriterium"</Subscript>
+<Value name="1">
+<Value>ClassificatieID</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>