Index: WSimpl/PM/Perfion/Vertaling/DataService/GetData.cls.xml
===================================================================
diff -u -r61824 -r63547
--- WSimpl/PM/Perfion/Vertaling/DataService/GetData.cls.xml	(.../GetData.cls.xml)	(revision 61824)
+++ WSimpl/PM/Perfion/Vertaling/DataService/GetData.cls.xml	(.../GetData.cls.xml)	(revision 63547)
@@ -1,42 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="WSimpl.PM.Perfion.Vertaling.DataService.GetData">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="PerfionDataService">
 <Type>WS.PM.Perfion.Vertaling.DataService.GetData</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>PerfionDataService:WS.PM.Perfion.Vertaling.DataService.GetData=""</FormalSpec>
+<FormalSpec>PerfionDataService:WS.PM.Perfion.Vertaling.DataService.GetData="",Logger:vhLib.Logger=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..PerfionDataService = $$$Inject(PerfionDataService,##class(WS.PM.Perfion.Vertaling.DataService.GetData).%New())
+	Set ..Logger = $$$Inject(Logger, ##class(vhLib.Logger).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVertalingenMetGroep">
+<FormalSpec>Groep:%String</FormalSpec>
+<ReturnType>%GlobalCharacterStream</ReturnType>
+<Implementation><![CDATA[
+	Do ..Logger.Info("Vertalingen opvragen aan Perfion met groep: "_Groep)
+	Set VertalingenLijst = ##class(%ListOfDataTypes).%New()
+	#dim XmlQuery As %String = ..GeefXmlQueryVoorVertalingen(Groep)
+	#dim VertalingenResult As %GlobalCharacterStream = ..PerfionDataService.ExecuteQuery(XmlQuery)
+
+	Do ##class(TECH.StreamUtils).Replace(VertalingenResult," encoding=""utf-8"""," encoding=""ISO-8859-1""")
+	Do ..Logger.Info("Vertalingen stream uit perfion van groep: "_Groep,VertalingenResult)
+	Quit VertalingenResult
+]]></Implementation>
+</Method>
+
 <Method name="GeefVertalingen">
 <ReturnType>%GlobalCharacterStream</ReturnType>
 <Implementation><![CDATA[
 	Set VertalingenLijst = ##class(%ListOfDataTypes).%New()
 	#dim XmlQuery As %String = ..GeefXmlQueryVoorVertalingen()
 	#dim VertalingenResult As %GlobalCharacterStream = ..PerfionDataService.ExecuteQuery(XmlQuery)
-	
-	/*
-	Try {
-		Set ..Shop = Shop 
-	} Catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		#dim Message As %String = "Unable to confirm order. (EDINr: "_EDInr_")"_$$$CRLF
-		;Do ##class(TECH.ExceptionHandler).Rethrow(NewException)
-	}
-	*/
+
 	Do ##class(TECH.StreamUtils).Replace(VertalingenResult," encoding=""utf-8"""," encoding=""ISO-8859-1""")
+	Do ..Logger.Info("Vertalingen stream uit perfion zonder groep",VertalingenResult)
 	Quit VertalingenResult
 ]]></Implementation>
 </Method>
@@ -54,10 +67,18 @@
 </Method>
 
 <Method name="GeefXmlQueryVoorVertalingen">
+<FormalSpec>Groep:%String=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Quit "<Query> <Select languages='IND'> <Feature id='Vertalingsgroep' /> <Feature id='Vertalingstypes' /> <Feature id='KeyVertalingssleutel' /> <Feature id='VertalingDA' /> <Feature id='VertalingDE' /> <Feature id='VertalingEN' /> <Feature id='VertalingES' /> <Feature id='VertalingFR' /> <Feature id='VertalingIT' /> <Feature id='VertalingNL' /> <Feature id='VertalingNO' /> </Select> <From id ='Vertalingssleutel'/> <Where>      <Clause id='Vertalingsgroep' operator='in'> <Value>TT</Value> <Value>ALG</Value>  </Clause></Where></Query>"
+	
+	If (##class(TECH.StringUtils).IsEmpty(Groep)) {
+		Do ..Logger.Info("Query zonder groep")
+		Quit "<Query> <Select languages='IND'> <Feature id='Vertalingsgroep' /> <Feature id='Vertalingstypes' /> <Feature id='KeyVertalingssleutel' /> <Feature id='VertalingDA' /> <Feature id='VertalingDE' /> <Feature id='VertalingEN' /> <Feature id='VertalingES' /> <Feature id='VertalingFR' /> <Feature id='VertalingIT' /> <Feature id='VertalingNL' /> <Feature id='VertalingNO' /> <Feature id='VertalingFI' /> </Select> <From id ='Vertalingssleutel'/> <Where>      <Clause id='Vertalingsgroep' operator='in'> <Value>TT</Value> <Value>ALG</Value>  </Clause></Where></Query>"
+	} Else {
+		Do ..Logger.Info("Query met groep: "_Groep)
+		Quit "<Query> <Select languages='IND'> <Feature id='Vertalingsgroep' /> <Feature id='Vertalingstypes' /> <Feature id='KeyVertalingssleutel' /> <Feature id='VertalingDA' /> <Feature id='VertalingDE' /> <Feature id='VertalingEN' /> <Feature id='VertalingES' /> <Feature id='VertalingFR' /> <Feature id='VertalingIT' /> <Feature id='VertalingNL' /> <Feature id='VertalingNO' /> <Feature id='VertalingFI' /> </Select> <From id ='Vertalingssleutel'/> <Where>      <Clause id='Vertalingsgroep' operator='in'>"_"<Value>"_Groep_"</Value>"_"  </Clause></Where></Query>"
+	}
 	;Quit "<Query> <Select languages='IND'> <Feature id='Vertalingsgroep' /> <Feature id='Vertalingstypes' /> <Feature id='KeyVertalingssleutel' /> <Feature id='VertalingDA' /> <Feature id='VertalingDE' /> <Feature id='VertalingEN' /> <Feature id='VertalingES' /> <Feature id='VertalingFR' /> <Feature id='VertalingIT' /> <Feature id='VertalingNL' /> <Feature id='VertalingNO' /> </Select> <From id ='Vertalingssleutel'/></Query>"
 ]]></Implementation>
 </Method>