Index: vhLib/DataTypes.mac.rou
===================================================================
diff -u -r128 -r138
--- vhLib/DataTypes.mac.rou	(.../DataTypes.mac.rou)	(revision 128)
+++ vhLib/DataTypes.mac.rou	(.../DataTypes.mac.rou)	(revision 138)
@@ -1,4 +1,4 @@
- ;DataTypes [ 08/20/2003  3:59 PM ] 
+  ;DataTypes [ 08/20/2003  3:59 PM ] 
  ;
 TN1 ;Jan;Feb;Maa;Apr;Mei;Jun;Jul;Aug;Sep;Okt;Nov;Dec;
 TF1 ;Jan;F�v;Mar;Avr;Mai;Jun;Jul;Ao�;Sep;Oct;Nov;D�c;
@@ -556,20 +556,7 @@
  Set R=$$EXTDATE(%DT,Typ,Taal)
  If $P(%DT,",",2) Set:$L(R) R=R_"  " Set R=R_$$EXTTIME(%DT)
  Quit R
-
-ValidateDateFormat(%DS,Typ)
- New FormatOk
- Set FormatOk=(%DS?1"+"1.3N)
- Do:'FormatOk
- .Set Typ=$G(Typ,"DK")
- .Set:Typ="DK" Typ="DKP"
- .Do:Typ="DKP"
- ..Set %DS=$TR(%DS,".- \'",".....")
- ..Set:$L(%DS,".")=1 %DS=%DS_"."_$$EXTDATE(,"MN")_"."_$$EXTDATE(,"J")
- ..Set:$L(%DS,".")=2 %DS=%DS_"."_$$EXTDATE(,"J")
- .Set FormatOk=$$DATETYP(%DS)=Typ
- Quit FormatOk 
- 
+ ;
 DATETYP(%DS) 
  New Typ,Trans
  Set Trans=%DS[".",%DS=$TR(%DS,".- \'","/////")
@@ -578,10 +565,6 @@
  .Else  If $P(%DS,"/",3)?4N Set $P(%DS,"/")=$J($P(%DS,"/"),2),$P(%DS,"/",2)=$J($P(%DS,"/",2),2)
  .Else  Set $P(%DS,"/")=$J($P(%DS,"/"),2),$P(%DS,"/",2)=$J($P(%DS,"/",2),2),$P(%DS,"/",2)=$J($P(%DS,"/",2),2)
  .Set %DS=$TR(%DS," ",0)
- .Set:$TR($P(%DS,"/"),0,"")="" $P(%DS,"/")=""
- .Set:$TR($P(%DS,"/",2),0,"")="" $P(%DS,"/",2)=""
- .Set:$TR($P(%DS,"/",3),0,"")="" $P(%DS,"/",3)=""
- .If $P(%DS,"/")=""!($P(%DS,"/",2)="")!($P(%DS,"/",3)="") Set Typ="" Quit
  .If %DS?4N1"/"2N1"/"2N Set Typ="DS"
  .Else  If %DS?2N1"/"2N1"/"2N Set Typ=$S(Trans:"DKP",1:"DK")
  .Else  If %DS?2N1"/"2N1"/"4N Set Typ="DK4"
@@ -608,3 +591,4 @@
  Quit
  ;
 
+