Index: vhLib/Macro.inc.rou =================================================================== diff -u -r2588 -r4568 --- vhLib/Macro.inc.rou (.../Macro.inc.rou) (revision 2588) +++ vhLib/Macro.inc.rou (.../Macro.inc.rou) (revision 4568) @@ -1,7 +1,15 @@ - +#include %occErrors +#include %occStatus + // Koppeling tussen User en IP adres / IO-device = + +#define clNone $ZH("000000") +#define clRed $ZH("000000") + + #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:"csc", :"") +#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 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:"") @@ -34,7 +42,7 @@ #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) @@ -124,4 +132,4 @@ #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) Index: vhDeploy/WV/Deploy20120208ICTUserFromIP.cls.xml =================================================================== diff -u --- vhDeploy/WV/Deploy20120208ICTUserFromIP.cls.xml (revision 0) +++ vhDeploy/WV/Deploy20120208ICTUserFromIP.cls.xml (revision 4568) @@ -0,0 +1,40 @@ + + + + +1 +svn.Deploy + + +%String +Compileren van code met macro $$$IctUserFromIP + + + +1 +0) { + Write "Errors bij het compileren van de code : ",! + Write $$ArrayToText^vhLib("Errors",.Errors),! + Write ! + Write "Gelieve deze items manueel te compileren: ",! + Write LijstClassesEnRoutines,!,! + } + Else { + Write "De items zijn succesvol gecompileerd." + } +]]> + + + + +