Index: WS/common/ProductCriteria/ProductZoekService.cls.xml
===================================================================
diff -u
--- WS/common/ProductCriteria/ProductZoekService.cls.xml	(revision 0)
+++ WS/common/ProductCriteria/ProductZoekService.cls.xml	(revision 3087)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="WS.common.ProductCriteria.ProductZoekService">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.WebService</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="SERVICENAME">
+<Default>ProductZoekService</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://www.vanhoecke.be/common/ProductCriteria/</Default>
+</Parameter>
+
+<Method name="ZoekProducten">
+<FormalSpec>Criterium:APPS.common.ProductCriteria.dto.Criterium</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.common.ProductCriteria.ProductZoekService).%New().ZoekProducten(Criterium)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/impl/DtoToCriteriumVisitor.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/impl/DtoToCriteriumVisitor.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/impl/DtoToCriteriumVisitor.cls.xml	(revision 3087)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.impl.DtoToCriteriumVisitor">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,APPS.common.ProductCriteria.dto.CriteriumVisitor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="VerwerkProductCodeStartMetCrit">
+<FormalSpec>ProductCodeStartMetCriterium:APPS.common.ProductCriteria.dto.ProductCodeStartMetCriterium</FormalSpec>
+</Method>
+
+<Method name="VerwerkClassificatieCriterium">
+<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.dto.ClassificatieCriterium</FormalSpec>
+</Method>
+
+<Method name="VerwerkOfCriterium">
+<FormalSpec>OfCriterium:APPS.common.ProductCriteria.dto.OfCriterium</FormalSpec>
+</Method>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/dto/Criterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/dto/Criterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/dto/Criterium.cls.xml	(revision 3087)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.dto.Criterium">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="GeefProductCriterium">
+<Abstract>1</Abstract>
+<ReturnType>APPS.common.ProductCriteria.impl.ProductCriterium</ReturnType>
+</Method>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/ProductZoekService.cls.xml
===================================================================
diff -u -r3068 -r3087
--- APPS/common/ProductCriteria/ProductZoekService.cls.xml	(.../ProductZoekService.cls.xml)	(revision 3068)
+++ APPS/common/ProductCriteria/ProductZoekService.cls.xml	(.../ProductZoekService.cls.xml)	(revision 3087)
@@ -6,17 +6,18 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="ZoekProducten">
-<FormalSpec>Criterium:APPS.common.ProductCriteria.impl.ProductCriterium</FormalSpec>
+<FormalSpec>Criterium:APPS.common.ProductCriteria.dto.Criterium</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	Set ProductIDLijst = ##class(%ListOfDataTypes).%New()
 	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
-	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Criterium)
+	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Criterium.GeefProductCriterium())
 	Set ResultSet = ##class(%ResultSet).%New()
-	Do ResultSet.Execute(Query)
+	Do ResultSet.Prepare(Query)
+	Do ResultSet.Execute()
 	While (ResultSet.Next())
 	{
-		Set ProductID = ResultSet.GetData(1)
+		Do ProductIDLijst.Insert(ResultSet.GetData(1))
 	}
 	Quit ProductIDLijst
 ]]></Implementation>
Index: APPS/common/ProductCriteria/dto/ProductCodeStartMetCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/dto/ProductCodeStartMetCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/dto/ProductCodeStartMetCriterium.cls.xml	(revision 3087)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.dto.ProductCodeStartMetCriterium">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.ProductCriteria.dto.Criterium</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="StartMet">
+<Type>%String</Type>
+</Property>
+
+<Method name="GeefProductCriterium">
+<ReturnType>APPS.common.ProductCriteria.impl.ProductCriterium</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.common.ProductCriteria.impl.ProductCodeStartMetCriterium).%New(..StartMet)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/dto/ClassificatieCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/dto/ClassificatieCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/dto/ClassificatieCriterium.cls.xml	(revision 3087)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.dto.ClassificatieCriterium">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.ProductCriteria.dto.Criterium</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="ClassificatieID">
+<Type>%String</Type>
+</Property>
+
+<Method name="GeefProductCriterium">
+<ReturnType>APPS.common.ProductCriteria.impl.ProductCriterium</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(..ClassificatieID)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/dto/OfCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/dto/OfCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/dto/OfCriterium.cls.xml	(revision 3087)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.dto.OfCriterium">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.ProductCriteria.dto.Criterium</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Criteria">
+<Type>APPS.common.ProductCriteria.dto.Criterium</Type>
+<Collection>list</Collection>
+</Property>
+
+<Method name="GeefProductCriterium">
+<ReturnType>APPS.common.ProductCriteria.impl.ProductCriterium</ReturnType>
+<Implementation><![CDATA[
+	Set OfCriterium = ##class(APPS.common.ProductCriteria.impl.OfCriterium).%New()
+	Set CriteriaIterator = ##class(TECH.ListIterator).%New(..Criteria)
+	While (CriteriaIterator.HasNext())
+	{
+		Set Criterium = CriteriaIterator.Next()
+		Do OfCriterium.VoegToeCriteria(Criterium.GeefProductCriterium())
+	}
+	Quit OfCriterium
+]]></Implementation>
+</Method>
+</Class>
+</Export>