Index: vhLib/Macro.inc.rou =================================================================== diff -u -r1047 -r2588 --- vhLib/Macro.inc.rou (.../Macro.inc.rou) (revision 1047) +++ vhLib/Macro.inc.rou (.../Macro.inc.rou) (revision 2588) @@ -29,6 +29,10 @@ #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 NSpace $ZU(5) @@ -67,16 +71,29 @@ // Arrays #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: // =-=-=-=-=-=-=-=-=-=-=-=