chore: updating all.sas

Issue400

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-custom: https://getalby.com/p/sasjs

.gitpod.dockerfile

@@ -1,6 +0,0 @@
-FROM gitpod/workspace-full
-
-RUN sudo apt-get update \
- && sudo apt-get install -y doxygen \
- && sudo apt-get install -y graphviz \
- && sudo rm -rf /var/lib/apt/lists/*

.gitpod.yml

@@ -1,27 +0,0 @@
-tasks:
-  - init: npm install -g npm
-  - command: npm i
-  - command: npm i -g @sasjs/cli
-
-image:
-  file: .gitpod.dockerfile
-vscode:
-  extensions:
-    - sasjs.sasjs-for-vscode
-
-github:
-  prebuilds:
-    # enable for the master/default branch (defaults to true)
-    master: true
-    # enable for all branches in this repo (defaults to false)
-    branches: false
-    # enable for pull requests coming from this repo (defaults to true)
-    pullRequests: true
-    # enable for pull requests coming from forks (defaults to false)
-    pullRequestsFromForks: true
-    # add a "Review in Gitpod" button as a comment to pull requests (defaults to true)
-    addComment: true
-    # add a "Review in Gitpod" button to pull requests (defaults to false)
-    addBadge: false
-    # add a label once the prebuild is ready to pull requests (defaults to false)
-    addLabel: prebuilt-in-gitpod

README.md

@@ -1,19 +1,12 @@
 # Macro Core
-[![npm package][npm-image]][npm-url]
-[![Github Workflow][githubworkflow-image]][githubworkflow-url]
+
+[![npm package](https://img.shields.io/npm/v/@sasjs/core.svg)](http://npmjs.org/package/@sasjs/core)
+[![Github Workflow](https://github.com/sasjs/core/actions/workflows/main.yml/badge.svg)](https://github.com/sasjs/core/blob/main/.github/workflows/main.yml)
 ![npm](https://img.shields.io/npm/dt/@sasjs/core)
 ![GitHub top language](https://img.shields.io/github/languages/top/sasjs/core)
 [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/sasjs/core)](https://github.com/sasjs/core/issues?q=is%3Aissue+is%3Aclosed)
 [![GitHub issues](https://img.shields.io/github/issues-raw/sasjs/core)](https://github.com/sasjs/core/issues)
 ![total lines](https://tokei.rs/b1/github/sasjs/core)
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/sasjs/core)
-
-
-[npm-image]:https://img.shields.io/npm/v/@sasjs/core.svg
-[npm-url]:http://npmjs.org/package/@sasjs/core
-[githubworkflow-image]:https://github.com/sasjs/core/actions/workflows/main.yml/badge.svg
-[githubworkflow-url]:https://github.com/sasjs/core/blob/main/.github/workflows/main.yml
-[dependency-url]:https://github.com/sasjs/core/blob/main/package.json
 
 
 Much quality. Many standards. The **Macro Core** library exists to save time and development effort! Herein ye shall find a veritable host of MIT-licenced, production quality SAS macros. These are a mix of tools, utilities, functions and code generators that are useful in the context of [Application Development](https://sasapps.io) on the SAS platform (eg https://datacontroller.io). [Contributions](https://github.com/sasjs/core/blob/main/.github/CONTRIBUTING.md) are welcome.

all.sas

@@ -1121,7 +1121,7 @@ or %index(&pgm,/tests/testteardown)
   @author Allan Bowe
 **/
 
-%macro mf_getuniquelibref(prefix=mclib,maxtries=1000);
+%macro mf_getuniquelibref(prefix=mc,maxtries=1000);
   %local x;
 
   %if ( %length(&prefix) gt 7 ) %then %do;
@@ -11943,7 +11943,7 @@ data _null_;
 run;
 
 /* END */
-%put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) seconds to run;
+/* %put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) secs to run; */
 
 %mend mp_replace;
 /**
@@ -24098,18 +24098,25 @@ run;
     msg=Cannot enter mfv_existfolder.sas with syscc=&syscc
   )
 
-  %local fref rc;
+  %local fref rc var;
   %let fref=%mf_getuniquefileref();
 
   %if %sysfunc(filename(fref,,filesrvc,folderPath="&path"))=0 %then %do;
     1
+    %let var=_FILESRVC_&fref._URI;
     %let rc=%sysfunc(filename(fref));
+    %symdel &var;
   %end;
   %else %do;
     0
     %let syscc=0;
   %end;
 
+  %mf_abort(
+    iftrue=(&syscc ne 0),
+    msg=Cannot leave mfv_existfolder.sas with syscc=&syscc
+  )
+
 %mend mfv_existfolder;/**
   @file mfv_existsashdat.sas
   @brief Checks whether a CAS sashdat dataset exists in persistent storage.
@@ -24171,6 +24178,58 @@ run;
 
 %mend mfv_existsashdat;
 /**
+  @file
+  @brief Returns the path of a folder from the URI
+  @details Makes use of the SYSMSG() ER8OR response, which resolves the uri,
+  seemingly without entering an er8or state.
+
+  Usage:
+
+      %mv_createfolder(path=/public/demo)
+      %let uri=%mfv_getpathuri(/public/demo);
+      %put %mfv_getfolderpath(&uri);
+
+  Notice above the new path has an uppercase P - the correct path.
+
+  @param [in] uri The uri of the folder -eg /folders/folders/xxxx)
+
+  <h4> SAS Macros </h4>
+  @li mf_getuniquefileref.sas
+
+  <h4> Related Macros </h4>
+  @li mfv_getpathuri.sas
+
+  @version 4
+  @author [Allan Bowe](https://www.linkedin.com/in/allanbowe/)
+**/
+%macro mfv_getfolderpath(uri
+)/*/STORE SOURCE*/;
+
+  %local fref rc path msg var /* var used to avoid delete timing issue */;
+  %let fref=%mf_getuniquefileref();
+  %if %quote(%substr(%str(&uri),1,17)) ne %quote(/folders/folders/)
+  %then %do;
+    %put &sysmacroname: Invalid URI: &uri;
+  %end;
+  %else %if %sysfunc(filename(fref,,filesrvc,folderuri="&uri" ))=0
+  %then %do;
+    %let var=_FILESRVC_&fref._URI;
+    %local fid ;
+    %let fid= %sysfunc(fopen(&fref,I));
+    %let msg=%quote(%sysfunc(sysmsg()));
+
+    %unquote(%scan(&msg,2,%str(,.)))
+
+    %let rc=%sysfunc(fclose(&fid));
+    %let rc=%sysfunc(filename(fref));
+    %symdel &var;
+  %end;
+  %else %do;
+    %put &sysmacroname: Not Found: &uri;
+    %let syscc=0;
+  %end;
+
+%mend mfv_getfolderpath ;/**
   @file
   @brief Returns the uri of a file or folder
   @details The automatic variable `_FILESRVC_[fref]_URI` is used after assigning
@@ -24221,6 +24280,10 @@ run;
     %let syscc=0;
   %end;
 
+  %mf_abort(
+    iftrue=(&syscc ne 0),
+    msg=Cannot leave &sysmacroname with syscc=&syscc
+  )
 %mend mfv_getpathuri;/**
   @file
   @brief Creates a file in SAS Drive using the API method
@@ -24318,6 +24381,11 @@ run;
 %end;
 %else %let dbg=*;
 
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot enter &sysmacroname with syscc=&syscc
+)
+
 %local oauth_bearer;
 %if &grant_type=detect %then %do;
   %if %symexist(&access_token_var) %then %let grant_type=authorization_code;
@@ -24395,6 +24463,11 @@ run;
   ,mac=MV_CREATEFILE
   ,msg=%str(File &path/&name already exists and force=&force)
 )
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  mac=MV_CREATEFILE182
+  msg=syscc=&syscc after mfv_getpathuri
+)
 
 %if %mf_isblank(&fileuri)=0 and &force=YES %then %do;
   proc http method="DELETE" url="&base_uri&fileuri" &oauth_bearer;
@@ -24425,7 +24498,8 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref
   %else %do;
     ct="&ctype"
   %end;
-  %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="SVG" %then %do;
+  %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG"
+  or "&ext"="SVG" %then %do;
     url="&url%str(&)typeDefName=file";
   %end;
   %else %do;
@@ -24437,7 +24511,7 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref
     "Authorization"="Bearer &&&access_token_var"
   %end;
   "Content-Disposition"=
-  %if "&ext"="SVG" %then %do;
+  %if "&ext"="SVG" or "&ext"="HTML" %then %do;
     "filename=""&name"";"
   %end;
   %else %do;
@@ -24463,8 +24537,20 @@ data &outds;
   end;
 run;
 
-%put &sysmacroname: &name created at %mfv_getpathuri(&path/&name);%put;
-%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+%put &sysmacroname: %trim(&base_uri)%mfv_getpathuri(&path/&name);
+%put /SASJobExecution?_file=&path/&name;%put;
+
+%if &mdebug=0 %then %do;
+  /* clear refs */
+  filename &fname1 clear;
+  filename &fref clear;
+  libname &libref2 clear;
+%end;
+
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot leave &sysmacroname with syscc=&syscc
+)
 
 %mend mv_createfile;/**
   @file mv_createfolder.sas
@@ -24514,6 +24600,11 @@ run;
 %end;
 %else %let dbg=*;
 
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot enter &sysmacroname with syscc=&syscc
+)
+
 %if %mfv_existfolder(&path)=1 %then %do;
   %&dbg.put &sysmacroname: &path already exists;
   data &outds;
@@ -24523,6 +24614,7 @@ run;
   run;
   %return;
 %end;
+%mp_abort(iftrue=(&syscc ne 0),msg=syscc=&syscc when folder checking)
 
 %local oauth_bearer;
 %if &grant_type=detect %then %do;
@@ -24576,6 +24668,17 @@ options noquotelenmax;
       headers "Authorization"="Bearer &&&access_token_var";
   %end;
   run;
+  %if &SYS_PROCHTTP_STATUS_CODE=401 %then %do;
+    /* relates to: https://github.com/sasjs/core/issues/400 */
+    %put 401 thrown in &sysmacroname;
+    %put sleeping: %sysfunc(sleep(12,1)) secs - will try again;
+    proc http method='GET' out=&fname1 &oauth_bearer
+        url="&base_uri/folders/folders/@item?path=&newpath";
+    %if &grant_type=authorization_code %then %do;
+        headers "Authorization"="Bearer &&&access_token_var";
+    %end;
+    run;
+  %end;
   %local libref1;
   %let libref1=%mf_getuniquelibref();
   libname &libref1 JSON fileref=&fname1;
@@ -24583,7 +24686,7 @@ options noquotelenmax;
     iftrue=(
       &SYS_PROCHTTP_STATUS_CODE ne 200 and &SYS_PROCHTTP_STATUS_CODE ne 404
     )
-    ,mac=&sysmacroname
+    ,mac=mv_createfolder124
     ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
   )
   %if &mdebug=1 %then %do;
@@ -24632,7 +24735,7 @@ options noquotelenmax;
                 'Content-Type'='application/vnd.sas.content.folder+json'
                 'Accept'='application/vnd.sas.content.folder+json';
     run;
-    %if &SYS_PROCHTTP_STATUS_CODE ne 200 %then %do;
+    %if &SYS_PROCHTTP_STATUS_CODE ne 201 %then %do;
       %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
     %end;
     %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 201)
@@ -24662,6 +24765,10 @@ options noquotelenmax;
   filename &fname1 clear;
   libname &libref1 clear;
 %end;
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot leave &sysmacroname with syscc=&syscc
+)
 %mend mv_createfolder;/**
   @file
   @brief Creates a Viya Job
@@ -27227,7 +27334,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);
@@ -27292,7 +27399,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')
@@ -28380,6 +28487,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;

base/mf_getuniquelibref.sas

@@ -26,7 +26,7 @@
   @author Allan Bowe
 **/
 
-%macro mf_getuniquelibref(prefix=mclib,maxtries=1000);
+%macro mf_getuniquelibref(prefix=mc,maxtries=1000);
   %local x;
 
   %if ( %length(&prefix) gt 7 ) %then %do;

base/mp_replace.sas

@@ -148,6 +148,6 @@ data _null_;
 run;
 
 /* END */
-%put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) seconds to run;
+/* %put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) secs to run; */
 
 %mend mp_replace;

tests/viyaonly/mfv_getfolderpath.test.sas

@@ -0,0 +1,31 @@
+/**
+  @file
+  @brief Testing mfv_getfolderpath macro function
+
+  <h4> SAS Macros </h4>
+  @li mf_uid.sas
+  @li mfv_getfolderpath.sas
+  @li mfv_getpathuri.sas
+  @li mp_assert.sas
+  @li mv_createfolder.sas
+
+**/
+
+options mprint sgen;
+
+%let folder=%mf_uid();
+/* create a folder */
+%mv_createfolder(path=&mcTestAppLoc/&folder)
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=no errs on folder creation
+)
+
+%let uri=%mfv_getpathuri(&mcTestAppLoc/&folder);
+%put %mfv_getfolderpath(&uri);
+
+%mp_assert(
+  iftrue=("%mfv_getfolderpath(&uri)"="&mcTestAppLoc/&folder"),
+  desc=Check if correct folder was returned
+)
+

tests/viyaonly/mfv_getpathuri.test.sas

@@ -14,7 +14,7 @@ options mprint sgen;
 
 %let file=%mf_uid();
 
-/* create a folder */
+/* create a file */
 filename somefile temp;
 data _null_;
   file somefile;

viya/mfv_existfolder.sas

@@ -33,16 +33,23 @@
     msg=Cannot enter mfv_existfolder.sas with syscc=&syscc
   )
 
-  %local fref rc;
+  %local fref rc var;
   %let fref=%mf_getuniquefileref();
 
   %if %sysfunc(filename(fref,,filesrvc,folderPath="&path"))=0 %then %do;
     1
+    %let var=_FILESRVC_&fref._URI;
     %let rc=%sysfunc(filename(fref));
+    %symdel &var;
   %end;
   %else %do;
     0
     %let syscc=0;
   %end;
 
+  %mf_abort(
+    iftrue=(&syscc ne 0),
+    msg=Cannot leave mfv_existfolder.sas with syscc=&syscc
+  )
+
 %mend mfv_existfolder;

viya/mfv_getfolderpath.sas

@@ -0,0 +1,53 @@
+/**
+  @file
+  @brief Returns the path of a folder from the URI
+  @details Makes use of the SYSMSG() ER8OR response, which resolves the uri,
+  seemingly without entering an er8or state.
+
+  Usage:
+
+      %mv_createfolder(path=/public/demo)
+      %let uri=%mfv_getpathuri(/public/demo);
+      %put %mfv_getfolderpath(&uri);
+
+  Notice above the new path has an uppercase P - the correct path.
+
+  @param [in] uri The uri of the folder -eg /folders/folders/xxxx)
+
+  <h4> SAS Macros </h4>
+  @li mf_getuniquefileref.sas
+
+  <h4> Related Macros </h4>
+  @li mfv_getpathuri.sas
+
+  @version 4
+  @author [Allan Bowe](https://www.linkedin.com/in/allanbowe/)
+**/
+%macro mfv_getfolderpath(uri
+)/*/STORE SOURCE*/;
+
+  %local fref rc path msg var /* var used to avoid delete timing issue */;
+  %let fref=%mf_getuniquefileref();
+  %if %quote(%substr(%str(&uri),1,17)) ne %quote(/folders/folders/)
+  %then %do;
+    %put &sysmacroname: Invalid URI: &uri;
+  %end;
+  %else %if %sysfunc(filename(fref,,filesrvc,folderuri="&uri" ))=0
+  %then %do;
+    %let var=_FILESRVC_&fref._URI;
+    %local fid ;
+    %let fid= %sysfunc(fopen(&fref,I));
+    %let msg=%quote(%sysfunc(sysmsg()));
+
+    %unquote(%scan(&msg,2,%str(,.)))
+
+    %let rc=%sysfunc(fclose(&fid));
+    %let rc=%sysfunc(filename(fref));
+    %symdel &var;
+  %end;
+  %else %do;
+    %put &sysmacroname: Not Found: &uri;
+    %let syscc=0;
+  %end;
+
+%mend mfv_getfolderpath ;

viya/mfv_getpathuri.sas

@@ -49,4 +49,8 @@
     %let syscc=0;
   %end;
 
+  %mf_abort(
+    iftrue=(&syscc ne 0),
+    msg=Cannot leave &sysmacroname with syscc=&syscc
+  )
 %mend mfv_getpathuri;

viya/mv_createfile.sas

@@ -95,6 +95,11 @@
 %end;
 %else %let dbg=*;
 
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot enter &sysmacroname with syscc=&syscc
+)
+
 %local oauth_bearer;
 %if &grant_type=detect %then %do;
   %if %symexist(&access_token_var) %then %let grant_type=authorization_code;
@@ -172,6 +177,11 @@ run;
   ,mac=MV_CREATEFILE
   ,msg=%str(File &path/&name already exists and force=&force)
 )
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  mac=MV_CREATEFILE182
+  msg=syscc=&syscc after mfv_getpathuri
+)
 
 %if %mf_isblank(&fileuri)=0 and &force=YES %then %do;
   proc http method="DELETE" url="&base_uri&fileuri" &oauth_bearer;
@@ -202,7 +212,8 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref
   %else %do;
     ct="&ctype"
   %end;
-  %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="SVG" %then %do;
+  %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG"
+  or "&ext"="SVG" %then %do;
     url="&url%str(&)typeDefName=file";
   %end;
   %else %do;
@@ -214,7 +225,7 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref
     "Authorization"="Bearer &&&access_token_var"
   %end;
   "Content-Disposition"=
-  %if "&ext"="SVG" %then %do;
+  %if "&ext"="SVG" or "&ext"="HTML" %then %do;
     "filename=""&name"";"
   %end;
   %else %do;
@@ -240,7 +251,19 @@ data &outds;
   end;
 run;
 
-%put &sysmacroname: &name created at %mfv_getpathuri(&path/&name);%put;
-%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+%put &sysmacroname: %trim(&base_uri)%mfv_getpathuri(&path/&name);
+%put /SASJobExecution?_file=&path/&name;%put;
+
+%if &mdebug=0 %then %do;
+  /* clear refs */
+  filename &fname1 clear;
+  filename &fref clear;
+  libname &libref2 clear;
+%end;
+
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot leave &sysmacroname with syscc=&syscc
+)
 
 %mend mv_createfile;

viya/mv_createfolder.sas

@@ -46,6 +46,11 @@
 %end;
 %else %let dbg=*;
 
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot enter &sysmacroname with syscc=&syscc
+)
+
 %if %mfv_existfolder(&path)=1 %then %do;
   %&dbg.put &sysmacroname: &path already exists;
   data &outds;
@@ -55,6 +60,7 @@
   run;
   %return;
 %end;
+%mp_abort(iftrue=(&syscc ne 0),msg=syscc=&syscc when folder checking)
 
 %local oauth_bearer;
 %if &grant_type=detect %then %do;
@@ -108,6 +114,17 @@ options noquotelenmax;
       headers "Authorization"="Bearer &&&access_token_var";
   %end;
   run;
+  %if &SYS_PROCHTTP_STATUS_CODE=401 %then %do;
+    /* relates to: https://github.com/sasjs/core/issues/400 */
+    %put 401 thrown in &sysmacroname;
+    %put sleeping: %sysfunc(sleep(12,1)) secs - will try again;
+    proc http method='GET' out=&fname1 &oauth_bearer
+        url="&base_uri/folders/folders/@item?path=&newpath";
+    %if &grant_type=authorization_code %then %do;
+        headers "Authorization"="Bearer &&&access_token_var";
+    %end;
+    run;
+  %end;
   %local libref1;
   %let libref1=%mf_getuniquelibref();
   libname &libref1 JSON fileref=&fname1;
@@ -115,7 +132,7 @@ options noquotelenmax;
     iftrue=(
       &SYS_PROCHTTP_STATUS_CODE ne 200 and &SYS_PROCHTTP_STATUS_CODE ne 404
     )
-    ,mac=&sysmacroname
+    ,mac=mv_createfolder124
     ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
   )
   %if &mdebug=1 %then %do;
@@ -164,7 +181,7 @@ options noquotelenmax;
                 'Content-Type'='application/vnd.sas.content.folder+json'
                 'Accept'='application/vnd.sas.content.folder+json';
     run;
-    %if &SYS_PROCHTTP_STATUS_CODE ne 200 %then %do;
+    %if &SYS_PROCHTTP_STATUS_CODE ne 201 %then %do;
       %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
     %end;
     %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 201)
@@ -194,4 +211,8 @@ options noquotelenmax;
   filename &fname1 clear;
   libname &libref1 clear;
 %end;
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot leave &sysmacroname with syscc=&syscc
+)
 %mend mv_createfolder;

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')

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;