Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/ResultAnalyser.cls.xml
===================================================================
diff -u -r41263 -r45225
--- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/ResultAnalyser.cls.xml	(.../ResultAnalyser.cls.xml)	(revision 41263)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/ResultAnalyser.cls.xml	(.../ResultAnalyser.cls.xml)	(revision 45225)
@@ -27,32 +27,97 @@
 
 <Method name="Go">
 <Implementation><![CDATA[
-	#dim ResultSet As TECH.ResultSet = ..QueryApi.GetResultSet(##class(TECH.DynamicQuery).%New("SELECT ID from WSdata_Vhisie4_Winkelkar_WinkelkarExport.ExportStatus_Lijnen where ((+Lijnen_PrijsVhisie4 <> +Lijnen_PrijsVhisie3 ) or ( Lijnen_PrijsVhisie4  is null ))"))
+	do $zf(-1,"del e:\ExportResult\*.* /q")
+
+	k ^ReportData
+	
+	#dim ReportData As TECH.MultiDim 
+	
+	#dim ResultSet As TECH.ResultSet = ..QueryApi.GetResultSet(##class(TECH.DynamicQuery).%New("SELECT ID from WSdata_Vhisie4_Winkelkar_WinkelkarExport.ExportStatus_Lijnen where ((+Lijnen_PrijsVhisie4 <> +Lijnen_PrijsVhisie3 )) or (Lijnen_Status = 'Gefaald')"))
 	while ResultSet.Next() {
 		#dim Id As %String = ResultSet.GetData(1)
+		
 		#dim Lijn As WS.Vhisie4.WinkelkarExport.LijnStatus = ##class(WSdata.Vhisie4.Winkelkar.WinkelkarExport.ExportStatus).%OpenId($piece(Id,"||",1)).Lijnen.GetAt($piece(Id,"||",2))
 		
-		set VanHoeckeEconConfiguratie = ##class(%GlobalCharacterStream).%New()
-		do VanHoeckeEconConfiguratie.CopyFrom(Lijn.VanHoeckeEconConfiguratie)
+		#dim VanHoeckeEconConfiguratie As %GlobalCharacterStream = ..CleanUpEconConfiguratie(Lijn.VanHoeckeEconConfiguratie)
+		#dim IntractoEconConfiguratie As %GlobalCharacterStream = ..CleanUpEconConfiguratie(Lijn.IntractoEconConfiguratie)
 		
-		set IntractoEconConfiguratie = ##class(%GlobalCharacterStream).%New()
-		do IntractoEconConfiguratie.CopyFrom(Lijn.IntractoEconConfiguratie)
+		#dim OfferteId As %String
+		#dim FilePart As %String
+		#dim Referentie As %String = "" 
 		
-		do ..CleanUpEconConfiguratie(VanHoeckeEconConfiguratie)
-		do ..CleanUpEconConfiguratie(IntractoEconConfiguratie)
+		if Lijn.VanHoeckeId["Unishop" {
+			Set OfferteId = ..GeefOfferteId($piece($piece(Lijn.VanHoeckeId,"|",1),"_",2))
+			Set Referentie = ..GeefReferentie(OfferteId)
+			Set FilePart = OfferteId_"_"_$piece(Lijn.VanHoeckeId,"||",2)
+		} else {
+			Set OfferteId = $piece(Lijn.VanHoeckeId,"#",1)	
+			Set FilePart = $replace(Lijn.VanHoeckeId,"#","_")
+		}
 		
-		#dim FilePart As %String = $replace(Lijn.VanHoeckeId,"|","_")
-		
+	    #dim Config As %String = ##class(TECH.StreamUtils).TextBetween(VanHoeckeEconConfiguratie,"Variant,Value:","}")_" "
+	    #dim Toepassing As %String = ##class(TECH.StreamUtils).TextBetween(VanHoeckeEconConfiguratie,"Toepassing,Value:","}")_" "
+	    #dim Verpakking As %String = ##class(TECH.StreamUtils).TextBetween(VanHoeckeEconConfiguratie,"Verpakkingtype,Value:","}")_" "
+	    #dim IsBinnenlade As %String = ##class(TECH.StreamUtils).TextBetween(VanHoeckeEconConfiguratie,"Isbinnenlade,Value:","}")_" "
+	    #dim LijnReferentie As %String = ##class(TECH.StreamUtils).TextBetween(VanHoeckeEconConfiguratie,"Referentie,Value:","}")
+	    #dim LadeDiepte As %String = ##class(TECH.StreamUtils).TextBetween(VanHoeckeEconConfiguratie,"Ladediepte,Value:","}")_" "
+	    #dim OngeldigeWaarde As %String = ##class(TECH.StreamUtils).TextBetween(VanHoeckeEconConfiguratie,"Ongeldigewaarde","}")_" "
+	    
+	    #dim ItemIndex As %Integer = $increment(ReportData("2",Config,Toepassing,OngeldigeWaarde,Verpakking,IsBinnenlade))
+	    
+	    set ^ReportData("1",OfferteId,Lijn.VanHoeckeId) = Lijn.EconStatus_" "_OfferteId_" "_Referentie_" --> "_" "_Lijn.VanHoeckeId_" "_LijnReferentie_" "_Lijn.IntractoId_" "_Lijn.PrijsVhisie3_"<>"_Lijn.PrijsVhisie4
+	    set:Lijn.Foutmelding.Size ^ReportData("1",OfferteId,Lijn.VanHoeckeId,"F")= Lijn.Foutmelding.Read()	    
+	    set ^ReportData("2",Config,Toepassing,OngeldigeWaarde,Verpakking,IsBinnenlade,LadeDiepte,ItemIndex) = Lijn.EconStatus_" "_OfferteId_" "_Referentie_" --> "_Lijn.VanHoeckeId_" "_LijnReferentie_" "_Lijn.IntractoId_" "_Lijn.PrijsVhisie3_"<>"_Lijn.PrijsVhisie4
+	    set:Lijn.Foutmelding.Size ^ReportData("2",Config,Toepassing,OngeldigeWaarde,Verpakking,IsBinnenlade,LadeDiepte,ItemIndex,"F") = ..ParseFoutmelding(Lijn.Foutmelding)
+	    
+	    set ^ReportData("2",Config,Toepassing,OngeldigeWaarde,Verpakking,IsBinnenlade,LadeDiepte,ItemIndex,"I") = IntractoEconConfiguratie.Read()
+	    	    
 	    #dim VanHoeckeEconConfiguratieFilename As %String = "E:\ExportResult\"_FilePart_"VanHoecke.txt"	
 	    #dim IntractoEconConfiguratieFilename As %String = "E:\ExportResult\"_FilePart_"Intracto.txt"
 	    
 	    do ..SaveConfig(Lijn,VanHoeckeEconConfiguratie,VanHoeckeEconConfiguratieFilename)
 	    do ..SaveConfig(Lijn,IntractoEconConfiguratie,IntractoEconConfiguratieFilename)
-		
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="ParseFoutmelding">
+<FormalSpec>Stream:%Stream.Object</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	if ##class(TECH.StreamUtils).IsTextInStream(Stream,"<error") quit ##class(TECH.StreamUtils).TextBetween(Stream,"<error","</error")
+	quit Stream.Read()
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantId">
+<FormalSpec>OfferteId:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	quit ##class(APPS.VKP.impl.Offerte).%OpenId(OfferteId).GeefKlantID()
+]]></Implementation>
+</Method>
+
+<Method name="GeefReferentie">
+<FormalSpec>OfferteId:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	quit ##class(APPS.VKP.impl.Offerte).%OpenId(OfferteId).DocumentReferenties.CommissieReferentie
+]]></Implementation>
+</Method>
+
+<Method name="GeefOfferteId">
+<FormalSpec>WinkelkarId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteId As %String = ""
+	#dim ResultSet As TECH.ResultSet = ..QueryApi.GetResultSet(##class(TECH.DynamicQuery).%New("SELECT ID FROM APPS_VKP_impl.Offerte WHERE WinkelkarId = ?",$listbuild(WinkelkarId)))
+	if ResultSet.Next() {
+		set OfferteId = ResultSet.GetData(1)
+	}
+	quit OfferteId
+]]></Implementation>
+</Method>
+
 <Method name="SaveConfig">
 <FormalSpec>Lijn:WS.Vhisie4.WinkelkarExport.LijnStatus,EconConfiguratie:%Stream.Object,Filename:%String</FormalSpec>
 <Private>1</Private>
@@ -67,11 +132,32 @@
 
 <Method name="CleanUpEconConfiguratie">
 <FormalSpec>EconConfiguratie:%Stream.Object</FormalSpec>
+<ReturnType>%Stream.Object</ReturnType>
 <Implementation><![CDATA[
-	do ##class(TECH.StreamUtils).Replace(EconConfiguratie,"""__type"":""NameValue:#VHServices"",""","")
-	do ##class(TECH.StreamUtils).Replace(EconConfiguratie,"},{","},"_$$$CRLF_"{")
-	do ##class(TECH.StreamUtils).Replace(EconConfiguratie,"""","")
-	do ##class(TECH.StreamUtils).Replace(EconConfiguratie,"{d:[","[")
+	set TmpEconConfig = ##class(%GlobalCharacterStream).%New()
+	do TmpEconConfig.CopyFrom(EconConfiguratie)
+	
+	do ##class(TECH.StreamUtils).Replace(TmpEconConfig,"""__type"":""NameValue:#VHServices"",""","")
+	do ##class(TECH.StreamUtils).Replace(TmpEconConfig,"},{","},"_$$$CRLF_"{")
+	do ##class(TECH.StreamUtils).Replace(TmpEconConfig,"""","")
+	do ##class(TECH.StreamUtils).Replace(TmpEconConfig,"{d:[","[")
+	
+	do TmpEconConfig.Rewind()
+	
+	set CleanedUpConfig = ##class(%GlobalCharacterStream).%New()
+	
+	while $$$Not(TmpEconConfig.AtEnd) {
+		#dim Line As %String = TmpEconConfig.ReadLine()
+		continue:Line["Winkelkarinfo"
+		continue:Line["Afbeeldingcode"
+		continue:Line["Ladecode"
+		continue:Line["Groeperingcode"
+		continue:Line["Value:}"
+		do CleanedUpConfig.WriteLine(Line)
+		
+	}
+	
+	quit CleanedUpConfig
 ]]></Implementation>
 </Method>
 </Class>