From bcb93e62d4c937b74518e1c689eefdbd317c5c1e Mon Sep 17 00:00:00 2001 From: allan Date: Mon, 9 Jun 2025 20:58:05 +0100 Subject: [PATCH 1/2] fix: ensuring acceptable casing of _omitSessionResults More info: https://communities.sas.com/t5/SAS-Viya/Returning-webout-from-JES-API/td-p/966992 --- viya/mv_getjoblog.sas | 4 ++-- viya/mv_jobflow.sas | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/viya/mv_getjoblog.sas b/viya/mv_getjoblog.sas index 5e7d1a9..eb20ef4 100644 --- a/viya/mv_getjoblog.sas +++ b/viya/mv_getjoblog.sas @@ -126,7 +126,7 @@ data _null_; uri=symget('uri'); if length(uri)<12 then do; call symputx('errflg',1); - call symputx('errmsg',"URI is invalid (too short) - '&uri'",'l'); + call symputx('errmsg',"URI is too short - "!!uri,'l'); end; if scan(uri,-1)='state' or scan(uri,1) ne 'jobExecution' then do; call symputx('errflg',1); @@ -191,7 +191,7 @@ data _null_; uri=symget('loglocation'); if length(uri)<12 then do; call symputx('errflg',1); - call symputx('errmsg',"URI is invalid (too short) - '&uri'",'l'); + call symputx('errmsg',"URI is too short - "!!uri,'l'); end; else if (scan(uri,1,'/') ne 'compute' or scan(uri,2,'/') ne 'sessions') and (scan(uri,1,'/') ne 'files' or scan(uri,2,'/') ne 'files') diff --git a/viya/mv_jobflow.sas b/viya/mv_jobflow.sas index 806f110..9846fb2 100644 --- a/viya/mv_jobflow.sas +++ b/viya/mv_jobflow.sas @@ -188,6 +188,8 @@ %if %mf_existvarList(&inds,FLOW_ID)=0 %then %do; retain FLOW_ID 0; %end; + /* https://github.com/sasjs/adapter/pull/845#issuecomment-2956589644 */ + retain _omitSessionResults "false"; set &inds; &dbg. putlog (_all_)(=); run; From 909fef714339a25bcdfdb2427c1519ede55e9ef3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 9 Jun 2025 19:58:31 +0000 Subject: [PATCH 2/2] chore: updating all.sas --- all.sas | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/all.sas b/all.sas index f6728dc..3838e5e 100644 --- a/all.sas +++ b/all.sas @@ -27280,7 +27280,7 @@ data _null_; uri=symget('uri'); if length(uri)<12 then do; call symputx('errflg',1); - call symputx('errmsg',"URI is invalid (too short) - '&uri'",'l'); + call symputx('errmsg',"URI is too short - "!!uri,'l'); end; if scan(uri,-1)='state' or scan(uri,1) ne 'jobExecution' then do; call symputx('errflg',1); @@ -27345,7 +27345,7 @@ data _null_; uri=symget('loglocation'); if length(uri)<12 then do; call symputx('errflg',1); - call symputx('errmsg',"URI is invalid (too short) - '&uri'",'l'); + call symputx('errmsg',"URI is too short - "!!uri,'l'); end; else if (scan(uri,1,'/') ne 'compute' or scan(uri,2,'/') ne 'sessions') and (scan(uri,1,'/') ne 'files' or scan(uri,2,'/') ne 'files') @@ -28433,6 +28433,8 @@ run; %if %mf_existvarList(&inds,FLOW_ID)=0 %then %do; retain FLOW_ID 0; %end; + /* https://github.com/sasjs/adapter/pull/845#issuecomment-2956589644 */ + retain _omitSessionResults "false"; set &inds; &dbg. putlog (_all_)(=); run;