Index: BL/Sys/FOP/DocBaseV7Helper.cls.xml
===================================================================
diff -u -r73207 -r73224
--- BL/Sys/FOP/DocBaseV7Helper.cls.xml	(.../DocBaseV7Helper.cls.xml)	(revision 73207)
+++ BL/Sys/FOP/DocBaseV7Helper.cls.xml	(.../DocBaseV7Helper.cls.xml)	(revision 73224)
@@ -26,49 +26,140 @@
 </Method>
 
 <Method name="VoerUitAsyncWSDoSeededTasks">
-<FormalSpec>WSClientFopV7:%CacheString,ProcessorBeanID:%String,SeedData:%ListOfObjects</FormalSpec>
+<FormalSpec>WSClientFopV7:BL.Sys.FOP.DocBaseV7.AsyncProcessorInvokerWebClient,ProcessorBeanID:%String,SeedData:%ListOfObjects,fopReq:%RegisteredObject</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
-<Method name="ConvertSeedDataNaarVersie7">
-<FormalSpec>SeedDataToConvert:%ListOfObjects</FormalSpec>
-<ReturnType>%CacheString</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method VoerUitAsyncWSDoSeededTasks(WSClientFopV7 As BL.Sys.FOP.DocBaseWebClientV7.AsyncProcessorInvoker, ProcessorBeanID As %String, SeedData As %ListOfObjects) As %String
-{
-	Set SeedDataParams = ##class(WS.FOPv7.ns1.doSeededTasks).%New()
+<Implementation><![CDATA[
+	Set SeedDataParams = ##class(BL.Sys.FOP.DocBaseV7.dto.doSeededTasks).%New()
 	Set SeedDataParams.processorBeanId = ProcessorBeanID
-	Set SeedDataParams.seedData =  SeedData
+	Set SeedDataParams.seedData = ..ConvertSeedDataNaarVersie7(SeedData)
 	
+	;Set SeedDataParams = ..GeefSeedDataParamsPakbonToFile()
 	
-	#dim FopResult As WS.FOPv7.ns1.doSeededTasksResponse = WSClientFopV7.doSeededTasks(SeedDataParams)
+	#dim FopResult As BL.Sys.FOP.DocBaseV7.dto.doSeededTasksResponse = WSClientFopV7.doSeededTasks(SeedDataParams)
 	
 	#dim FopResponse As %String = FopResult.return   ; i.e. jobId
 	Quit FopResponse
-}
+]]></Implementation>
+</Method>
 
-Method ConvertSeedDataNaarVersie7(SeedDataToConvert As %ListOfObjects) As WS.FOPv7.tns.iocwSeedDataWrapper
-{
-	Set seedDataV7 = ##class(WS.FOPv7.tns.iocwSeedDataWrapper).%New()
+<Method name="WijzigGegenereerdeCodeXmlExport">
+<Description>
+Public classmethod, wordt opgeroepen vanuit BL.Sys.FOP.DocBaseV7.dto.beanRuntimeProperty om %code van XmlExport() aan te passen. 
+Parameter %code als .local doorgeven </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&pctCode:%CacheString]]></FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<Implementation><![CDATA[
+	/* 
+		
+	Deze method moet opgeroepen worden door de "CodeGenerated method XmlExport() van de klasse BL.Sys.FOP.DocBaseV7.dto.beanRuntimeProperty 
+	Die zou normaal gezien volgende code genereren (in de .INT file) 
+		
+		... 
+		XMLBSTREAMbase64(val)
+		 Do val.Rewind() Set len=5700 While 'val.AtEnd { Write $system.Encryption.Base64Encode(val.Read(.len,.sc)) Quit:'sc }
+		... 
+		
+	maar deze code moet gemanipuleerd worden om door de nieuwe versie (v7) van DocBase te worden aanvaard als geldige input.
+			
+		... 
+		XMLBSTREAMbase64(val)   ; Generated code was 02 intercepted and modified by WimV.
+		 Do val.Rewind() Set len=5700 While 'val.AtEnd { Write $Translate($system.Encryption.Base64Encode(val.Read(.len,.sc)), $C(13,10), "") Quit:'sc }
+		... 
+		
+	*/
 	
-	// Loop over alle listitems van SeedDataToConvert
+	#define FunctionToFind   "XMLBSTREAMbase64(val)"
+	#define CodeToFind       "Write $system.Encryption.Base64Encode(val.Read(.len,.sc))"
+	#define CodeNew          "Write $Translate($system.Encryption.Base64Encode(val.Read(.len,.sc)), $C(13,10), """")"
+
+	#dim i As %Integer
+	Set i = ""
+	For  { Set i = $Order(pctCode(i)) Quit:(i="") 
+		if (pctCode(i)) = $$$FunctionToFind {
+			
+			// Mark this line as modified 
+			Set pctCode(i) = $$$FunctionToFind_"   ; Generated code was intercepted and modified by WimV.  See method WijzigGegenereerdeCodeXmlExport()"
+			
+			// Jump to next subnode of %code and replace the "code to find" 
+			Set i = $Order(pctCode(i))
+			If (i > 0) && (pctCode(i) [ $$$CodeToFind) {
+				Set pctCode(i) = $Replace(pctCode(i), $$$CodeToFind, $$$CodeNew)   ; Modify the generated code, so that the Base64Encode does not add the CRLF anymore :-P   
+			}
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ConvertSeedDataNaarVersie7">
+<FormalSpec>SeedDataToConvert:%ListOfObjects(ELEMENTTYPE="BL.Sys.FOP.BeanRuntimeProperty")</FormalSpec>
+<Private>1</Private>
+<ReturnType>BL.Sys.FOP.DocBaseV7.dto.iocwSeedDataWrapper</ReturnType>
+<Implementation><![CDATA[
+	Set seedDataV7 = ##class(BL.Sys.FOP.DocBaseV7.dto.iocwSeedDataWrapper).%New()
 	
-		;Do seedDataV7.beanRuntimeProperties.Insert(..GeefBeanRtProperty("adb_renderTask","renderInfo.renderOutputType",OutputType))
+	// Loop over alle listitems van SeedDataToConvert As list Of BL.Sys.FOP.BeanRuntimeProperty
+	Set BeanRtIterator = ##class(TECH.ListIterator).%New(SeedDataToConvert)
+	While (BeanRtIterator.HasNext()) {
+		#dim BeanRtPropertyToConvert As BL.Sys.FOP.BeanRuntimeProperty = BeanRtIterator.Next()
+		Continue:(BeanRtPropertyToConvert.targetPropertyKey = "dpInfo.stage")   ; // Do not convert to V7 
+		
+		#dim BeanRtPropertyV7 As BL.Sys.FOP.DocBaseV7.dto.beanRuntimeProperty = ..GeefBeanRtPropertyZonderValue(BeanRtPropertyToConvert.targetBeanName,BeanRtPropertyToConvert.targetPropertyKey)
+		// Value(s) to be Converted : 
+		If ($IsObject(BeanRtPropertyToConvert.ListPropertyValue)) && (BeanRtPropertyToConvert.ListPropertyValue.Count() > 0) {
+			If (BeanRtPropertyToConvert.targetPropertyKey = "renderInfo.renderXsltParamList") {
+				#dim XsltParams As %ListOfDataTypes = BeanRtPropertyToConvert.ListPropertyValue
+				Set BeanRtPropertyV7.Base64PropertyValue  = ##class(TECH.ListUtils).ListToPieces(XsltParams,$$$CRLF)
+			}
+			ElseIf (BeanRtPropertyToConvert.targetBeanName = "adb_mailSenderTask") && (##class(TECH.StringUtils).Equals(BeanRtPropertyToConvert.targetPropertyKey, "mailToList", "ccList", "bccList")) {
+				#dim MailRcptList As %ListOfDataTypes = BeanRtPropertyToConvert.ListPropertyValue
+				Set BeanRtPropertyV7.Base64PropertyValue  = ##class(TECH.ListUtils).ListToPieces(MailRcptList, ",")
+			}
+			Else {
+				; Throw NotImplemented Exception ("dit type list moet eerst nagekeken worden vooraleer dit mag omgezet worden")
+			}
+		}
+		
+		/*
+		ElseIf (BeanRtPropertyToConvert.targetPropertyKey = "XX_renderInfo.sourceBytesToRender") {
+			// Temp input data in afwachting van Convert Streams
+			;#dim BytesToRender As %String = "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxET0NTPg0KCTxQQUtCT04geHNpOnR5cGU9InB4UGFrYm9uIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIj4NCgkJPEtMQU5UPkhJTFZFTiBMVUMgQlYgKEhJTFZFTiBMVUMpPC9LTEFOVD4NCgkJPExFVkJPTj4zNTMuNzM1PC9MRVZCT04+DQoJCTxMRVZEQVRVTT4xMy8wMy8yMDI0PC9MRVZEQVRVTT4NCgkJPFZFUlpFTkRXSUpaRT5ESTE8L1ZFUlpFTkRXSUpaRT4NCgkJPExJSk5FTj4NCgkJCTxMSUpOPg0KCQkJCTxMSUpOVFlQRT5QPC9MSUpOVFlQRT4NCgkJCQk8UFJPRFVDVD4NCgkJCQkJPEtPUlRURUtTVD4NCgkJCQkJCTwhW0NEQVRBWyAtLT4gS2xhYXJ6ZXRsb2NhdGllcyA6XV0+DQoJCQkJCTwvS09SVFRFS1NUPg0KCQkJCQk8VEVLU1QgdHlwZT0iSVRFTSI+DQoJCQkJCQk8SVRFTSB2b2xnbnI9IjEiPg0KSzA5DQrCoDwvSVRFTT4NCgkJCQkJPC9URUtTVD4NCgkJCQk8L1BST0RVQ1Q+DQoJCQk8L0xJSk4+DQoJCQk8TElKTj4NCgkJCQk8TElKTlRZUEU+UDwvTElKTlRZUEU+DQoJCQkJPFBST0RVQ1Q+DQoJCQkJCTxJREVOVE5SPjAuMjEwLjE3NS43PC9JREVOVE5SPg0KCQkJCQk8S09SVFRFS1NUPlQ2MC4xMTI1VyAgV0VMTEUgIFY0MCAgR1I8L0tPUlRURUtTVD4NCgkJCQkJPEVBTkNPREU+OTAwOTQ5NDEwMDc5MjwvRUFOQ09ERT4NCgkJCQkJPFNUT0NLPlM8L1NUT0NLPg0KCQkJCQk8R1JPT1RWRVJQQUs+NDA8L0dST09UVkVSUEFLPg0KCQkJCQk8SU1BR0VfVVJMIGFzcGVjdHJhdGlvPSIwLjAwMDAiIHNjYWxlPSIwLjAwIj5maWxlOi8vTm90ZXMwMS9JbWFnZXMvQkxVTS9XLzQ3NDI4Mjg1X0JUX1BfMV9QQl9CQVVfU0FMTF9BT0ZfVjEuSlBHPC9JTUFHRV9VUkw+DQoJCQkJCTxJTkZPX1VSTD5odHRwOi8vcmVzLnZhbmhvZWNrZS5iZS9DYXRhbG9nL1Byb2R1Y3QuYXNweD9CTmRvTXJyR0lMajAzTSsybGpCZWRHUXZoTVA5cmNRRjZ4TlZ4V28vOUx3PTwvSU5GT19VUkw+DQoJCQkJCTxURUtTVCB0eXBlPSJJVEVNIj4NCgkJCQkJCTxJVEVNIHZvbGducj0iMSI+VElQLU9OIEJMVU1PVElPTjwvSVRFTT4NCgkJCQkJCTxJVEVNIHZvbGducj0iMiI+c3luY2hyb3N0YW5nPC9JVEVNPg0KCQkJCQkJPElURU0gdm9sZ25yPSIzIj5LbGV1cjogYW50cmFjaWV0PC9JVEVNPg0KCQkJCQk8L1RFS1NUPg0KCQkJCQk8VE9UQUFMPjE8L1RPVEFBTD4NCgkJCQkJPFBJQ0tJTkdMSUpORU4+DQoJCQkJCQk8UElDS0lOR0xJSk4+DQoJCQkJCQkJPFVTRVI+S2FyZGV4T3BlcmF0b3I8L1VTRVI+DQoJCQkJCQkJPFBBTElEPkthcmRleC1LMDk8L1BBTElEPg0KCQkJCQkJCTxBQU5UQUw+MTwvQUFOVEFMPg0KCQkJCQkJCTxUSUpEU1RJUD5kaSAyMDoyMDwvVElKRFNUSVA+DQoJCQkJCQk8L1BJQ0tJTkdMSUpOPg0KCQkJCQk8L1BJQ0tJTkdMSUpORU4+DQoJCQkJPC9QUk9EVUNUPg0KCQkJPC9MSUpOPg0KCQkJPExJSk4+DQoJCQkJPExJSk5UWVBFPlA8L0xJSk5UWVBFPg0KCQkJCTxQUk9EVUNUPg0KCQkJCQk8SURFTlROUj4wLjEyOC42OTMuMjwvSURFTlROUj4NCgkJCQkJPEtPUlRURUtTVD5UNjBMNzU0MC4xIFRPQiAgUitMVjFSNzM3PC9LT1JUVEVLU1Q+DQoJCQkJCTxFQU5DT0RFPjkwMDk0OTQzMTg4NzY8L0VBTkNPREU+DQoJCQkJCTxTVE9DSz5TPC9TVE9DSz4NCgkJCQkJPEdST09UVkVSUEFLPjIwPC9HUk9PVFZFUlBBSz4NCgkJCQkJPElNQUdFX1VSTCBhc3BlY3RyYXRpbz0iMC4wMDAwIiBzY2FsZT0iMC4wMCI+ZmlsZTovL05vdGVzMDEvSW1hZ2VzL0JMVU0vVy8wMTI4NjkzMl9JRF9QXzFfUEJfQkFVX1NBTExfQU9GX1YxLkpQRzwvSU1BR0VfVVJMPg0KCQkJCQk8SU5GT19VUkw+aHR0cDovL3Jlcy52YW5ob2Vja2UuYmUvQ2F0YWxvZy9Qcm9kdWN0LmFzcHg/N080V1V1dGYvbHJ0UnBaU2NmMUJXV1F2aE1QOXJjUUY2eE5WeFdvLzlMdz08L0lORk9fVVJMPg0KCQkJCQk8VEVLU1QgdHlwZT0iSVRFTSI+DQoJCQkJCQk8SVRFTSB2b2xnbnI9IjEiPlRJUC1PTiBCTFVNT1RJT04gU0VUPC9JVEVNPg0KCQkJCQkJPElURU0gdm9sZ25yPSIyIj5lZW5oZWlkIEwrUiwgMTUtNDBrZyB2b29yIExCWCBlbiBNT1Y8L0lURU0+DQoJCQkJCQk8SVRFTSB2b2xnbnI9IjMiPk5MIDM1MC02MDBtbSwgaW5jbHVzaWVmIG1lZW5lbWVycyBlbjwvSVRFTT4NCgkJCQkJCTxJVEVNIHZvbGducj0iNCI+a29wcGVsc3R1ayB2b29yIHN5bmNocm9uaXNlcmluZzwvSVRFTT4NCgkJCQkJCTxJVEVNIHZvbGducj0iNSI+S2xldXI6IFI3MDM3IGRvbmtlcmdyaWpzPC9JVEVNPg0KCQkJCQk8L1RFS1NUPg0KCQkJCQk8VE9UQUFMPjM8L1RPVEFBTD4NCgkJCQkJPFBJQ0tJTkdMSUpORU4+DQoJCQkJCQk8UElDS0lOR0xJSk4+DQoJCQkJCQkJPFVTRVI+S2FyZGV4T3BlcmF0b3I8L1VTRVI+DQoJCQkJCQkJPFBBTElEPkthcmRleC1LMDk8L1BBTElEPg0KCQkJCQkJCTxBQU5UQUw+MzwvQUFOVEFMPg0KCQkJCQkJCTxUSUpEU1RJUD5kaSAyMDoyMTwvVElKRFNUSVA+DQoJCQkJCQk8L1BJQ0tJTkdMSUpOPg0KCQkJCQk8L1BJQ0tJTkdMSUpORU4+DQoJCQkJPC9QUk9EVUNUPg0KCQkJPC9MSUpOPg0KCQk8L0xJSk5FTj4NCgk8L1BBS0JPTj4NCjwvRE9DUz4"
+			;Set BeanRtPropertyV7.newPropertyValue = BytesToRender
+			
+			#dim len,sc
+			#dim Src As %BinaryStream = BeanRtPropertyToConvert.StreamPropertyValue
+			#dim TargetStream As %GlobalCharacterStream = BeanRtPropertyV7.CStreamPropertyValue
+			
+			;Do Src.Rewind() Set len=5700 While 'Src.AtEnd { Do TargetStream.Write( $Translate( $system.Encryption.Base64Encode(Src.Read(.len,.sc)), $$$CRLF, "") ) Quit:'sc }
+			
+		}
+		*/
+		
+		Else {
+			// Slechts één van deze drie zal ingevuld zijn, de andere zijn leeg, dus zouden in feite niet moeten overgezet worden, maar dat is geen probleem aangezien het gewoonweg dto's zijn en dat maakt voor caché dus geen verschil.
+			Set BeanRtPropertyV7.newPropertyValue     = BeanRtPropertyToConvert.newPropertyValue
+			Set BeanRtPropertyV7.BoolPropertyValue    = BeanRtPropertyToConvert.BoolPropertyValue
+			Set BeanRtPropertyV7.IntegerPropertyValue = BeanRtPropertyToConvert.IntegerPropertyValue
+			Set BeanRtPropertyV7.StreamPropertyValue  = BeanRtPropertyToConvert.StreamPropertyValue
+		}
+		Do seedDataV7.beanRuntimeProperties.Insert(BeanRtPropertyV7)
+	}
 	
-	
 	Quit seedDataV7
-}
-*/
-]]></Content>
-</UDLText>
+]]></Implementation>
+</Method>
+
+<Method name="GeefBeanRtPropertyZonderValue">
+<FormalSpec>BeanName:%String,PropertyKey:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>BL.Sys.FOP.DocBaseV7.dto.beanRuntimeProperty</ReturnType>
+<Implementation><![CDATA[
+	Set BeanRtProperty = ##class(BL.Sys.FOP.DocBaseV7.dto.beanRuntimeProperty).%New()
+	Set BeanRtProperty.targetBeanName = BeanName
+	Set BeanRtProperty.targetPropertyKey = PropertyKey
+	Quit BeanRtProperty
+]]></Implementation>
+</Method>
 </Class>