Index: TECH/Mail.cls.xml
===================================================================
diff -u -r1264 -r1292
--- TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1264)
+++ TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1292)
@@ -7,60 +7,14 @@
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Method name="CheckDummy">
-<Description>
-Do ##class(TECH.Mail).CheckDummy()</Description>
-<ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[
-	Set mail = "Joren"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "JorenBlancquaert@"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancquaert@"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren_Blancquaert@ab.a"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren_Blancq%uaert@ab.a"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancquaert@ab.a"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "Joren.Blancquaert@ab_.a"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = ".Joren.Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancquaert.@skynet.be"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "Joren..Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "Joren.Blancquaert@skynet..be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancq.uaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancq.uae123rt@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancq.uae123rt@skynet.be.abc"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren  Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "JorenBlancquaert@sky net.be"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "~Joren.Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-]]></Implementation>
-</Method>
-
 <Method name="Check">
 <Description>
 Check een email adres adhv pattern-match, en afzonderlijke controles.
 Tevens kan een nslookup van het domein gedaan worden, aan te geven via parameter.
 Write ##class(TECH.Mail).Check("jbl@vanhoecke.be")
 Write ##class(TECH.Mail).Check("jbl@nietbestaand.be",1)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Mail:%String,NsLookUp:%Boolean=0</FormalSpec>
+<FormalSpec>Mail:%String,NsLookUp:%Boolean=0,CacheNsLookUp:%Boolean=0</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
@@ -94,6 +48,9 @@
 	If (NsLookUp){
 		Set:IsValid IsValid = ..NsLookUp(DomainPart)	
 	}
+	If ('CacheNsLookUp){
+		Kill %NsLookUps	
+	}
 	Quit IsValid
 ]]></Implementation>
 </Method>
@@ -114,8 +71,14 @@
 <FormalSpec>MailDomainPart:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set Status = ..NsLookUpCheck(MailDomainPart)
-	Set:'Status Status = ..NsLookUpCheck("www."_MailDomainPart)
+	/// Als nslookup nog niet gecached is, deze uitvoeren. 
+	Set Status = 0
+	If ($Data(%NsLookUps(MailDomainPart))){
+	  Set Status = %NsLookUps(MailDomainPart)
+	}Else {
+		Set Status = ..NsLookUpCheck(MailDomainPart)
+		Set:'Status Status = ..NsLookUpCheck("www."_MailDomainPart)
+	}
 	Quit Status
 ]]></Implementation>
 </Method>
@@ -134,6 +97,7 @@
 	Set Status = %NsLookUp
 	Do DELFILE^vhDEV("c:\",FileName)
 	Kill %NsLookUp	
+	Set %NsLookUps(MailDomainPart) = Status
 	Quit Status
 ]]></Implementation>
 </Method>