chore: updating all.sas

README.md

@@ -147,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

all.sas

@@ -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
@@ -24171,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
@@ -24292,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
@@ -24327,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
@@ -24342,7 +24273,6 @@ run;
   @li mfv_getpathuri.sas
   @li mp_abort.sas
   @li mp_base64copy.sas
-  @li mp_replace.sas
   @li mv_createfolder.sas
 
   <h4> Related Macros</h4>
@@ -24361,7 +24291,6 @@ run;
     ,mdebug=0
     ,outds=_null_
     ,force=YES
-    ,swap=0
   );
 %local dbg;
 %if &mdebug=1 %then %do;
@@ -24406,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_;
@@ -24456,29 +24379,26 @@ 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(%scan(&name,-1,.));
 
 /* 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 "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG"
+  %if "&mimetype"="text/html" or "&mimetype"="text/css"
-  or "&ext"="SVG" %then %do;
+  or "&mimetype"="text/javascript" %then %do;
     url="&url%str(&)typeDefName=file";
   %end;
   %else %do;
@@ -24489,16 +24409,9 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref
   %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
@@ -24507,7 +24420,7 @@ run;
 %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;
@@ -24516,8 +24429,10 @@ data &outds;
   end;
 run;
 
-%put &sysmacroname: &name created at %mfv_getpathuri(&path/&name);%put;
+%put &sysmacroname: File &name successfully created:;%put;
+%put    &base_uri%mfv_getpathuri(&path/&name);%put;
 %put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+%put &sysmacroname:;
 
 %mend mv_createfile;/**
   @file mv_createfolder.sas
@@ -24568,7 +24483,7 @@ run;
 %else %let dbg=*;
 
 %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;
@@ -24685,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 200 %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)
@@ -25194,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 */
@@ -26027,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;
 /**
@@ -26144,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;
@@ -26257,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
@@ -26277,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;
@@ -26295,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;
@@ -26329,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;
@@ -27280,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);
@@ -27345,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')
@@ -28433,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/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

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

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/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,7 +51,6 @@
   @li mfv_getpathuri.sas
   @li mp_abort.sas
   @li mp_base64copy.sas
-  @li mp_replace.sas
   @li mv_createfolder.sas
 
   <h4> Related Macros</h4>
@@ -86,7 +69,6 @@
     ,mdebug=0
     ,outds=_null_
     ,force=YES
-    ,swap=0
   );
 %local dbg;
 %if &mdebug=1 %then %do;
@@ -131,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_;
@@ -181,29 +157,26 @@ 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(%scan(&name,-1,.));
 
 /* 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 "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG"
+  %if "&mimetype"="text/html" or "&mimetype"="text/css"
-  or "&ext"="SVG" %then %do;
+  or "&mimetype"="text/javascript" %then %do;
     url="&url%str(&)typeDefName=file";
   %end;
   %else %do;
@@ -214,16 +187,9 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref
   %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
@@ -232,7 +198,7 @@ run;
 %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;
@@ -241,7 +207,9 @@ data &outds;
   end;
 run;
 
-%put &sysmacroname: &name created at %mfv_getpathuri(&path/&name);%put;
+%put &sysmacroname: File &name successfully created:;%put;
+%put    &base_uri%mfv_getpathuri(&path/&name);%put;
 %put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+%put &sysmacroname:;
 
 %mend mv_createfile;

viya/mv_createfolder.sas

@@ -47,7 +47,7 @@
 %else %let dbg=*;
 
 %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;
@@ -164,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 200 %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)

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_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;