chore: updating all.sas

README.md

@@ -1,12 +1,19 @@
 # Macro Core
-
+[![npm package][npm-image]][npm-url]
-[![npm package](https://img.shields.io/npm/v/@sasjs/core.svg)](http://npmjs.org/package/@sasjs/core)
+[![Github Workflow][githubworkflow-image]][githubworkflow-url]
-[![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.
@@ -140,17 +147,16 @@ filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 - macro names must be lowercase
 - one macro per file
 - prefixes:
-  - _mcf__: macro compiled functions (proc fcmp)
+  - _mcf_ for macro compiled functions (proc fcmp)
-  - _mddl__: macros containing DDL (Data Definition Language)
+  - _mddl_ for macros containing DDL (Data Definition Language)
-  - _mf__: macro functions (can be used in open code).
+  - _mf_ for macro functions (can be used in open code).
-  - _mfv__: macro functions that work only in Viya
+  - _ml_ for macros that are used to compile LUA modules
-  - _ml__: macros that are used to compile LUA modules
+  - _mm_ for metadata macros (interface with the metadata server).
-  - _mm__: metadata macros (interface with the metadata server).
+  - _mmx_ for macros that use metadata and are XCMD enabled (working on both windows and unix)
-  - _mmx__: macros that use metadata and are XCMD enabled (working on both windows and unix)
+  - _mp_ for macro procedures (which generate sas code)
-  - _mp__: macro procedures (which generate sas code)
+  - _ms_ for macro procedures that will only work with [@sasjs/server](https://github.com/sasjs/server)
-  - _ms__: macro procedures that will only work with [@sasjs/server](https://github.com/sasjs/server)
+  - _mv_ for macro procedures that will only work in Viya
-  - _mv__: macro procedures that will only work in Viya
+  - _mx_ for macros that work on Viya, SAS 9 EBI and SASjs Server
-  - _mx__: macros that work on Viya, SAS 9 EBI and SASjs Server
 - follow verb-noun convention
 - unix style line endings (lf)
 - individual lines should be no more than 80 characters long
@@ -213,13 +219,12 @@ When contributing to this library, it is therefore important to ensure that all
 
 We are currently on major release v4.  Breaking changes should be marked with the [deprecated](https://www.doxygen.nl/manual/commands.html#cmddeprecated) doxygen tag.  The following changes are planned when the next major/breaking release (v5) becomes necessary:
 
-* mcf_xxx macros to have `insert_cmplib` option deprecated (the option is now checked automatically with value inserted only if needed)
+* mf_getuniquelibref.sas to have the deprecated maxtried parameter removed (no longer needed)
-* mcf_xxx macros to have `wrap=` option defaulted to YES for convenience.  Set this option explicitly to avoid issues.
-* mf_getuniquelibref.sas to have the deprecated maxtries parameter removed (no longer needed)
-* mp_abort.sas will have the redundant type= parameter removed.
-* mp_coretable.sas will be replaced by the standalone macros in the `ddl` folder (which are already available)
-* mp_getddl.sas to be renamed to mp_ds2ddl.sas (consistent with other ds2xxx macros).  A wrapper macro is already in place, and you are able to use this immediately.  The default for SHOWLOG will also be YES instead of NO.
 * mp_testservice.sas to be renamed as mp_execute.sas (as it doesn't actually test anything)
+* `insert_cmplib` option of mcf_xxx macros will be deprecated (the option is now checked automatically with value inserted only if needed)
+* mcf_xxx macros to have `wrap=` option defaulted to YES for convenience.  Set this option explicitly to avoid issues.
+* mp_getddl.sas to be renamed to mp_ds2ddl.sas (consistent with other ds2xxx macros).  A wrapper macro is already in place, and you are able to use this immediately.  The default for SHOWLOG will also be YES instead of NO.
+* mp_coretable.sas will be replaced by the standalone macros in the `ddl` folder (which are already available)
 
 ## Star Gazing
 

all.sas

@@ -1121,7 +1121,7 @@ or %index(&pgm,/tests/testteardown)
   @author Allan Bowe
 **/
 
-%macro mf_getuniquelibref(prefix=mc,maxtries=1000);
+%macro mf_getuniquelibref(prefix=mclib,maxtries=1000);
   %local x;
 
   %if ( %length(&prefix) gt 7 ) %then %do;
@@ -4002,6 +4002,10 @@ run;
   ignorelist=,
   outds=work.test_results
 )/*/STORE SOURCE*/;
+%local ds test_result test_comments del add mod ilist;
+%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE
+  SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist);
+
 /**
   * this sets up the global vars, it will also enter STRICT mode.  If this
   * behaviour is not desired, simply initiate the following global macro
@@ -4009,10 +4013,6 @@ run;
   */
 %mp_init()
 
-%local ds test_result test_comments del add mod ilist;
-%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE
-  SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist);
-
 /* get current variables */
 %if &action=SNAPSHOT %then %do;
   proc sql;
@@ -11828,8 +11828,7 @@ insert into &outds select distinct * from &append_ds;
   LUA, you can also use this macro: mp_gsubfile.sas
 
   @param [in] infile The QUOTED path to the file on which to perform the
-    substitution.  Note that you can extract the pathname from a fileref using
+    substitution
-    the pathname function, eg: `"%sysfunc(pathname(fref))"`;
   @param [in] findvar= Macro variable NAME containing the string to search for
   @param [in] replacevar= Macro variable NAME containing the replacement string
   @param [out] outfile= (0) Optional QUOTED path to the adjusted output file (to
@@ -11943,7 +11942,7 @@ data _null_;
 run;
 
 /* END */
-/* %put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) secs to run; */
+%put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) seconds to run;
 
 %mend mp_replace;
 /**
@@ -24098,25 +24097,18 @@ run;
     msg=Cannot enter mfv_existfolder.sas with syscc=&syscc
   )
 
-  %local fref rc var;
+  %local fref rc;
   %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.
@@ -24178,58 +24170,6 @@ 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
@@ -24280,10 +24220,6 @@ 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
@@ -24303,20 +24239,6 @@ run;
       run;
       %mv_createfile(path=/Public/temp,name=newfile.txt,inref=myfile)
 
-  The macro also supports find & replace (used by the SASjs Streaming App
-  build program).  This allows one string to be replaced by another at the
-  point at which the file is created.  This is done by passing in the NAMES of
-  the macro variables containing the values to be swapped, eg:
-
-      filename fref temp;
-      data _null_;
-        file fref;
-        put 'whenever life gets you down, Mrs Brown..';
-      run;
-      %let f=Mrs Brown;
-      %let r=just remember that you're standing on a planet that's evolving;
-      %mv_createfile(path=/Public,name=life.md,inref=fref,fin,swap=f r)
-
 
   @param [in] path= The parent (SAS Drive) folder in which to create the file
   @param [in] name= The name of the file to be created
@@ -24338,8 +24260,6 @@ run;
     @li sas_services
   @param [in] force= (YES) Will overwrite (delete / recreate) files by default.
     Set to NO to abort if a file already exists in that location.
-  @param pin] swap= (0) Provide two macro variable NAMES that contain the values
-    to be swapped, eg swap=find replace (see also the example above)
   @param [out] outds= (_null_) Output dataset with the uri of the new file
 
   @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
@@ -24353,9 +24273,7 @@ run;
   @li mfv_getpathuri.sas
   @li mp_abort.sas
   @li mp_base64copy.sas
-  @li mp_replace.sas
   @li mv_createfolder.sas
-  @li mv_getviyafileextparms.sas
 
   <h4> Related Macros</h4>
   @li mv_createfile.sas
@@ -24373,7 +24291,6 @@ run;
     ,mdebug=0
     ,outds=_null_
     ,force=YES
-    ,swap=0
   );
 %local dbg;
 %if &mdebug=1 %then %do;
@@ -24382,11 +24299,6 @@ 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;
@@ -24423,12 +24335,6 @@ run;
 %end;
 %else %put %str(ERR)OR: invalid value for intype: &intype;
 
-%if "&swap" ne "0" %then %do;
-  %mp_replace("%sysfunc(pathname(&fref))"
-    ,findvar=%scan(&swap,1,%str( ))
-    ,replacevar=%scan(&swap,2,%str( ))
-  )
-%end;
 
 %if &mdebug=1 %then %do;
   data _null_;
@@ -24440,7 +24346,7 @@ run;
 
 options noquotelenmax;
 %local base_uri; /* location of rest apis */
-%let base_uri=%trim(%mf_getplatform(VIYARESTAPI));
+%let base_uri=%mf_getplatform(VIYARESTAPI);
 
 /* create folder if it does not already exist */
 %local folderds self_uri;
@@ -24459,16 +24365,11 @@ run;
 /* abort or delete if file already exists */
 %let force=%upcase(&force);
 %local fileuri ;
-%let fileuri=%trim(%mfv_getpathuri(&path/&name));
+%let fileuri=%mfv_getpathuri(&path/&name);
 %mp_abort(iftrue=(%mf_isblank(&fileuri)=0 and &force ne YES)
   ,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;
@@ -24478,146 +24379,60 @@ run;
   %end;
         "Accept"="*/*";
   run;
-  %put &sysmacroname DELETE &base_uri&fileuri;
+  %put &sysmacroname DELETE &base_uri&fileuri
-  %if &SYS_PROCHTTP_STATUS_CODE ne 204 %then %do;
+    &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-    %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-  %end;
 %end;
 
-%local url mimetype ext;
+%local url mimetype;
 %let url=&base_uri/files/files?parentFolderUri=&self_uri;
-%let ext=%upcase(%trim(%scan(&name,-1,.)));
-
-/* Get Viya file-extension details into some macro variables */
-%mv_getViyaFileExtParms(&ext
-                        ,propertiesVar=viyaProperties
-                        ,typeDefNameVar=viyaTypeDefName
-                        ,mdebug=&mdebug);
 
 /* fetch job info */
 %local fname1;
 %let fname1=%mf_getuniquefileref();
 proc http method='POST' out=&fname1 &oauth_bearer in=&fref
   %if "&ctype" = "0" %then %do;
-    %let mimetype=%mf_mimetype(&ext);
+    %let mimetype=%mf_mimetype(%scan(&name,-1,.));
     ct="&mimetype"
   %end;
   %else %do;
     ct="&ctype"
   %end;
-
+  %if "&mimetype"="text/html" or "&mimetype"="text/css"
-  /* typeDefName */
+  or "&mimetype"="text/javascript" %then %do;
-  %if not %mf_isBlank(&viyaTypeDefName) %then %do;
+    url="&url%str(&)typeDefName=file";
-    url="&url%str(&)typeDefName=&viyaTypeDefName";
   %end;
   %else %do;
-    %if "&ext"="HTM" or "&ext"="HTML" or "&ext"="XHTML" %then %do;
+    url="&url";
-      url="&url%str(&)typeDefName=file_html";
-    %end;
-    %else %do;
-      %if "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" or "&ext"="SVG" %then %do;
-        url="&url%str(&)typeDefName=file_%lowcase(&ext)";
-      %end;
-      %else %do;
-        url="&url";
-      %end;
-    %end;
   %end;
 
   headers "Accept"="application/json"
   %if &grant_type=authorization_code %then %do;
     "Authorization"="Bearer &&&access_token_var"
   %end;
-  "Content-Disposition"=
+    "Content-Disposition"= "&contentdisp filename=""&name""; name=""&name"";";
-  %if "&ext"="SVG" or "&ext"="HTML" %then %do;
-    "filename=""&name"";"
-  %end;
-  %else %do;
-    "&contentdisp filename=""&name""; name=""&name"";"
-  %end;
-  ;
 run;
-%if &mdebug=1 %then %put &sysmacroname POST &=url
+%put &sysmacroname POST &=url
   &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
 %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 201)
   ,mac=MV_CREATEFILE
   ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
 )
-
 %local libref2;
 %let libref2=%mf_getuniquelibref();
 libname &libref2 JSON fileref=&fname1;
-/* Grab the follow on link */
+%put Grabbing the follow on link ;
 data &outds;
   set &libref2..links end=last;
   if rel='createChild' then do;
+    call symputx('href',quote(cats("&base_uri",href)),'l');
     &dbg put (_all_)(=);
   end;
 run;
 
-/* URI of the created file */
+%put &sysmacroname: File &name successfully created:;%put;
-%let fileuri=%trim(%mfv_getpathuri(&path/&name));
+%put    &base_uri%mfv_getpathuri(&path/&name);%put;
-
+%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
-/* If properties were found then patch the file to include them */
+%put &sysmacroname:;
-%if not %mf_isBlank(%superq(viyaProperties)) %then %do;
-  /* Wrap the properties object in a root object also containing the file name */
-  %local viyapatch;
-  %let viyapatch = %sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_);
-  data _null_;
-    length line $32767;
-    file "&viyapatch" lrecl=32767;
-    put '{ "name": "' "&name" '",';
-    line = cat('"properties": ',symget("viyaProperties"));
-    put line;
-    put '}';
-    stop;
-  run;
-
-  %if &mdebug=1 %then %do;
-    data _null_;
-      if (_n_ eq 1) then put 'DEBUG: ** PATCH JSON **';
-      infile "&viyapatch" end=last;
-      input;
-      put _infile_;
-    run;
-  %end;
-
-  /* And apply the properties to the newly created file, using the PATCH method */
-  %let fref=%mf_getuniquefileref();
-  filename &fref "&viyapatch";
-  %let url=&base_uri&fileuri;
-
-  proc http method='PATCH' oauth_bearer=sas_services in=&fref
-    url="&url";
-    headers "Accept"="application/json"
-            "Content-Type"="application/json"
-            "If-Match"="*";
-    %if &mdebug=1 %then %do;
-      debug level=2;
-    %end;
-  run;
-  %if &mdebug=1 %then %put &sysmacroname PATCH &=url
-    &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-  %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 200)
-    ,mac=MV_CREATEFILE
-    ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
-  )
-%end;
-
-%put &sysmacroname: &base_uri&fileuri;
-%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
@@ -24667,13 +24482,8 @@ 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;
+  %put &sysmacroname: &path already exists;
   data &outds;
     self_uri="%mfv_getpathuri(&path)";
     output;
@@ -24681,7 +24491,6 @@ 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;
@@ -24735,17 +24544,6 @@ 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;
@@ -24753,7 +24551,7 @@ options noquotelenmax;
     iftrue=(
       &SYS_PROCHTTP_STATUS_CODE ne 200 and &SYS_PROCHTTP_STATUS_CODE ne 404
     )
-    ,mac=mv_createfolder124
+    ,mac=&sysmacroname
     ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
   )
   %if &mdebug=1 %then %do;
@@ -24802,9 +24600,8 @@ options noquotelenmax;
                 'Content-Type'='application/vnd.sas.content.folder+json'
                 'Accept'='application/vnd.sas.content.folder+json';
     run;
-    %if &SYS_PROCHTTP_STATUS_CODE ne 201 %then %do;
+    %put &=SYS_PROCHTTP_STATUS_CODE;
-      %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
+    %put &=SYS_PROCHTTP_STATUS_PHRASE;
-    %end;
     %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 201)
       ,mac=&sysmacroname
       ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
@@ -24832,10 +24629,6 @@ 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
@@ -25315,7 +25108,7 @@ options noquotelenmax;
   %let path=%substr(&path,1,%length(&path)-1);
 
 /* ensure folder exists */
-%&dbg.put &sysmacroname: Path &path being checked / created;
+%put &sysmacroname: Path &path being checked / created;
 %mv_createfolder(path=&path)
 
 %local base_uri; /* location of rest apis */
@@ -26148,8 +25941,13 @@ run;
   libname &libref1 clear;
 %end;
 
-%put &sysmacroname: Job &name created!  Check it out:;
+%put &sysmacroname: Job &name successfully created in &path;
-%put &url/SASJobExecution?_PROGRAM=&path/&name;
+%put &sysmacroname:;
+%put &sysmacroname: Check it out here:;
+%put &sysmacroname:;%put;
+%put    &url/SASJobExecution?_PROGRAM=&path/&name;%put;
+%put &sysmacroname:;
+%put &sysmacroname:;
 
 %mend mv_createwebservice;
 /**
@@ -26265,15 +26063,13 @@ proc http method='GET' out=&fname1a &oauth_bearer
   headers "Authorization"="Bearer &&&access_token_var";
 %end;
 run;
-%if &SYS_PROCHTTP_STATUS_CODE ne 200 %then %do;
+%put &=SYS_PROCHTTP_STATUS_CODE;
-  %put &=sysmacroname &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-%end;
 %local libref1a;
 %let libref1a=%mf_getuniquelibref();
 libname &libref1a JSON fileref=&fname1a;
 %local uri found;
 %let found=0;
-/* %put Getting object uri from &libref1a..items; */
+%put Getting object uri from &libref1a..items;
 data _null_;
   length contenttype name $1000;
   set &libref1a..items;
@@ -26378,7 +26174,8 @@ libname &libref1a clear;
 options noquotelenmax;
 %local base_uri; /* location of rest apis */
 %let base_uri=%mf_getplatform(VIYARESTAPI);
-/* fetch the members of the folder to get the uri */
+
+%put &sysmacroname: fetching details for &path ;
 %local fname1;
 %let fname1=%mf_getuniquefileref();
 proc http method='GET' out=&fname1 &oauth_bearer
@@ -26398,7 +26195,7 @@ run;
   )
 %end;
 
-/* grab the follow on link */
+%put &sysmacroname: grab the follow on link ;
 %local libref1;
 %let libref1=%mf_getuniquelibref();
 libname &libref1 JSON fileref=&fname1;
@@ -26416,15 +26213,13 @@ proc http method='GET' out=&fname1a &oauth_bearer
   headers "Authorization"="Bearer &&&access_token_var";
 %end;
 run;
-%if &SYS_PROCHTTP_STATUS_CODE ne 200 %then %do;
+%put &=SYS_PROCHTTP_STATUS_CODE;
-  %put &=sysmacroname &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-%end;
 %local libref1a;
 %let libref1a=%mf_getuniquelibref();
 libname &libref1a JSON fileref=&fname1a;
 %local uri found;
 %let found=0;
-/* %put Getting object uri from &libref1a..items; */
+%put Getting object uri from &libref1a..items;
 data _null_;
   length contenttype name $1000;
   set &libref1a..items;
@@ -26450,7 +26245,7 @@ run;
     ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
   )
 %end;
-%else %put &sysmacroname: &path/&name deleted;
+%else %put &sysmacroname: &path/&name successfully deleted;
 
 /* clear refs */
 filename &fname1 clear;
@@ -27401,7 +27196,7 @@ data _null_;
   uri=symget('uri');
   if length(uri)<12 then do;
     call symputx('errflg',1);
-    call symputx('errmsg',"URI is too short - "!!uri,'l');
+    call symputx('errmsg',"URI is invalid (too short) - '&uri'",'l');
   end;
   if scan(uri,-1)='state' or scan(uri,1) ne 'jobExecution' then do;
     call symputx('errflg',1);
@@ -27466,7 +27261,7 @@ data _null_;
   uri=symget('loglocation');
   if length(uri)<12 then do;
     call symputx('errflg',1);
-    call symputx('errmsg',"URI is too short - "!!uri,'l');
+    call symputx('errmsg',"URI is invalid (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')
@@ -28178,253 +27973,6 @@ filename &fname1 clear;
 libname &libref1 clear;
 
 %mend mv_getusers;/**
-  @file mv_getviyafileextparms.sas
-  @brief Reads the VIYA file-extension type definition and returns selected
-    values in SAS macro variables
-
-  @details Content is derived from the following endpoint:
-    "https://${serverUrl}/types/types?limit=999999"
-
-  @param [in] ext File extension to retrieve property info for.
-  @param [out] propertiesVar= SAS macro variable name that will contain
-    the 'properties' object json, if found, else blank.
-  @param [out] typeDefNameVar= SAS macro variable name that will contain
-    the 'typeDefName' property value, if found, else blank.
-  @param [out] mediaTypeVar= SAS macro variable name that will contain
-    the 'mediaType' property value, if found, else blank.
-  @param [out] viyaFileExtRespLibDs (work.mv_getViyaFileExtParmsResponse)
-    Library.name of the dataset to receive the local working copy of the initial
-    response that requests all file extension details. Created once per session
-    to avoid multiple api calls.
-  @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
-
-  <h4> SAS Macros </h4>
-  @li mf_existds.sas
-  @li mf_getplatform.sas
-  @li mf_getuniquefileref.sas
-  @li mf_getuniquename.sas
-  @li mf_getvalue.sas
-  @li mf_getvarlist.sas
-  @li mf_getvartype.sas
-  @li mf_isblank.sas
-  @li mf_nobs.sas
-  @li mp_abort.sas
-
-*/
-
-%macro mv_getViyaFileExtParms(
-  ext,
-  typeDefNameVar=,
-  propertiesVar=,
-  mediaTypeVar=,
-  viyaFileExtRespLibDs=work.mv_getViyaFileExtParmsResponse,
-  mdebug=0
-  );
-  %local base_uri; /* location of rest apis */
-  %local url; /* File extension info end-point */
-
-  %mp_abort(
-    iftrue=(%mf_isBlank(&ext))
-    ,msg=%str(No file extension provided.)
-    ,mac=MV_GETVIYAFILEEXTPARMS
-  );
-
-  %mp_abort(
-    iftrue=(%mf_isBlank(&typeDefNameVar) and
-            %mf_isBlank(&propertiesVar) and
-            %mf_isBlank(&mediaTypeVar))
-    ,msg=%str(MV_GETVIYAFILEEXTPARMS - No parameter was requested.)
-    ,mac=MV_GETVIYAFILEEXTPARMS
-  );
-
-  %mp_abort(
-    iftrue=(%mf_isBlank(&viyaFileExtRespLibDs))
-    ,msg=%str(No <libname.>dataset name provided to cache inital response.)
-    ,mac=MV_GETVIYAFILEEXTPARMS
-  );
-
-  /* Declare requested parameters as global macro vars and initialize blank */
-  %if not %mf_isBlank(&typeDefNameVar) %then %do;
-    %global &typeDefNameVar;
-    %let &typeDefNameVar = %str();
-  %end;
-  %if not %mf_isBlank(&propertiesVar) %then %do;
-    %global &propertiesVar;
-    %let &propertiesVar = %str();
-  %end;
-  %if not %mf_isBlank(&mediaTypeVar) %then %do;
-    %global &mediaTypeVar;
-    %let &mediaTypeVar = %str();
-  %end;
-
-  %let base_uri=%mf_getplatform(VIYARESTAPI);
-  %if &mdebug=1 %then %do;
-    %put DEBUG: &=base_uri;
-  %end;
-
-  %let ext=%lowcase(&ext);
-
-  /* Create a local copy of the Viya response containing all file type info, if
-  it does not already exist. */
-  %if not %mf_existds(&viyaFileExtRespLibDs) %then %do;
-    /* Create a temp file and fill with JSON that declares */
-    /* VIYA file-type details for the given file extension */
-    %local viyatypedefs;
-    %let viyatypedefs=%mf_getuniquefileref();
-    filename &viyatypedefs temp;
-
-    %let url = &base_uri/types/types?limit=999999;
-
-    proc http oauth_bearer=sas_services out=&viyatypedefs
-      url="&url";
-    run;
-
-    %if &mdebug=1 %then %put DEBUG: &sysmacroname &=url
-      &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-
-    %if (&SYS_PROCHTTP_STATUS_CODE ne 200) %then %do;
-      /* To avoid a breaking change, exit early if the request failed.
-        The calling process will proceed with empty requested macro variables. */
-      %put INFO: &sysmacroname File extension details were not retrieved.;
-      filename &viyatypedefs clear;
-      %return;
-    %end;
-
-    %if &mdebug=1 %then %do;
-      /* Dump the response to the log */
-      data _null_;
-        length line $120;
-        null=byte(0);
-        infile &viyatypedefs dlm=null lrecl=120 recfm=n;
-        input line $120.;
-        if _n_ = 1 then put "DEBUG:";
-        put line;
-      run;
-    %end;
-
-    /* Convert the content of that JSON into SAS datasets */
-      /* First prepare a new WORK-based folder to receive the datasets */
-    %local jsonworkfolder jsonlib opt_dlcreatedir;
-    %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=json_);
-    %let jsonlib=%mf_getuniquelibref(prefix=json);
-      /* And point a libname at it */
-    %let opt_dlcreatedir = %sysfunc(getoption(dlcreatedir));
-    options dlcreatedir; libname &jsonlib "&jsonworkfolder"; options &opt_dlcreatedir;
-
-    /* Read the json output once and copy datasets to its work folder */
-    %local libref1;
-    %let libref1=%mf_getuniquelibref();
-    libname &libref1 JSON fileref=&viyatypedefs automap=create;
-    proc copy in=&libref1 out=&jsonlib; run;
-
-    libname &libref1 clear;
-
-    /* Now give all rows belonging to the same items array a grouping value */
-    data &viyaFileExtRespLibDs;
-      length _viyaItemIdx 8;
-      set &jsonlib..alldata;
-      retain _viyaItemIdx 0;
-      /* Increment the row group index when a new 'items' group is observed */
-      if P=1 and P1='items' then _viyaItemIdx + 1;
-    run;
-
-    %if &mdebug=0 %then %do;
-      /* Tidy up, unless debug=1 */
-      proc datasets library=&jsonlib nolist kill; quit;
-      libname &jsonlib clear;
-    %end;
-
-    filename &viyatypedefs clear;
-
-  %end; /* If initial filetype query response didn't exist */
-
-  /* Find the row-group for the current file extension */
-  %local itemRowGroup;
-  %let itemRowGroup =
-    %mf_getValue(
-      &viyaFileExtRespLibDs
-      ,_viyaItemIdx
-      ,filter=%quote(p1='items' and p2='extensions' and value="&ext")
-    );
-
-  %if &mdebug %then %put DEBUG: &=itemRowGroup;
-
-  %if %mf_isBlank(&itemRowGroup) %then %do;
-    /* extension was not found */
-    %if(&mdebug=1) %then %put DEBUG: No type details found for extension "&ext".;
-    %return;
-  %end;
-
-  /* Filter the cached response data down to the required file extension */
-  %local dsItems;
-  %let dsItems = %mf_getuniquename(prefix=dsItems_);
-  data work.&dsItems;
-    set &viyaFileExtRespLibDs;
-    where _viyaItemIdx = &itemRowGroup;
-  run;
-
-  /* Populate typeDefName, if requested */
-  %if (not %mf_isBlank(&typeDefNameVar)) %then %do;
-    %let &typeDefNameVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="name"));
-    %if &mdebug=1 %then %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar;
-  %end;
-
-  /* Populate mediaType, if requested */
-  %if (not %mf_isBlank(&mediaTypeVar)) %then %do;
-    %let &mediaTypeVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="mediaType"));
-    %if &mdebug=1 %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar;
-  %end;
-
-  /* Populate properties macro variable, if requested */
-  %if not %mf_isBlank(&propertiesVar) %then %do;
-
-    /* Filter dsItems down to the properties */
-    %local dsProperties;
-    %let dsProperties = %mf_getuniquename(prefix=dsProperties_);
-    data work.&dsProperties ( rename=(p3 = propertyName) );
-        set work.&dsItems;
-        where p2="properties" and v=1;
-    run;
-
-    /* Check for 1+ properties */
-    %if ( %mf_nobs(&dsProperties) = 0 ) %then %do;
-      %let &propertiesVar = %str();
-      %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME - No Viya properties found for file suffix %str(%')&ext%str(%');
-    %end;
-    %else %do;
-      /* Properties potentially span multiple rows in the input table */
-      data _null_;
-        length
-          line $32767
-          properties $32767
-        ;
-        retain properties;
-        set &dsProperties end=last;
-        if _n_ = 1 then properties = '{';
-
-        line = cats(quote(trim(propertyName)),':');
-        /* Only strings and bools appear in properties */
-        if value not in ("true","false") then value = quote(trim(value));
-        line = catx(' ',line,value);
-        /* Add a comma separator to all except the last line */
-        if not last then line = cats(line,',');
-
-        /* Add this line to the output value */
-        properties = catx(' ',properties,line);
-
-        if last then do;
-          /* Close off the properties object and output to the macro variable */
-          properties=catx(' ',properties,'}');
-          call symputx("&propertiesVar",properties);
-        end;
-      run;
-
-      %if &mdebug=1 %then %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar;
-    %end;
-
-  %end;
-
-%mend mv_getViyaFileExtParms;/**
   @file
   @brief Executes a SAS Viya Job
   @details Triggers a SAS Viya Job, with optional URL parameters, using
@@ -28801,8 +28349,6 @@ 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=mc,maxtries=1000);
+%macro mf_getuniquelibref(prefix=mclib,maxtries=1000);
   %local x;
 
   %if ( %length(&prefix) gt 7 ) %then %do;

base/mp_assertscope.sas

@@ -73,6 +73,10 @@
   ignorelist=,
   outds=work.test_results
 )/*/STORE SOURCE*/;
+%local ds test_result test_comments del add mod ilist;
+%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE
+  SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist);
+
 /**
   * this sets up the global vars, it will also enter STRICT mode.  If this
   * behaviour is not desired, simply initiate the following global macro
@@ -80,10 +84,6 @@
   */
 %mp_init()
 
-%local ds test_result test_comments del add mod ilist;
-%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE
-  SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist);
-
 /* get current variables */
 %if &action=SNAPSHOT %then %do;
   proc sql;

base/mp_replace.sas

@@ -33,8 +33,7 @@
   LUA, you can also use this macro: mp_gsubfile.sas
 
   @param [in] infile The QUOTED path to the file on which to perform the
-    substitution.  Note that you can extract the pathname from a fileref using
+    substitution
-    the pathname function, eg: `"%sysfunc(pathname(fref))"`;
   @param [in] findvar= Macro variable NAME containing the string to search for
   @param [in] replacevar= Macro variable NAME containing the replacement string
   @param [out] outfile= (0) Optional QUOTED path to the adjusted output file (to
@@ -148,6 +147,6 @@ data _null_;
 run;
 
 /* END */
-/* %put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) secs to run; */
+%put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) seconds to run;
 
 %mend mp_replace;

tests/viyaonly/mfv_getfolderpath.test.sas

@@ -1,31 +0,0 @@
-/**
-  @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 file */
+/* create a folder */
 filename somefile temp;
 data _null_;
   file somefile;

tests/viyaonly/mv_createfile.test.sas

@@ -23,7 +23,7 @@ data _null_;
   put 'hello testings';
 run;
 %mp_assertscope(SNAPSHOT)
-%mv_createfile(path=&mcTestAppLoc, name=&file..txt,inref=somefile,mdebug=1)
+%mv_createfile(path=&mcTestAppLoc/temp, name=&file..txt,inref=somefile,mdebug=1)
 %mp_assertscope(COMPARE
   ,ignorelist=MCLIB0_JADP1LEN MCLIB0_JADP2LEN MCLIB0_JADPNUM
     MCLIB0_JADVLEN MCLIB2_JADP1LEN
@@ -32,7 +32,7 @@ run;
 )
 
 %mp_assert(
-  iftrue=(%mfv_existfile(&mcTestAppLoc/&file..txt)=1),
+  iftrue=(%mfv_existfile(&mcTestAppLoc/temp/&file..txt)=1),
   desc=Check if created file exists
 )
 
@@ -42,10 +42,10 @@ data _null_;
   file f2;
   put '<html><body><p>Hello world</p></body></html>';
 run;
-%mv_createfile(path=&mcTestAppLoc, name=test.html,inref=f2,mdebug=1)
+%mv_createfile(path=&mcTestAppLoc/temp, name=test.html,inref=f2,mdebug=1)
 
 %mp_assert(
-  iftrue=(%mfv_existfile(&mcTestAppLoc/test.html)=1),
+  iftrue=(%mfv_existfile(&mcTestAppLoc/temp/test.html)=1),
   desc=Check if created file exists
 )
 
@@ -55,10 +55,10 @@ x=1;
 run;
 filename ds "%sysfunc(pathname(work))/temp.sas7bdat";
 
-%mv_createfile(path=&mcTestAppLoc, name=&file..sas7bdat,inref=ds,mdebug=1)
+%mv_createfile(path=&mcTestAppLoc/temp, name=&file..sas7bdat,inref=ds,mdebug=1)
 
 %mp_assert(
-  iftrue=(%mfv_existfile(&mcTestAppLoc/&file..sas7bdat)=1),
+  iftrue=(%mfv_existfile(&mcTestAppLoc/temp/&file..sas7bdat)=1),
   desc=Check if created dataset exists
 )
 
@@ -68,44 +68,19 @@ data _null_;
   file f4;
   put '%put hello FromSASStudioBailey; ';
 run;
-%mv_createfile(path=&mcTestAppLoc, name=test4.sas,inref=f4,mdebug=1)
+%mv_createfile(path=&mcTestAppLoc/temp, name=test4.sas,inref=f4,mdebug=1)
 
 %mp_assert(
-  iftrue=(%mfv_existfile(&mcTestAppLoc/test4.sas)=1),
+  iftrue=(%mfv_existfile(&mcTestAppLoc/temp/test4.sas)=1),
   desc=Check if created sas program exists
 )
 
 
 
 %put TEST 5 - reading from files service and writing back;
-filename sendfrom filesrvc folderpath="&mcTestAppLoc" filename='test4.sas';
+filename sendfrom filesrvc folderpath="&mcTestAppLoc/temp" filename='test4.sas';
 
 OPTIONS MERROR SYMBOLGEN MLOGIC MPRINT;
 
-%mv_createfile(path=&mcTestAppLoc,name=test5.sas,inref=sendfrom,mdebug=1) ;
+%mv_createfile(path=&mcTestAppLoc/temp,name=test5.sas,inref=sendfrom,mdebug=1) ;
 
-%put TEST 6 - try the find and replace;
-filename f6 temp;
-data _null_;
-  file f6;
-  put '//Hello world!';
-  put 'let var=/some/path/name;';
-run;
-%let in=/some/path/name;
-%let out=/final/destination;
-%mv_createfile(path=&mcTestAppLoc, name=test6.js,inref=f6,mdebug=1,swap=in out)
-
-filename getback filesrvc folderpath="&mcTestAppLoc" filename='test6.js';
-
-%let test6=0;
-data _null_;
-  infile getback;
-  input;
-  if _infile_="let var=&out;" then call symputx('test6',1);
-  putlog _infile_;
-run;
-
-%mp_assert(
-  iftrue=(&test6=1),
-  desc=Check if find & replace worked
-)

tests/viyaonly/mv_getviyafileextparms.test.sas

@@ -1,96 +0,0 @@
-/**
-  @file
-  @brief Testing mv_getviyafileextparms macro
-
-  <h4> SAS Macros </h4>
-  @li mf_isblank.sas
-  @li mp_assert.sas
-  @li mp_assertscope.sas
-  @li mv_getviyafileextparms.sas
-
-**/
-
-options mprint;
-
-%let mvarIgnoreList =
-  MC0_JADP1LEN MC0_JADP2LEN MC0_JADP3LEN MC0_JADPNUM MC0_JADVLEN
-  SASJSPROCESSMODE SASJS_STPSRV_HEADER_LOC;
-
-%put TEST 1 - Test with common extension, requesting only typeDefName parameter;
-%mp_assertscope(SNAPSHOT)
-%mv_getviyafileextparms(ext=txt, typeDefNameVar=viyaTypeDefName)
-%mp_assertscope(COMPARE
-  ,ignorelist=&mvarIgnoreList viyaTypeDefName
-)
-
-%mp_assert(
-  iftrue=(not %mf_isBlank(&viyaTypeDefName)),
-  desc=Check the requested macro variable viyaTypeDefName is not blank.
-)
-
-%put TEST 2 - Test with common extension, requesting only properties parameter;
-%mp_assertscope(SNAPSHOT)
-%mv_getviyafileextparms(ext=html, propertiesVar=viyaProperties)
-%mp_assertscope(COMPARE
-  ,ignorelist=&mvarIgnoreList viyaProperties
-)
-
-%mp_assert(
-  iftrue=(not %mf_isBlank(%superq(viyaProperties))),
-  desc=Check the requested macro variable viyaProperties is not blank.
-)
-
-%put TEST 3 - Test with common extension, requesting only mediaType parameter;
-%mp_assertscope(SNAPSHOT)
-%mv_getviyafileextparms(ext=mp3, mediaTypeVar=viyaMediaType)
-%mp_assertscope(COMPARE
-  ,ignorelist=&mvarIgnoreList viyaMediaType
-)
-
-%mp_assert(
-  iftrue=(not %mf_isBlank(&viyaMediaType)),
-  desc=Check the requested macro variable viyaMediaType is not blank.
-)
-
-%put TEST 4 - Test with common extension, requesting all parameters;
-%mp_assertscope(SNAPSHOT)
-%mv_getviyafileextparms(
-  ext=css,
-  typeDefNameVar=cssViyaTypeDefName,
-  propertiesVar=cssViyaProperties,
-  mediaTypeVar=cssViyaMediaType
-  )
-%mp_assertscope(COMPARE
-  ,ignorelist=
-    &mvarIgnoreList cssViyaTypeDefName cssViyaProperties  cssViyaMediaType
-)
-
-%mp_assert(
-  iftrue=(not ( %mf_isBlank(&cssViyaTypeDefName) or
-                %mf_isBlank(%superq(cssViyaProperties)) or
-                %mf_isBlank(&cssViyaMediaType) ) ),
-  desc=Check a full set of requested macro variables are not blank.
-)
-
-
-%put TEST 5 - Test with invalid extension - requested parameters will be blank;
-%mp_assertscope(SNAPSHOT)
-%mv_getviyafileextparms(
-  ext=xxxINVALIDxxx,
-  typeDefNameVar=invalidTypeDefName,
-  propertiesVar=invalidProperties,
-  mediaTypeVar=invalidMediaType
-  )
-%mp_assertscope(COMPARE
-  ,ignorelist=
-    &mvarIgnoreList invalidTypeDefName invalidProperties invalidMediaType
-)
-
-%mp_assert(
-  iftrue=(
-    %mf_isBlank(&invalidTypeDefName) and
-    %mf_isBlank(%superq(invalidProperties)) and
-    %mf_isBlank(&invalidMediaType)
-    ),
-  desc=Check the requested macro variables are all blank.
-)

viya/mfv_existfolder.sas

@@ -33,23 +33,16 @@
     msg=Cannot enter mfv_existfolder.sas with syscc=&syscc
   )
 
-  %local fref rc var;
+  %local fref rc;
   %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

@@ -1,53 +0,0 @@
-/**
-  @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,8 +49,4 @@
     %let syscc=0;
   %end;
 
-  %mf_abort(
-    iftrue=(&syscc ne 0),
-    msg=Cannot leave &sysmacroname with syscc=&syscc
-  )
 %mend mfv_getpathuri;

viya/mv_createfile.sas

@@ -17,20 +17,6 @@
       run;
       %mv_createfile(path=/Public/temp,name=newfile.txt,inref=myfile)
 
-  The macro also supports find & replace (used by the SASjs Streaming App
-  build program).  This allows one string to be replaced by another at the
-  point at which the file is created.  This is done by passing in the NAMES of
-  the macro variables containing the values to be swapped, eg:
-
-      filename fref temp;
-      data _null_;
-        file fref;
-        put 'whenever life gets you down, Mrs Brown..';
-      run;
-      %let f=Mrs Brown;
-      %let r=just remember that you're standing on a planet that's evolving;
-      %mv_createfile(path=/Public,name=life.md,inref=fref,fin,swap=f r)
-
 
   @param [in] path= The parent (SAS Drive) folder in which to create the file
   @param [in] name= The name of the file to be created
@@ -52,8 +38,6 @@
     @li sas_services
   @param [in] force= (YES) Will overwrite (delete / recreate) files by default.
     Set to NO to abort if a file already exists in that location.
-  @param pin] swap= (0) Provide two macro variable NAMES that contain the values
-    to be swapped, eg swap=find replace (see also the example above)
   @param [out] outds= (_null_) Output dataset with the uri of the new file
 
   @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
@@ -67,9 +51,7 @@
   @li mfv_getpathuri.sas
   @li mp_abort.sas
   @li mp_base64copy.sas
-  @li mp_replace.sas
   @li mv_createfolder.sas
-  @li mv_getviyafileextparms.sas
 
   <h4> Related Macros</h4>
   @li mv_createfile.sas
@@ -87,7 +69,6 @@
     ,mdebug=0
     ,outds=_null_
     ,force=YES
-    ,swap=0
   );
 %local dbg;
 %if &mdebug=1 %then %do;
@@ -96,11 +77,6 @@
 %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;
@@ -137,12 +113,6 @@
 %end;
 %else %put %str(ERR)OR: invalid value for intype: &intype;
 
-%if "&swap" ne "0" %then %do;
-  %mp_replace("%sysfunc(pathname(&fref))"
-    ,findvar=%scan(&swap,1,%str( ))
-    ,replacevar=%scan(&swap,2,%str( ))
-  )
-%end;
 
 %if &mdebug=1 %then %do;
   data _null_;
@@ -154,7 +124,7 @@
 
 options noquotelenmax;
 %local base_uri; /* location of rest apis */
-%let base_uri=%trim(%mf_getplatform(VIYARESTAPI));
+%let base_uri=%mf_getplatform(VIYARESTAPI);
 
 /* create folder if it does not already exist */
 %local folderds self_uri;
@@ -173,16 +143,11 @@ run;
 /* abort or delete if file already exists */
 %let force=%upcase(&force);
 %local fileuri ;
-%let fileuri=%trim(%mfv_getpathuri(&path/&name));
+%let fileuri=%mfv_getpathuri(&path/&name);
 %mp_abort(iftrue=(%mf_isblank(&fileuri)=0 and &force ne YES)
   ,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;
@@ -192,145 +157,59 @@ run;
   %end;
         "Accept"="*/*";
   run;
-  %put &sysmacroname DELETE &base_uri&fileuri;
+  %put &sysmacroname DELETE &base_uri&fileuri
-  %if &SYS_PROCHTTP_STATUS_CODE ne 204 %then %do;
+    &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-    %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-  %end;
 %end;
 
-%local url mimetype ext;
+%local url mimetype;
 %let url=&base_uri/files/files?parentFolderUri=&self_uri;
-%let ext=%upcase(%trim(%scan(&name,-1,.)));
-
-/* Get Viya file-extension details into some macro variables */
-%mv_getViyaFileExtParms(&ext
-                        ,propertiesVar=viyaProperties
-                        ,typeDefNameVar=viyaTypeDefName
-                        ,mdebug=&mdebug);
 
 /* fetch job info */
 %local fname1;
 %let fname1=%mf_getuniquefileref();
 proc http method='POST' out=&fname1 &oauth_bearer in=&fref
   %if "&ctype" = "0" %then %do;
-    %let mimetype=%mf_mimetype(&ext);
+    %let mimetype=%mf_mimetype(%scan(&name,-1,.));
     ct="&mimetype"
   %end;
   %else %do;
     ct="&ctype"
   %end;
-
+  %if "&mimetype"="text/html" or "&mimetype"="text/css"
-  /* typeDefName */
+  or "&mimetype"="text/javascript" %then %do;
-  %if not %mf_isBlank(&viyaTypeDefName) %then %do;
+    url="&url%str(&)typeDefName=file";
-    url="&url%str(&)typeDefName=&viyaTypeDefName";
   %end;
   %else %do;
-    %if "&ext"="HTM" or "&ext"="HTML" or "&ext"="XHTML" %then %do;
+    url="&url";
-      url="&url%str(&)typeDefName=file_html";
-    %end;
-    %else %do;
-      %if "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" or "&ext"="SVG" %then %do;
-        url="&url%str(&)typeDefName=file_%lowcase(&ext)";
-      %end;
-      %else %do;
-        url="&url";
-      %end;
-    %end;
   %end;
 
   headers "Accept"="application/json"
   %if &grant_type=authorization_code %then %do;
     "Authorization"="Bearer &&&access_token_var"
   %end;
-  "Content-Disposition"=
+    "Content-Disposition"= "&contentdisp filename=""&name""; name=""&name"";";
-  %if "&ext"="SVG" or "&ext"="HTML" %then %do;
-    "filename=""&name"";"
-  %end;
-  %else %do;
-    "&contentdisp filename=""&name""; name=""&name"";"
-  %end;
-  ;
 run;
-%if &mdebug=1 %then %put &sysmacroname POST &=url
+%put &sysmacroname POST &=url
   &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
 %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 201)
   ,mac=MV_CREATEFILE
   ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
 )
-
 %local libref2;
 %let libref2=%mf_getuniquelibref();
 libname &libref2 JSON fileref=&fname1;
-/* Grab the follow on link */
+%put Grabbing the follow on link ;
 data &outds;
   set &libref2..links end=last;
   if rel='createChild' then do;
+    call symputx('href',quote(cats("&base_uri",href)),'l');
     &dbg put (_all_)(=);
   end;
 run;
 
-/* URI of the created file */
+%put &sysmacroname: File &name successfully created:;%put;
-%let fileuri=%trim(%mfv_getpathuri(&path/&name));
+%put    &base_uri%mfv_getpathuri(&path/&name);%put;
-
+%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
-/* If properties were found then patch the file to include them */
+%put &sysmacroname:;
-%if not %mf_isBlank(%superq(viyaProperties)) %then %do;
-  /* Wrap the properties object in a root object also containing the file name */
-  %local viyapatch;
-  %let viyapatch = %sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_);
-  data _null_;
-    length line $32767;
-    file "&viyapatch" lrecl=32767;
-    put '{ "name": "' "&name" '",';
-    line = cat('"properties": ',symget("viyaProperties"));
-    put line;
-    put '}';
-    stop;
-  run;
-
-  %if &mdebug=1 %then %do;
-    data _null_;
-      if (_n_ eq 1) then put 'DEBUG: ** PATCH JSON **';
-      infile "&viyapatch" end=last;
-      input;
-      put _infile_;
-    run;
-  %end;
-
-  /* And apply the properties to the newly created file, using the PATCH method */
-  %let fref=%mf_getuniquefileref();
-  filename &fref "&viyapatch";
-  %let url=&base_uri&fileuri;
-
-  proc http method='PATCH' oauth_bearer=sas_services in=&fref
-    url="&url";
-    headers "Accept"="application/json"
-            "Content-Type"="application/json"
-            "If-Match"="*";
-    %if &mdebug=1 %then %do;
-      debug level=2;
-    %end;
-  run;
-  %if &mdebug=1 %then %put &sysmacroname PATCH &=url
-    &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-  %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 200)
-    ,mac=MV_CREATEFILE
-    ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
-  )
-%end;
-
-%put &sysmacroname: &base_uri&fileuri;
-%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,13 +46,8 @@
 %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;
+  %put &sysmacroname: &path already exists;
   data &outds;
     self_uri="%mfv_getpathuri(&path)";
     output;
@@ -60,7 +55,6 @@
   run;
   %return;
 %end;
-%mp_abort(iftrue=(&syscc ne 0),msg=syscc=&syscc when folder checking)
 
 %local oauth_bearer;
 %if &grant_type=detect %then %do;
@@ -114,17 +108,6 @@ 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;
@@ -132,7 +115,7 @@ options noquotelenmax;
     iftrue=(
       &SYS_PROCHTTP_STATUS_CODE ne 200 and &SYS_PROCHTTP_STATUS_CODE ne 404
     )
-    ,mac=mv_createfolder124
+    ,mac=&sysmacroname
     ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
   )
   %if &mdebug=1 %then %do;
@@ -181,9 +164,8 @@ options noquotelenmax;
                 'Content-Type'='application/vnd.sas.content.folder+json'
                 'Accept'='application/vnd.sas.content.folder+json';
     run;
-    %if &SYS_PROCHTTP_STATUS_CODE ne 201 %then %do;
+    %put &=SYS_PROCHTTP_STATUS_CODE;
-      %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
+    %put &=SYS_PROCHTTP_STATUS_PHRASE;
-    %end;
     %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 201)
       ,mac=&sysmacroname
       ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
@@ -211,8 +193,4 @@ 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_createwebservice.sas

@@ -122,7 +122,7 @@ options noquotelenmax;
   %let path=%substr(&path,1,%length(&path)-1);
 
 /* ensure folder exists */
-%&dbg.put &sysmacroname: Path &path being checked / created;
+%put &sysmacroname: Path &path being checked / created;
 %mv_createfolder(path=&path)
 
 %local base_uri; /* location of rest apis */
@@ -955,7 +955,12 @@ run;
   libname &libref1 clear;
 %end;
 
-%put &sysmacroname: Job &name created!  Check it out:;
+%put &sysmacroname: Job &name successfully created in &path;
-%put &url/SASJobExecution?_PROGRAM=&path/&name;
+%put &sysmacroname:;
+%put &sysmacroname: Check it out here:;
+%put &sysmacroname:;%put;
+%put    &url/SASJobExecution?_PROGRAM=&path/&name;%put;
+%put &sysmacroname:;
+%put &sysmacroname:;
 
 %mend mv_createwebservice;

viya/mv_deletefoldermember.sas

@@ -111,15 +111,13 @@ proc http method='GET' out=&fname1a &oauth_bearer
   headers "Authorization"="Bearer &&&access_token_var";
 %end;
 run;
-%if &SYS_PROCHTTP_STATUS_CODE ne 200 %then %do;
+%put &=SYS_PROCHTTP_STATUS_CODE;
-  %put &=sysmacroname &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-%end;
 %local libref1a;
 %let libref1a=%mf_getuniquelibref();
 libname &libref1a JSON fileref=&fname1a;
 %local uri found;
 %let found=0;
-/* %put Getting object uri from &libref1a..items; */
+%put Getting object uri from &libref1a..items;
 data _null_;
   length contenttype name $1000;
   set &libref1a..items;

viya/mv_deletejes.sas

@@ -69,7 +69,8 @@
 options noquotelenmax;
 %local base_uri; /* location of rest apis */
 %let base_uri=%mf_getplatform(VIYARESTAPI);
-/* fetch the members of the folder to get the uri */
+
+%put &sysmacroname: fetching details for &path ;
 %local fname1;
 %let fname1=%mf_getuniquefileref();
 proc http method='GET' out=&fname1 &oauth_bearer
@@ -89,7 +90,7 @@ run;
   )
 %end;
 
-/* grab the follow on link */
+%put &sysmacroname: grab the follow on link ;
 %local libref1;
 %let libref1=%mf_getuniquelibref();
 libname &libref1 JSON fileref=&fname1;
@@ -107,15 +108,13 @@ proc http method='GET' out=&fname1a &oauth_bearer
   headers "Authorization"="Bearer &&&access_token_var";
 %end;
 run;
-%if &SYS_PROCHTTP_STATUS_CODE ne 200 %then %do;
+%put &=SYS_PROCHTTP_STATUS_CODE;
-  %put &=sysmacroname &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-%end;
 %local libref1a;
 %let libref1a=%mf_getuniquelibref();
 libname &libref1a JSON fileref=&fname1a;
 %local uri found;
 %let found=0;
-/* %put Getting object uri from &libref1a..items; */
+%put Getting object uri from &libref1a..items;
 data _null_;
   length contenttype name $1000;
   set &libref1a..items;
@@ -141,7 +140,7 @@ run;
     ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
   )
 %end;
-%else %put &sysmacroname: &path/&name deleted;
+%else %put &sysmacroname: &path/&name successfully deleted;
 
 /* clear refs */
 filename &fname1 clear;

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 too short - "!!uri,'l');
+    call symputx('errmsg',"URI is invalid (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 too short - "!!uri,'l');
+    call symputx('errmsg',"URI is invalid (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_getviyafileextparms.sas

@@ -1,248 +0,0 @@
-/**
-  @file mv_getviyafileextparms.sas
-  @brief Reads the VIYA file-extension type definition and returns selected
-    values in SAS macro variables
-
-  @details Content is derived from the following endpoint:
-    "https://${serverUrl}/types/types?limit=999999"
-
-  @param [in] ext File extension to retrieve property info for.
-  @param [out] propertiesVar= SAS macro variable name that will contain
-    the 'properties' object json, if found, else blank.
-  @param [out] typeDefNameVar= SAS macro variable name that will contain
-    the 'typeDefName' property value, if found, else blank.
-  @param [out] mediaTypeVar= SAS macro variable name that will contain
-    the 'mediaType' property value, if found, else blank.
-  @param [out] viyaFileExtRespLibDs (work.mv_getViyaFileExtParmsResponse)
-    Library.name of the dataset to receive the local working copy of the initial
-    response that requests all file extension details. Created once per session
-    to avoid multiple api calls.
-  @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
-
-  <h4> SAS Macros </h4>
-  @li mf_existds.sas
-  @li mf_getplatform.sas
-  @li mf_getuniquefileref.sas
-  @li mf_getuniquename.sas
-  @li mf_getvalue.sas
-  @li mf_getvarlist.sas
-  @li mf_getvartype.sas
-  @li mf_isblank.sas
-  @li mf_nobs.sas
-  @li mp_abort.sas
-
-*/
-
-%macro mv_getViyaFileExtParms(
-  ext,
-  typeDefNameVar=,
-  propertiesVar=,
-  mediaTypeVar=,
-  viyaFileExtRespLibDs=work.mv_getViyaFileExtParmsResponse,
-  mdebug=0
-  );
-  %local base_uri; /* location of rest apis */
-  %local url; /* File extension info end-point */
-
-  %mp_abort(
-    iftrue=(%mf_isBlank(&ext))
-    ,msg=%str(No file extension provided.)
-    ,mac=MV_GETVIYAFILEEXTPARMS
-  );
-
-  %mp_abort(
-    iftrue=(%mf_isBlank(&typeDefNameVar) and
-            %mf_isBlank(&propertiesVar) and
-            %mf_isBlank(&mediaTypeVar))
-    ,msg=%str(MV_GETVIYAFILEEXTPARMS - No parameter was requested.)
-    ,mac=MV_GETVIYAFILEEXTPARMS
-  );
-
-  %mp_abort(
-    iftrue=(%mf_isBlank(&viyaFileExtRespLibDs))
-    ,msg=%str(No <libname.>dataset name provided to cache inital response.)
-    ,mac=MV_GETVIYAFILEEXTPARMS
-  );
-
-  /* Declare requested parameters as global macro vars and initialize blank */
-  %if not %mf_isBlank(&typeDefNameVar) %then %do;
-    %global &typeDefNameVar;
-    %let &typeDefNameVar = %str();
-  %end;
-  %if not %mf_isBlank(&propertiesVar) %then %do;
-    %global &propertiesVar;
-    %let &propertiesVar = %str();
-  %end;
-  %if not %mf_isBlank(&mediaTypeVar) %then %do;
-    %global &mediaTypeVar;
-    %let &mediaTypeVar = %str();
-  %end;
-
-  %let base_uri=%mf_getplatform(VIYARESTAPI);
-  %if &mdebug=1 %then %do;
-    %put DEBUG: &=base_uri;
-  %end;
-
-  %let ext=%lowcase(&ext);
-
-  /* Create a local copy of the Viya response containing all file type info, if
-  it does not already exist. */
-  %if not %mf_existds(&viyaFileExtRespLibDs) %then %do;
-    /* Create a temp file and fill with JSON that declares */
-    /* VIYA file-type details for the given file extension */
-    %local viyatypedefs;
-    %let viyatypedefs=%mf_getuniquefileref();
-    filename &viyatypedefs temp;
-
-    %let url = &base_uri/types/types?limit=999999;
-
-    proc http oauth_bearer=sas_services out=&viyatypedefs
-      url="&url";
-    run;
-
-    %if &mdebug=1 %then %put DEBUG: &sysmacroname &=url
-      &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-
-    %if (&SYS_PROCHTTP_STATUS_CODE ne 200) %then %do;
-      /* To avoid a breaking change, exit early if the request failed.
-        The calling process will proceed with empty requested macro variables. */
-      %put INFO: &sysmacroname File extension details were not retrieved.;
-      filename &viyatypedefs clear;
-      %return;
-    %end;
-
-    %if &mdebug=1 %then %do;
-      /* Dump the response to the log */
-      data _null_;
-        length line $120;
-        null=byte(0);
-        infile &viyatypedefs dlm=null lrecl=120 recfm=n;
-        input line $120.;
-        if _n_ = 1 then put "DEBUG:";
-        put line;
-      run;
-    %end;
-
-    /* Convert the content of that JSON into SAS datasets */
-      /* First prepare a new WORK-based folder to receive the datasets */
-    %local jsonworkfolder jsonlib opt_dlcreatedir;
-    %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=json_);
-    %let jsonlib=%mf_getuniquelibref(prefix=json);
-      /* And point a libname at it */
-    %let opt_dlcreatedir = %sysfunc(getoption(dlcreatedir));
-    options dlcreatedir; libname &jsonlib "&jsonworkfolder"; options &opt_dlcreatedir;
-
-    /* Read the json output once and copy datasets to its work folder */
-    %local libref1;
-    %let libref1=%mf_getuniquelibref();
-    libname &libref1 JSON fileref=&viyatypedefs automap=create;
-    proc copy in=&libref1 out=&jsonlib; run;
-
-    libname &libref1 clear;
-
-    /* Now give all rows belonging to the same items array a grouping value */
-    data &viyaFileExtRespLibDs;
-      length _viyaItemIdx 8;
-      set &jsonlib..alldata;
-      retain _viyaItemIdx 0;
-      /* Increment the row group index when a new 'items' group is observed */
-      if P=1 and P1='items' then _viyaItemIdx + 1;
-    run;
-
-    %if &mdebug=0 %then %do;
-      /* Tidy up, unless debug=1 */
-      proc datasets library=&jsonlib nolist kill; quit;
-      libname &jsonlib clear;
-    %end;
-
-    filename &viyatypedefs clear;
-
-  %end; /* If initial filetype query response didn't exist */
-
-  /* Find the row-group for the current file extension */
-  %local itemRowGroup;
-  %let itemRowGroup =
-    %mf_getValue(
-      &viyaFileExtRespLibDs
-      ,_viyaItemIdx
-      ,filter=%quote(p1='items' and p2='extensions' and value="&ext")
-    );
-
-  %if &mdebug %then %put DEBUG: &=itemRowGroup;
-
-  %if %mf_isBlank(&itemRowGroup) %then %do;
-    /* extension was not found */
-    %if(&mdebug=1) %then %put DEBUG: No type details found for extension "&ext".;
-    %return;
-  %end;
-
-  /* Filter the cached response data down to the required file extension */
-  %local dsItems;
-  %let dsItems = %mf_getuniquename(prefix=dsItems_);
-  data work.&dsItems;
-    set &viyaFileExtRespLibDs;
-    where _viyaItemIdx = &itemRowGroup;
-  run;
-
-  /* Populate typeDefName, if requested */
-  %if (not %mf_isBlank(&typeDefNameVar)) %then %do;
-    %let &typeDefNameVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="name"));
-    %if &mdebug=1 %then %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar;
-  %end;
-
-  /* Populate mediaType, if requested */
-  %if (not %mf_isBlank(&mediaTypeVar)) %then %do;
-    %let &mediaTypeVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="mediaType"));
-    %if &mdebug=1 %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar;
-  %end;
-
-  /* Populate properties macro variable, if requested */
-  %if not %mf_isBlank(&propertiesVar) %then %do;
-
-    /* Filter dsItems down to the properties */
-    %local dsProperties;
-    %let dsProperties = %mf_getuniquename(prefix=dsProperties_);
-    data work.&dsProperties ( rename=(p3 = propertyName) );
-        set work.&dsItems;
-        where p2="properties" and v=1;
-    run;
-
-    /* Check for 1+ properties */
-    %if ( %mf_nobs(&dsProperties) = 0 ) %then %do;
-      %let &propertiesVar = %str();
-      %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME - No Viya properties found for file suffix %str(%')&ext%str(%');
-    %end;
-    %else %do;
-      /* Properties potentially span multiple rows in the input table */
-      data _null_;
-        length
-          line $32767
-          properties $32767
-        ;
-        retain properties;
-        set &dsProperties end=last;
-        if _n_ = 1 then properties = '{';
-
-        line = cats(quote(trim(propertyName)),':');
-        /* Only strings and bools appear in properties */
-        if value not in ("true","false") then value = quote(trim(value));
-        line = catx(' ',line,value);
-        /* Add a comma separator to all except the last line */
-        if not last then line = cats(line,',');
-
-        /* Add this line to the output value */
-        properties = catx(' ',properties,line);
-
-        if last then do;
-          /* Close off the properties object and output to the macro variable */
-          properties=catx(' ',properties,'}');
-          call symputx("&propertiesVar",properties);
-        end;
-      run;
-
-      %if &mdebug=1 %then %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar;
-    %end;
-
-  %end;
-
-%mend mv_getViyaFileExtParms;

viya/mv_jobflow.sas

@@ -188,8 +188,6 @@
     %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;