Index: vhLib/Macro.inc.rou
===================================================================
diff -u -r140 -r321
--- vhLib/Macro.inc.rou	(.../Macro.inc.rou)	(revision 140)
+++ vhLib/Macro.inc.rou	(.../Macro.inc.rou)	(revision 321)
@@ -1,10 +1,16 @@
- 
+#include %occErrors
+#include %occStatus
+
  // Koppeling tussen User en IP adres / IO-device =
-#define IctUserFromIP(%ip)             $$$IctUserFromIP4($P(%ip,".",4))
-#define IctUserFromIP4(%ip4)           $Case(%ip4, 15:"pv", 27:"cw", 97:"wv", 127:"jbl", 138:"wro", 150:"pra", 191:"csc" , 195:"jcl", 204:"fma" , 205:"wv", 206:"jcl", 49:"csc", 95:"jbl", :"")
- 
+
+#define clNone	$ZH("000000")
+#define clRed 	$ZH("000000")
+
+
+#define IctUserFromIP(%ip)             $Case($P(%ip,".",3,4), "1.15":"pv", "1.27":"cw", "1.97":"wv", "1.127":"jbl", "1.138":"wro", "1.150":"pra", "1.191":"csc" , "1.195":"jcl", "1.204":"fma" , "1.205":"wv", "1.206":"jcl", "1.49":"csc", "1.95":"jbl","1.42":"mvi","1.51":"mvi",:"")
+
 #define UserFromDevice(%v)             $$$TextBetween(%v,"|TNT|","_")
-#define IctUserFromDevice(%v)          $Select($$$UserFromDevice(%v)?1(1"pv",1"cw",1"wv",1"jbl",1"wro",1"pra",1"jcl",1"fma",1"csc"):$$$UserFromDevice(%v), 1:"")
+#define IctUserFromDevice(%v)          $Select($$$UserFromDevice(%v)?1(1"pv",1"cw",1"wv",1"jbl",1"wro",1"pra",1"jcl",1"fma",1"csc",1"mvi"):$$$UserFromDevice(%v), 1:"")
  
 #define IctSysOp					   "ICT_SysOp@vanhoecke.be"
 #define IctMeldingen				   "ICT_Meldingen@vanhoecke.be"
@@ -29,8 +35,12 @@
  
 #define Timestamp(%timearg)			   $zdatetime(%timearg,3,,6) 
  
+ // Time Conversion
+#define FormatHMS(%v)                  $TR("HRu MNmin SCs.","HR:MN:SC",$ZT(%v,1))
+#define FormatYMDHMS(%v,%sep)          $TR($ZDT(%v,8)," :",%sep)
+ 
  // Cache Objects  ($$$METH... --> zie %occReference2.INC)
-#define Server                         $ZU(110)
+#define Server                         $zconvert($ZU(110),"U")
 #define NSpace                         $ZU(5)
 #define IsClassMethod(%cls,%mth)       $$$METHclassmethod($$$MGINFO,%cls,%mth)
 #define IsWebMethod(%cls,%mth)         $$$METHwebmethod($$$MGINFO,%cls,%mth)
@@ -62,21 +72,37 @@
  
  //Excel format 
 #define ExcelNum(%v) 					$$ExcelNum^vhLib(%v)
-#define ExcelDat(%v) 					$$EXTDATE^vhDTyp(%v,"DK")
+#define ExcelDat(%v) 					$$EXTDATE^vhLib.DataTypes(%v,"DK")
 #define ExcelDateAsNum(%v)				%v-21548					
+#define ExcelTime(%v)					$zt(%v)					
  
  // Arrays
+#define NodeHasData(%v)				   $D(%v)#10
+#define NodeHasSubNodes(%v)			   $D(%v)>1	
 #define aHasData(%v)                   $D(%v)#10
-#define aHasSubNodes(%v)               $D(%v)>1 
+#define aHasSubNodes(%v)               $D(%v)>1
+ /*
+#define ArrayTT(%r)                    $C(13,10)_$$ArrayToText^vhLib(%r)
+ */
 #def1arg ArrayTT(%r)                   $C(13,10)_$$ArrayToText^vhLib(%r)
-#define MDToText(%o,%p)                $C(13,10)_$$ArrayToText^vhLib(%p,%o,%p)
+#define ArrayTT2(%r,%a)                $C(13,10)_$$ArrayToText^vhLib(%r,%a)
+#define ArrayTT3(%r,%o,%p)             $C(13,10)_$$ArrayToText^vhLib(%r,%o,%p)
  
+ 
  // ListBuilds
 #define LCVT(%v)                       $$LCVT^vhLib(%v)
 #define IsList(%v)                     $$IsList^vhLib(%v)
 #define LBDeleteAt(%lb,%i)             $LI(%lb,1,%i-1)_$LI(%lb,%i+1,-1)
 #define DoLBDeleteAt(%lb,%i)           Set $LI(%lb,%i,%i)=""
 #define DoLBDeleteAtIf(%c,%lb,%i)      Set:(%c) $LI(%lb,%i,%i)=""
+ 
+ // CSP-HTML-URL
+#define HTML(%v)                       $$ConvertToHTML^vhRtn1(%v)
+#define HTML2(%v)                      $ZCVT(%v,"O","HTML")
+#define QuoteJS(%v)                    ##class(%CSP.Page).QuoteJS(%v)
+#define URL(%v)                        $ZCVT(%v,"O","URL")
+#define XML(%v)                        $ZCVT(%v,"O","UTF8")
+ 
  /*
  // Gebruik van LBDeleteAt: 
  // =-=-=-=-=-=-=-=-=-=-=-= 
@@ -107,4 +133,7 @@
  
  
 #define ConfigGetString(%s)			   ##class(TECH.Config.ConfigMgr).Instance().GetString(%s)
-#define ConfigGetBoolean(%s)		   ##class(TECH.Config.ConfigMgr).Instance().GetBoolean(%s)
\ No newline at end of file
+#define ConfigGetBoolean(%s)		   ##class(TECH.Config.ConfigMgr).Instance().GetBoolean(%s)
+
+
+