Index: zTryout/THB/ConsistencyCheck/Prijzen.cls.xml
===================================================================
diff -u -r52012 -r52013
--- zTryout/THB/ConsistencyCheck/Prijzen.cls.xml	(.../Prijzen.cls.xml)	(revision 52012)
+++ zTryout/THB/ConsistencyCheck/Prijzen.cls.xml	(.../Prijzen.cls.xml)	(revision 52013)
@@ -3,79 +3,113 @@
 <Class name="zTryout.THB.ConsistencyCheck.Prijzen">
 <Super>TECH.RegisteredObject</Super>
 
-<Parameter name="FullPath">
+<Property name="FullPath">
 <Type>%String</Type>
-<Default>C:\temp\</Default>
-</Parameter>
+<InitialExpression>"C:\temp\"</InitialExpression>
+<Private>1</Private>
+</Property>
 
-<Parameter name="Filename">
+<Property name="Filename">
 <Type>%String</Type>
-<Default>TST PrijzenControleren in bulk via webservice.csv</Default>
-</Parameter>
+<InitialExpression>"TST PrijzenControleren in bulk via webservice.csv"</InitialExpression>
+<Private>1</Private>
+</Property>
 
+<Property name="Console">
+<Type>TECH.Console.Console</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FileApi">
+<Type>TECH.File.FileAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="FileReader">
 <Type>TECH.FileReader</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FileReader:TECH.File.FileReader=""</FormalSpec>
+<FormalSpec>Console:TECH.Console.Console="",FileApi:TECH.File.FileAPI="",FileReader:TECH.File.FileReader=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..Console = $$$Inject(Console,##class(TECH.Console.impl.TerminalConsole).%New())
+	Set ..FileApi = $$$Inject(FileApi, ##class(TECH.File.impl.FileAPI).%New())
 	Set ..FileReader = $$$Inject(FileReader, ##class(TECH.FileReader).%New())
 
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="PopuleerGlobal">
+<Method name="PopuleerGlobalVolgensBestand">
+<FormalSpec>FullPath:%String="",Filename:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	#dim Count, KLNr, PRNr, Aantal, Eenheid As %Integer
 	#dim Lijn, Node1, KlantNaam, Korttekst, Identnummer As %String
 	#dim SimPPL, Nettoprijs, Lijstprijs, InclBTW As %Decimal
 	
-	Set Stream = ##class(%FileCharacterStream).%New()
-	Set Stream.Filename = ##class(TECH.Files).AppendFile(..#FullPath,..#Filename)
-	Do ..FileReader.SetStream(Stream)
-	Do ..FileReader.SetDelimiter("OngebruikteDelimiter")
+	If ($$$HasLength(FullPath)) {
+		Set ..FullPath = FullPath
+	}
+	If ($$$HasLength(Filename)) {
+		Set ..Filename = Filename
+	}
 	
-	Set Count = 3
-	Set KLNr = 0
-	Set PRNr = 0
-	Set Node1 = "Check"
-	
-	Kill ^ConsistCheckPrijzenKlantProduct(Node1)
-	Set ^ConsistCheckPrijzenKlantProduct(Node1) = "Persistentie van verwachte prijzen voor ConsistencyCheck volgens ""Check""-RijInExcelBestand-Klant-Product"
-	
-	Do ..FileReader.SetFirstDataRow(3)
-	
-	While ..FileReader.HasNext() {
-		Do ..FileReader.Next()
-		Set Lijn = ..FileReader.GetData(1)
+	If ($$$Not(..IsBestaandBestand(FullPath, Filename))) {
+		Do ..Console.WriteLine("Het opgegeven pad '"_FullPath_"' en/of de opgegeven bestandsnaam '"_Filename_"' wijzen niet naar een bestaand bestand.")
+	} Else {
+		Set Stream = ##class(%FileCharacterStream).%New()
+		Set Stream.Filename = ##class(TECH.Files).AppendFile(..FullPath,..Filename)
+		Do ..FileReader.SetStream(Stream)
+		Do ..FileReader.SetDelimiter("OngebruikteDelimiter")
 		
-		Set KLNr = $Piece(Lijn,";",1)
-		Set KlantNaam = $Piece(Lijn,";",2)
-		Set PRNr = $Piece(Lijn,";",3)
-		Set Korttekst = $Piece(Lijn,";",4)
-		Set Identnummer = $Piece(Lijn,";",5)
-		Set Aantal = $Piece(Lijn,";",6)
-		Set SimPPL = $Translate($Piece(Lijn,";",7)," ","")
-		Set Nettoprijs = $Piece(Lijn,";",8)
-		Set Lijstprijs = $Piece(Lijn,";",9)
-		Set Eenheid = $Piece(Lijn,";",10)
-		Set InclBTW = $Piece(Lijn,";",11)
+		Set Count = 3
+		Set KLNr = 0
+		Set PRNr = 0
+		Set Node1 = "Check"
 		
-		Set ^ConsistCheckPrijzenKlantProduct(Node1,Count,KLNr,PRNr) = ""_KLNr_"\"_KlantNaam_"\"_PRNr_"\"_Korttekst_"\"_Identnummer_"\"_Aantal_"\"_SimPPL_"\"_Nettoprijs_"\"_Lijstprijs_"\"_Eenheid_"\"_InclBTW_""
+		Kill ^ConsistCheckPrijzenKlantProduct(Node1)
+		Set ^ConsistCheckPrijzenKlantProduct(Node1) = "Persistentie van verwachte prijzen voor ConsistencyCheck volgens Check-RijInExcelBestand-Klant-Product"
 		
-		Set Count = Count + 1
+		Do ..FileReader.SetFirstDataRow(3)
+		
+		While ..FileReader.HasNext() {
+			Do ..FileReader.Next()
+			Set Lijn = ..FileReader.GetData(1)
+			
+			Set KLNr = $Piece(Lijn,";",1)
+			Set KlantNaam = $Piece(Lijn,";",2)
+			Set PRNr = $Piece(Lijn,";",3)
+			Set Korttekst = $Piece(Lijn,";",4)
+			Set Identnummer = $Piece(Lijn,";",5)
+			Set Aantal = $Piece(Lijn,";",6)
+			Set SimPPL = $Translate($Piece(Lijn,";",7)," ","")
+			Set Nettoprijs = $Piece(Lijn,";",8)
+			Set Lijstprijs = $Piece(Lijn,";",9)
+			Set Eenheid = $Piece(Lijn,";",10)
+			Set InclBTW = $Piece(Lijn,";",11)
+			
+			Set ^ConsistCheckPrijzenKlantProduct(Node1,Count,KLNr,PRNr) = ""_KLNr_"\"_KlantNaam_"\"_PRNr_"\"_Korttekst_"\"_Identnummer_"\"_Aantal_"\"_SimPPL_"\"_Nettoprijs_"\"_Lijstprijs_"\"_Eenheid_"\"_InclBTW_""
+			
+			Set Count = Count + 1
+		}
+		
+		Do ..FileReader.Close()
 	}
-	
-	Do ..FileReader.Close()
 ]]></Implementation>
 </Method>
+
+<Method name="IsBestaandBestand">
+<FormalSpec>FullPath:%String,Filename:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..FileApi.FileExists(##class(TECH.Files).AppendFile(FullPath,Filename))
+]]></Implementation>
+</Method>
 </Class>