Index: vhConsistency/Checks/Email.cls.xml
===================================================================
diff -u -r1314 -r1327
--- vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1314)
+++ vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1327)
@@ -2,14 +2,14 @@
 <Export generator="Cache" version="9">
 <Class name="vhConsistency.Checks.Email">
 <Description>
-JBL + 2011-05-18</Description>
+JBL + 2011-05-18 </Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhConsistency.Check</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="DoeNsLookUp">
 <Type>%Boolean</Type>
-<Default>1</Default>
+<Default>0</Default>
 </Parameter>
 
 <Parameter name="CacheNsLookUp">
@@ -101,8 +101,7 @@
 	While (rset.Next(.sc)){
 		Set Email = $ZSTRIP(rset.Data("Email"),"<>W")		
 		Set Teller = Teller + 1
-		if ($Piece(Teller/100,".",2)="") W Teller,!
-		;w Email,!
+		if $p(Teller/100,".",2)="" w Teller,!
 		Set ValidMail = ##class(TECH.Mail).Check(Email, ..#DoeNsLookUp,..#CacheNsLookUp)
 		If ('ValidMail){
 			Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
@@ -125,20 +124,21 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set Status = $$$OK
-	While Iterator.HasNext(){
-		if ($Piece(Teller/100,".",2)="") W Teller,!
-		Set KlantLev = Iterator.Next()
+	While (Iterator.HasNext()){
+		Set KlantLev = Iterator.Next()		
+		Set Regio = ""
+		If (KlantLev.%ClassName(1)["Klant") Set Regio = KlantLev.GeefRegio()
+		
 		Set Mail = KlantLev.GeefEmail()
-		;w KlantLev.GeefNummer(),!
 		If (Mail'= ""){
-			;w "'"_Mail_"'",!
+			if $p(Teller/100,".",2)="" w Teller,!
 			Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
 			If ('ValidMail){
 				Set Mail = $ZSTRIP(Mail,"<>W")
 				Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
 				If ('ValidMail){
 					Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
-					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' door "_Feedback)
+					Do ..VoegMeldingToe($C(9)_Regio_$C(9)_KlantLev.GeefNummer()_$C(9)_$$LCVT^vhLib(Mail)_$C(9)_" door "_Feedback)
 					Set TellerNotValid = TellerNotValid + 1			
 					Set Status = $$$ERROR($$$GeneralError,"Geen correct email "_KlantLev.GeefNummer()_" door "_Feedback_" : "_Mail)
 				}Else{
@@ -155,14 +155,13 @@
 		While PersonenIt.HasNext(){
 			Set Persoon = PersonenIt.Next()
 			Set Mail = Persoon.GeefEmail()
-			if ($Piece(Teller/100,".",2)="") W Teller,!
-			;w "'"_Mail_"'",!
 			If (Mail'= "")
 			{
+				if $p(Teller/100,".",2)="" w Teller,!
 				Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
 				If ('ValidMail){
 					Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
-					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' door "_Feedback_" ( Persoon : "_Persoon.GeefNaam()_" "_Persoon.GeefVoornaam()_" )")
+					Do ..VoegMeldingToe($C(9)_Regio_$C(9)_KlantLev.GeefNummer()_$C(9)_$$LCVT^vhLib(Mail)_$C(9)_" door "_Feedback_" ( Persoon : "_Persoon.GeefNaam()_" "_Persoon.GeefVoornaam()_" )")
 					Set TellerNotValid = TellerNotValid + 1			
 					Set Status = $$$ERROR($$$GeneralError,"Geen correct email "_KlantLev.GeefNummer()_" door "_Feedback_": "_Mail)
 				}