diff --git a/all.sas b/all.sas index 0c6100b..6b05f3d 100644 --- a/all.sas +++ b/all.sas @@ -15161,14 +15161,16 @@ data _null_; put ' put '',"_METAPERSON": '' _METAPERSON; '; put ' put '',"_PROGRAM" : '' _PROGRAM ; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; - put ' put ",""SYSERRORTEXT"" : ""&syserrortext"" "; '; + put ' syserrortext=quote(cats(symget(''SYSERRORTEXT''))); '; + put ' put '',"SYSERRORTEXT" : '' syserrortext; '; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; - put ' put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; '; + put ' syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); '; + put ' put '',"SYSWARNINGTEXT" : '' syswarningtext; '; put ' put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; '; put ' length memsize $32; '; put ' memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; '; @@ -18698,14 +18700,16 @@ run; put ',"_METAPERSON": ' _METAPERSON; put ',"_PROGRAM" : ' _PROGRAM ; put ",""SYSCC"" : ""&syscc"" "; - put ",""SYSERRORTEXT"" : ""&syserrortext"" "; + syserrortext=quote(cats(symget('SYSERRORTEXT'))); + put ',"SYSERRORTEXT" : ' syserrortext; put ",""SYSHOSTNAME"" : ""&syshostname"" "; put ",""SYSJOBID"" : ""&sysjobid"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; - put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; + syswarningtext=quote(cats(symget('SYSWARNINGTEXT'))); + put ',"SYSWARNINGTEXT" : ' syswarningtext; put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" '; length memsize $32; memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; @@ -19301,7 +19305,8 @@ run; put ",""_DEBUG"" : ""&_debug"" "; put ',"_PROGRAM" : ' _PROGRAM ; put ",""SYSCC"" : ""&syscc"" "; - put ",""SYSERRORTEXT"" : ""&syserrortext"" "; + syserrortext=quote(cats(symget('SYSERRORTEXT'))); + put ',"SYSERRORTEXT" : ' syserrortext; SYSHOSTINFOLONG=quote(trim(symget('SYSHOSTINFOLONG'))); put ',"SYSHOSTINFOLONG" : ' SYSHOSTINFOLONG; put ",""SYSHOSTNAME"" : ""&syshostname"" "; @@ -19316,7 +19321,8 @@ run; put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; - put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; + syswarningtext=quote(cats(symget('SYSWARNINGTEXT'))); + put ',"SYSWARNINGTEXT" : ' syswarningtext; put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" '; length autoexec $512; autoexec=quote(urlencode(trim(getoption('autoexec')))); @@ -20672,13 +20678,15 @@ data _null_; put ' put ",""_DEBUG"" : ""&_debug"" "; '; put ' put '',"_PROGRAM" : '' _PROGRAM ; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; - put ' put ",""SYSERRORTEXT"" : ""&syserrortext"" "; '; + put ' syserrortext=quote(cats(symget(''SYSERRORTEXT''))); '; + put ' put '',"SYSERRORTEXT" : '' syserrortext; '; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; - put ' put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; '; + put ' syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); '; + put ' put '',"SYSWARNINGTEXT" : '' syswarningtext; '; put ' put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; '; put ' length memsize $32; '; put ' memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; '; @@ -24479,13 +24487,15 @@ filename &fref1 clear; put ",""_DEBUG"" : ""&_debug"" "; put ',"_PROGRAM" : ' _PROGRAM ; put ",""SYSCC"" : ""&syscc"" "; - put ",""SYSERRORTEXT"" : ""&syserrortext"" "; + syserrortext=quote(cats(symget('SYSERRORTEXT'))); + put ',"SYSERRORTEXT" : ' syserrortext; put ",""SYSHOSTNAME"" : ""&syshostname"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; - put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; + syswarningtext=quote(cats(symget('SYSWARNINGTEXT'))); + put ',"SYSWARNINGTEXT" : ' syswarningtext; put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" '; length memsize $32; memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; diff --git a/meta/mm_createwebservice.sas b/meta/mm_createwebservice.sas index 17d4e2d..2687578 100644 --- a/meta/mm_createwebservice.sas +++ b/meta/mm_createwebservice.sas @@ -428,14 +428,16 @@ data _null_; put ' put '',"_METAPERSON": '' _METAPERSON; '; put ' put '',"_PROGRAM" : '' _PROGRAM ; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; - put ' put ",""SYSERRORTEXT"" : ""&syserrortext"" "; '; + put ' syserrortext=quote(cats(symget(''SYSERRORTEXT''))); '; + put ' put '',"SYSERRORTEXT" : '' syserrortext; '; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; put ' put ",""SYSJOBID"" : ""&sysjobid"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; - put ' put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; '; + put ' syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); '; + put ' put '',"SYSWARNINGTEXT" : '' syswarningtext; '; put ' put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; '; put ' length memsize $32; '; put ' memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; '; diff --git a/meta/mm_webout.sas b/meta/mm_webout.sas index e50cbde..61395fd 100644 --- a/meta/mm_webout.sas +++ b/meta/mm_webout.sas @@ -157,14 +157,16 @@ put ',"_METAPERSON": ' _METAPERSON; put ',"_PROGRAM" : ' _PROGRAM ; put ",""SYSCC"" : ""&syscc"" "; - put ",""SYSERRORTEXT"" : ""&syserrortext"" "; + syserrortext=quote(cats(symget('SYSERRORTEXT'))); + put ',"SYSERRORTEXT" : ' syserrortext; put ",""SYSHOSTNAME"" : ""&syshostname"" "; put ",""SYSJOBID"" : ""&sysjobid"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; - put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; + syswarningtext=quote(cats(symget('SYSWARNINGTEXT'))); + put ',"SYSWARNINGTEXT" : ' syswarningtext; put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" '; length memsize $32; memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; diff --git a/package-lock.json b/package-lock.json index 3775dc7..b1f17fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "@sasjs/core": "^4.18.13" }, "devDependencies": { - "@sasjs/cli": "^3.13.0" + "@sasjs/cli": "3.13.0" } }, "node_modules/@coolaj86/urequest": { diff --git a/package.json b/package.json index c46f88d..3f2ff4e 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true" }, "devDependencies": { - "@sasjs/cli": "^3.13.0" + "@sasjs/cli": "3.13.0" }, "dependencies": { "@sasjs/core": "^4.18.13" diff --git a/server/ms_webout.sas b/server/ms_webout.sas index 1a3d52a..e9a31da 100644 --- a/server/ms_webout.sas +++ b/server/ms_webout.sas @@ -147,7 +147,8 @@ put ",""_DEBUG"" : ""&_debug"" "; put ',"_PROGRAM" : ' _PROGRAM ; put ",""SYSCC"" : ""&syscc"" "; - put ",""SYSERRORTEXT"" : ""&syserrortext"" "; + syserrortext=quote(cats(symget('SYSERRORTEXT'))); + put ',"SYSERRORTEXT" : ' syserrortext; SYSHOSTINFOLONG=quote(trim(symget('SYSHOSTINFOLONG'))); put ',"SYSHOSTINFOLONG" : ' SYSHOSTINFOLONG; put ",""SYSHOSTNAME"" : ""&syshostname"" "; @@ -162,7 +163,8 @@ put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; - put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; + syswarningtext=quote(cats(symget('SYSWARNINGTEXT'))); + put ',"SYSWARNINGTEXT" : ' syswarningtext; put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" '; length autoexec $512; autoexec=quote(urlencode(trim(getoption('autoexec')))); diff --git a/viya/mv_createwebservice.sas b/viya/mv_createwebservice.sas index 17b079b..f7ab88f 100644 --- a/viya/mv_createwebservice.sas +++ b/viya/mv_createwebservice.sas @@ -605,13 +605,15 @@ data _null_; put ' put ",""_DEBUG"" : ""&_debug"" "; '; put ' put '',"_PROGRAM" : '' _PROGRAM ; '; put ' put ",""SYSCC"" : ""&syscc"" "; '; - put ' put ",""SYSERRORTEXT"" : ""&syserrortext"" "; '; + put ' syserrortext=quote(cats(symget(''SYSERRORTEXT''))); '; + put ' put '',"SYSERRORTEXT" : '' syserrortext; '; put ' put ",""SYSHOSTNAME"" : ""&syshostname"" "; '; put ' put ",""SYSSCPL"" : ""&sysscpl"" "; '; put ' put ",""SYSSITE"" : ""&syssite"" "; '; put ' sysvlong=quote(trim(symget(''sysvlong''))); '; put ' put '',"SYSVLONG" : '' sysvlong; '; - put ' put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; '; + put ' syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); '; + put ' put '',"SYSWARNINGTEXT" : '' syswarningtext; '; put ' put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; '; put ' length memsize $32; '; put ' memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; '; diff --git a/viya/mv_webout.sas b/viya/mv_webout.sas index 20a81c9..aa67bd9 100644 --- a/viya/mv_webout.sas +++ b/viya/mv_webout.sas @@ -193,13 +193,15 @@ put ",""_DEBUG"" : ""&_debug"" "; put ',"_PROGRAM" : ' _PROGRAM ; put ",""SYSCC"" : ""&syscc"" "; - put ",""SYSERRORTEXT"" : ""&syserrortext"" "; + syserrortext=quote(cats(symget('SYSERRORTEXT'))); + put ',"SYSERRORTEXT" : ' syserrortext; put ",""SYSHOSTNAME"" : ""&syshostname"" "; put ",""SYSSCPL"" : ""&sysscpl"" "; put ",""SYSSITE"" : ""&syssite"" "; sysvlong=quote(trim(symget('sysvlong'))); put ',"SYSVLONG" : ' sysvlong; - put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; + syswarningtext=quote(cats(symget('SYSWARNINGTEXT'))); + put ',"SYSWARNINGTEXT" : ' syswarningtext; put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" '; length memsize $32; memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)";