From 437943b779efe9ec8fd88744c202eb55468cd1bd Mon Sep 17 00:00:00 2001 From: Allan Bowe Date: Mon, 1 Aug 2022 10:40:55 +0000 Subject: [PATCH] fix: adding length statement for SYSWARNINGTEXT. Closes #291 --- all.sas | 80 +++++++++++++++++++++++----------- meta/mm_createwebservice.sas | 13 ++++-- meta/mm_webout.sas | 13 ++++-- server/ms_createwebservice.sas | 13 +++--- server/ms_webout.sas | 13 +++--- viya/mv_createwebservice.sas | 14 ++++-- viya/mv_webout.sas | 14 ++++-- 7 files changed, 108 insertions(+), 52 deletions(-) diff --git a/all.sas b/all.sas index c2a2389..22bba1b 100644 --- a/all.sas +++ b/all.sas @@ -15517,23 +15517,30 @@ data _null_; put ' %end; '; put ' /* close off json */ '; put ' data _null_;file _sjsref mod encoding=''utf-8''; '; - put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; - put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; - put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; + put ' length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; '; put ' put ",""_DEBUG"" : ""&_debug"" "; '; put ' _METAUSER=quote(trim(symget(''_METAUSER''))); '; put ' put ",""_METAUSER"": " _METAUSER; '; put ' _METAPERSON=quote(trim(symget(''_METAPERSON''))); '; put ' put '',"_METAPERSON": '' _METAPERSON; '; + put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; put ' put '',"_PROGRAM" : '' _PROGRAM ; '; + put ' autoexec=quote(urlencode(trim(getoption(''autoexec'')))); '; + put ' put '',"AUTOEXEC" : '' autoexec; '; + put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; put ' put ",""SYSENCODING"" : ""&sysencoding"" "; '; put ' syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); '; put ' put '',"SYSERRORTEXT" : '' syserrortext; '; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; + put ' put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; '; + put ' put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; '; + put ' SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); '; + put ' put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; '; put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; + put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; put ' syswarningtext=cats(''"'',tranwrd(symget(''syswarningtext''),''"'',''\"''),''"''); '; @@ -19079,23 +19086,30 @@ run; %end; /* close off json */ data _null_;file _sjsref mod encoding='utf-8'; - _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); - put ",""SYSUSERID"" : ""&sysuserid"" "; - put ",""MF_GETUSER"" : ""%mf_getuser()"" "; + length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; put ",""_DEBUG"" : ""&_debug"" "; _METAUSER=quote(trim(symget('_METAUSER'))); put ",""_METAUSER"": " _METAUSER; _METAPERSON=quote(trim(symget('_METAPERSON'))); put ',"_METAPERSON": ' _METAPERSON; + _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); put ',"_PROGRAM" : ' _PROGRAM ; + autoexec=quote(urlencode(trim(getoption('autoexec')))); + put ',"AUTOEXEC" : ' autoexec; + put ",""MF_GETUSER"" : ""%mf_getuser()"" "; put ",""SYSCC"" : ""&syscc"" "; put ",""SYSENCODING"" : ""&sysencoding"" "; syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"'); put ',"SYSERRORTEXT" : ' syserrortext; put ",""SYSHOSTNAME"" : ""&syshostname"" "; + put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; + put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; + SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); + put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; put ",""SYSJOBID"" : ""&sysjobid"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; + put ",""SYSUSERID"" : ""&sysuserid"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"'); @@ -20359,11 +20373,13 @@ data _null_; put ' %end; '; put ' /* close off json */ '; put ' data _null_;file &fref mod encoding=''utf-8'' termstr=lf lrecl=32767; '; - put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; - put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; - put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; + put ' length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; '; put ' put ",""_DEBUG"" : ""&_debug"" "; '; + put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; put ' put '',"_PROGRAM" : '' _PROGRAM ; '; + put ' autoexec=quote(urlencode(trim(getoption(''autoexec'')))); '; + put ' put '',"AUTOEXEC" : '' autoexec; '; + put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; put ' put ",""SYSENCODING"" : ""&sysencoding"" "; '; put ' syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); '; @@ -20373,21 +20389,18 @@ data _null_; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; put ' put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; '; put ' put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; '; - put ' length SYSPROCESSNAME $512; '; put ' SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); '; put ' put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; '; put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; put ' put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" "; '; + put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; put ' syswarningtext=cats(''"'',tranwrd(symget(''syswarningtext''),''"'',''\"''),''"''); '; put ' put '',"SYSWARNINGTEXT" : '' syswarningtext; '; put ' put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; '; - put ' length autoexec $512; '; - put ' autoexec=quote(urlencode(trim(getoption(''autoexec'')))); '; - put ' put '',"AUTOEXEC" : '' autoexec; '; put ' length memsize $32; '; put ' memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; '; put ' memsize=quote(cats(memsize)); '; @@ -21350,11 +21363,13 @@ run; %end; /* close off json */ data _null_;file &fref mod encoding='utf-8' termstr=lf lrecl=32767; - _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); - put ",""SYSUSERID"" : ""&sysuserid"" "; - put ",""MF_GETUSER"" : ""%mf_getuser()"" "; + length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; put ",""_DEBUG"" : ""&_debug"" "; + _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); put ',"_PROGRAM" : ' _PROGRAM ; + autoexec=quote(urlencode(trim(getoption('autoexec')))); + put ',"AUTOEXEC" : ' autoexec; + put ",""MF_GETUSER"" : ""%mf_getuser()"" "; put ",""SYSCC"" : ""&syscc"" "; put ",""SYSENCODING"" : ""&sysencoding"" "; syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"'); @@ -21364,21 +21379,18 @@ run; put ",""SYSHOSTNAME"" : ""&syshostname"" "; put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; - length SYSPROCESSNAME $512; SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; put ",""SYSJOBID"" : ""&sysjobid"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" "; + put ",""SYSUSERID"" : ""&sysuserid"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"'); put ',"SYSWARNINGTEXT" : ' syswarningtext; put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" '; - length autoexec $512; - autoexec=quote(urlencode(trim(getoption('autoexec')))); - put ',"AUTOEXEC" : ' autoexec; length memsize $32; memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; memsize=quote(cats(memsize)); @@ -22776,20 +22788,28 @@ data _null_; put ' '; put ' /* close off json */ '; put ' data _null_;file &fref mod; '; + put ' length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; '; + put ' put ",""_DEBUG"" : ""&_debug"" "; '; put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; - put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; + put ' put '',"_PROGRAM" : '' _PROGRAM ; '; + put ' autoexec=quote(urlencode(trim(getoption(''autoexec'')))); '; + put ' put '',"AUTOEXEC" : '' autoexec; '; put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; put ' SYS_JES_JOB_URI=quote(trim(resolve(symget(''SYS_JES_JOB_URI'')))); '; put ' put '',"SYS_JES_JOB_URI" : '' SYS_JES_JOB_URI ; '; put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; - put ' put ",""_DEBUG"" : ""&_debug"" "; '; - put ' put '',"_PROGRAM" : '' _PROGRAM ; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; put ' syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); '; put ' put '',"SYSERRORTEXT" : '' syserrortext; '; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; + put ' put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; '; + put ' put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; '; + put ' SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); '; + put ' put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; '; + put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; + put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; put ' syswarningtext=cats(''"'',tranwrd(symget(''syswarningtext''),''"'',''\"''),''"''); '; @@ -26564,20 +26584,28 @@ filename &fref1 clear; /* close off json */ data _null_;file &fref mod; + length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; + put ",""_DEBUG"" : ""&_debug"" "; _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); - put ",""SYSUSERID"" : ""&sysuserid"" "; + put ',"_PROGRAM" : ' _PROGRAM ; + autoexec=quote(urlencode(trim(getoption('autoexec')))); + put ',"AUTOEXEC" : ' autoexec; put ",""MF_GETUSER"" : ""%mf_getuser()"" "; SYS_JES_JOB_URI=quote(trim(resolve(symget('SYS_JES_JOB_URI')))); put ',"SYS_JES_JOB_URI" : ' SYS_JES_JOB_URI ; put ",""SYSJOBID"" : ""&sysjobid"" "; - put ",""_DEBUG"" : ""&_debug"" "; - put ',"_PROGRAM" : ' _PROGRAM ; put ",""SYSCC"" : ""&syscc"" "; syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"'); put ',"SYSERRORTEXT" : ' syserrortext; put ",""SYSHOSTNAME"" : ""&syshostname"" "; + put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; + put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; + SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); + put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; + put ",""SYSJOBID"" : ""&sysjobid"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; + put ",""SYSUSERID"" : ""&sysuserid"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"'); diff --git a/meta/mm_createwebservice.sas b/meta/mm_createwebservice.sas index ab625d1..d2b9e93 100644 --- a/meta/mm_createwebservice.sas +++ b/meta/mm_createwebservice.sas @@ -477,23 +477,30 @@ data _null_; put ' %end; '; put ' /* close off json */ '; put ' data _null_;file _sjsref mod encoding=''utf-8''; '; - put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; - put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; - put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; + put ' length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; '; put ' put ",""_DEBUG"" : ""&_debug"" "; '; put ' _METAUSER=quote(trim(symget(''_METAUSER''))); '; put ' put ",""_METAUSER"": " _METAUSER; '; put ' _METAPERSON=quote(trim(symget(''_METAPERSON''))); '; put ' put '',"_METAPERSON": '' _METAPERSON; '; + put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; put ' put '',"_PROGRAM" : '' _PROGRAM ; '; + put ' autoexec=quote(urlencode(trim(getoption(''autoexec'')))); '; + put ' put '',"AUTOEXEC" : '' autoexec; '; + put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; put ' put ",""SYSENCODING"" : ""&sysencoding"" "; '; put ' syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); '; put ' put '',"SYSERRORTEXT" : '' syserrortext; '; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; + put ' put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; '; + put ' put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; '; + put ' SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); '; + put ' put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; '; put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; + put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; put ' syswarningtext=cats(''"'',tranwrd(symget(''syswarningtext''),''"'',''\"''),''"''); '; diff --git a/meta/mm_webout.sas b/meta/mm_webout.sas index 984a852..e685e01 100644 --- a/meta/mm_webout.sas +++ b/meta/mm_webout.sas @@ -152,23 +152,30 @@ %end; /* close off json */ data _null_;file _sjsref mod encoding='utf-8'; - _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); - put ",""SYSUSERID"" : ""&sysuserid"" "; - put ",""MF_GETUSER"" : ""%mf_getuser()"" "; + length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; put ",""_DEBUG"" : ""&_debug"" "; _METAUSER=quote(trim(symget('_METAUSER'))); put ",""_METAUSER"": " _METAUSER; _METAPERSON=quote(trim(symget('_METAPERSON'))); put ',"_METAPERSON": ' _METAPERSON; + _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); put ',"_PROGRAM" : ' _PROGRAM ; + autoexec=quote(urlencode(trim(getoption('autoexec')))); + put ',"AUTOEXEC" : ' autoexec; + put ",""MF_GETUSER"" : ""%mf_getuser()"" "; put ",""SYSCC"" : ""&syscc"" "; put ",""SYSENCODING"" : ""&sysencoding"" "; syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"'); put ',"SYSERRORTEXT" : ' syserrortext; put ",""SYSHOSTNAME"" : ""&syshostname"" "; + put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; + put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; + SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); + put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; put ",""SYSJOBID"" : ""&sysjobid"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; + put ",""SYSUSERID"" : ""&sysuserid"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"'); diff --git a/server/ms_createwebservice.sas b/server/ms_createwebservice.sas index 50fe4fc..0eba956 100644 --- a/server/ms_createwebservice.sas +++ b/server/ms_createwebservice.sas @@ -470,11 +470,13 @@ data _null_; put ' %end; '; put ' /* close off json */ '; put ' data _null_;file &fref mod encoding=''utf-8'' termstr=lf lrecl=32767; '; - put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; - put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; - put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; + put ' length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; '; put ' put ",""_DEBUG"" : ""&_debug"" "; '; + put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; put ' put '',"_PROGRAM" : '' _PROGRAM ; '; + put ' autoexec=quote(urlencode(trim(getoption(''autoexec'')))); '; + put ' put '',"AUTOEXEC" : '' autoexec; '; + put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; put ' put ",""SYSENCODING"" : ""&sysencoding"" "; '; put ' syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); '; @@ -484,21 +486,18 @@ data _null_; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; put ' put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; '; put ' put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; '; - put ' length SYSPROCESSNAME $512; '; put ' SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); '; put ' put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; '; put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; put ' put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" "; '; + put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; put ' syswarningtext=cats(''"'',tranwrd(symget(''syswarningtext''),''"'',''\"''),''"''); '; put ' put '',"SYSWARNINGTEXT" : '' syswarningtext; '; put ' put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; '; - put ' length autoexec $512; '; - put ' autoexec=quote(urlencode(trim(getoption(''autoexec'')))); '; - put ' put '',"AUTOEXEC" : '' autoexec; '; put ' length memsize $32; '; put ' memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; '; put ' memsize=quote(cats(memsize)); '; diff --git a/server/ms_webout.sas b/server/ms_webout.sas index 70b12c2..8c62275 100644 --- a/server/ms_webout.sas +++ b/server/ms_webout.sas @@ -146,11 +146,13 @@ %end; /* close off json */ data _null_;file &fref mod encoding='utf-8' termstr=lf lrecl=32767; - _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); - put ",""SYSUSERID"" : ""&sysuserid"" "; - put ",""MF_GETUSER"" : ""%mf_getuser()"" "; + length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; put ",""_DEBUG"" : ""&_debug"" "; + _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); put ',"_PROGRAM" : ' _PROGRAM ; + autoexec=quote(urlencode(trim(getoption('autoexec')))); + put ',"AUTOEXEC" : ' autoexec; + put ",""MF_GETUSER"" : ""%mf_getuser()"" "; put ",""SYSCC"" : ""&syscc"" "; put ",""SYSENCODING"" : ""&sysencoding"" "; syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"'); @@ -160,21 +162,18 @@ put ",""SYSHOSTNAME"" : ""&syshostname"" "; put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; - length SYSPROCESSNAME $512; SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; put ",""SYSJOBID"" : ""&sysjobid"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" "; + put ",""SYSUSERID"" : ""&sysuserid"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"'); put ',"SYSWARNINGTEXT" : ' syswarningtext; put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" '; - length autoexec $512; - autoexec=quote(urlencode(trim(getoption('autoexec')))); - put ',"AUTOEXEC" : ' autoexec; length memsize $32; memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; memsize=quote(cats(memsize)); diff --git a/viya/mv_createwebservice.sas b/viya/mv_createwebservice.sas index b4c27d5..4a29af3 100644 --- a/viya/mv_createwebservice.sas +++ b/viya/mv_createwebservice.sas @@ -651,20 +651,28 @@ data _null_; put ' '; put ' /* close off json */ '; put ' data _null_;file &fref mod; '; + put ' length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; '; + put ' put ",""_DEBUG"" : ""&_debug"" "; '; put ' _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); '; - put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; + put ' put '',"_PROGRAM" : '' _PROGRAM ; '; + put ' autoexec=quote(urlencode(trim(getoption(''autoexec'')))); '; + put ' put '',"AUTOEXEC" : '' autoexec; '; put ' put ",""MF_GETUSER"" : ""%mf_getuser()"" "; '; put ' SYS_JES_JOB_URI=quote(trim(resolve(symget(''SYS_JES_JOB_URI'')))); '; put ' put '',"SYS_JES_JOB_URI" : '' SYS_JES_JOB_URI ; '; put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; - put ' put ",""_DEBUG"" : ""&_debug"" "; '; - put ' put '',"_PROGRAM" : '' _PROGRAM ; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; put ' syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); '; put ' put '',"SYSERRORTEXT" : '' syserrortext; '; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; + put ' put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; '; + put ' put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; '; + put ' SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); '; + put ' put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; '; + put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; + put ' put ",""SYSUSERID"" : ""&sysuserid"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; put ' syswarningtext=cats(''"'',tranwrd(symget(''syswarningtext''),''"'',''\"''),''"''); '; diff --git a/viya/mv_webout.sas b/viya/mv_webout.sas index 5457292..c816f73 100644 --- a/viya/mv_webout.sas +++ b/viya/mv_webout.sas @@ -182,20 +182,28 @@ /* close off json */ data _null_;file &fref mod; + length SYSPROCESSNAME syserrortext syswarningtext autoexec $512; + put ",""_DEBUG"" : ""&_debug"" "; _PROGRAM=quote(trim(resolve(symget('_PROGRAM')))); - put ",""SYSUSERID"" : ""&sysuserid"" "; + put ',"_PROGRAM" : ' _PROGRAM ; + autoexec=quote(urlencode(trim(getoption('autoexec')))); + put ',"AUTOEXEC" : ' autoexec; put ",""MF_GETUSER"" : ""%mf_getuser()"" "; SYS_JES_JOB_URI=quote(trim(resolve(symget('SYS_JES_JOB_URI')))); put ',"SYS_JES_JOB_URI" : ' SYS_JES_JOB_URI ; put ",""SYSJOBID"" : ""&sysjobid"" "; - put ",""_DEBUG"" : ""&_debug"" "; - put ',"_PROGRAM" : ' _PROGRAM ; put ",""SYSCC"" : ""&syscc"" "; syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"'); put ',"SYSERRORTEXT" : ' syserrortext; put ",""SYSHOSTNAME"" : ""&syshostname"" "; + put ",""SYSPROCESSID"" : ""&SYSPROCESSID"" "; + put ",""SYSPROCESSMODE"" : ""&SYSPROCESSMODE"" "; + SYSPROCESSNAME=quote(urlencode(cats(SYSPROCESSNAME))); + put ",""SYSPROCESSNAME"" : " SYSPROCESSNAME; + put ",""SYSJOBID"" : ""&sysjobid"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; + put ",""SYSUSERID"" : ""&sysuserid"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"');