Index: BL/Sys/FOP/CommonTasks.cls.xml
===================================================================
diff -u -r69316 -r73456
--- BL/Sys/FOP/CommonTasks.cls.xml	(.../CommonTasks.cls.xml)	(revision 69316)
+++ BL/Sys/FOP/CommonTasks.cls.xml	(.../CommonTasks.cls.xml)	(revision 73456)
@@ -350,8 +350,9 @@
 <FormalSpec>PPODGroup:%String,OutputType:%String="ps"</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
 	Set Extension=$S($L(OutputType):"."_$TR($$$LCase(OutputType),".",""), 1:".ps")
-	Quit $$$PPODSourceDir_PPODGroup_Extension
+	Quit DocBaseDirectoryUtils.GeefOMRSourceDir() _PPODGroup_Extension   ; previously $$$PPODSourceDir
 ]]></Implementation>
 </Method>
 
@@ -442,11 +443,13 @@
 opkuisen van oude data gegenereerd door DocBase</Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	// Clean .ps bestanden in OMR Print from PPOD
-	Do SCANDIR^vhDEV($$$OMRPrintDirNtw,"*.ps",,"X",$$CALCDATE^vhLib.DataTypes($H,"A",-7)) ; alle goed verwerkte bestanden
-	Do SCANDIR^vhDEV($$$OMRSourceDirNtw,"*.ps",,"X",$$CALCDATE^vhLib.DataTypes($H,"A",-30)) ; alle niet-goed verwerkte bestanden
+	Do SCANDIR^vhDEV(DocBaseDirectoryUtils.GeefOMRPrintDirNtw(),"*.ps",,"X",$$CALCDATE^vhLib.DataTypes($H,"A",-7)) ; alle goed verwerkte bestanden
+	Do SCANDIR^vhDEV(DocBaseDirectoryUtils.GeefOMRSourceDirNtw(),"*.ps",,"X",$$CALCDATE^vhLib.DataTypes($H,"A",-30)) ; alle niet-goed verwerkte bestanden
 	// Clean .pdf bestanden in InetPubFop
-	Do SCANDIR^vhDEV($$$FOPInetPubDirNtw,"*.pdf",,"X",$$CALCDATE^vhLib.DataTypes($H,"A",-7)) ; alle goed verwerkte bestanden
+	Do SCANDIR^vhDEV(DocBaseDirectoryUtils.GeefFOPInetPubDirNtw(),"*.pdf",,"X",$$CALCDATE^vhLib.DataTypes($H,"A",-7)) ; alle goed verwerkte bestanden
 	Quit
 ]]></Implementation>
 </Method>