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)
-  - _mddl__: macros containing DDL (Data Definition Language)
-  - _mf__: macro functions (can be used in open code).
-  - _mfv__: macro functions that work only in Viya
-  - _ml__: macros that are used to compile LUA modules
-  - _mm__: metadata macros (interface with the metadata server).
-  - _mmx__: macros that use metadata and are XCMD enabled (working on both windows and unix)
-  - _mp__: macro procedures (which generate sas code)
-  - _ms__: macro procedures that will only work with [@sasjs/server](https://github.com/sasjs/server)
-  - _mv__: macro procedures that will only work in Viya
-  - _mx__: macros that work on Viya, SAS 9 EBI and SASjs Server
+  - _mcf_ for macro compiled functions (proc fcmp)
+  - _mddl_ for macros containing DDL (Data Definition Language)
+  - _mf_ for macro functions (can be used in open code).
+  - _ml_ for macros that are used to compile LUA modules
+  - _mm_ for metadata macros (interface with the metadata server).
+  - _mmx_ for macros that use metadata and are XCMD enabled (working on both windows and unix)
+  - _mp_ for macro procedures (which generate sas code)
+  - _ms_ for macro procedures that will only work with [@sasjs/server](https://github.com/sasjs/server)
+  - _mv_ for macro procedures that will only work in Viya
+  - _mx_ for 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

@@ -24379,28 +24379,26 @@ run;
   %end;
         "Accept"="*/*";
   run;
-  %put &sysmacroname DELETE &base_uri&fileuri;
-  %if &SYS_PROCHTTP_STATUS_CODE ne 204 %then %do;
-    %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-  %end;
+  %put &sysmacroname DELETE &base_uri&fileuri
+    &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
 %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"="SVG" %then %do;
+  %if "&mimetype"="text/html" or "&mimetype"="text/css"
+  or "&mimetype"="text/javascript" %then %do;
     url="&url%str(&)typeDefName=file";
   %end;
   %else %do;
@@ -24411,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"=
-  %if "&ext"="SVG" %then %do;
-    "filename=""&name"";"
-  %end;
-  %else %do;
-    "&contentdisp filename=""&name""; name=""&name"";"
-  %end;
-  ;
+    "Content-Disposition"= "&contentdisp filename=""&name""; name=""&name"";";
 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
@@ -24429,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;
@@ -24438,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
@@ -24490,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;
@@ -24607,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 &=SYS_PROCHTTP_STATUS_PHRASE;
-    %end;
+    %put &=SYS_PROCHTTP_STATUS_CODE;
+    %put &=SYS_PROCHTTP_STATUS_PHRASE;
     %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 201)
       ,mac=&sysmacroname
       ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
@@ -25116,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 */
@@ -25949,8 +25941,13 @@ run;
   libname &libref1 clear;
 %end;
 
-%put &sysmacroname: Job &name created!  Check it out:;
-%put &url/SASJobExecution?_PROGRAM=&path/&name;
+%put &sysmacroname: Job &name successfully created in &path;
+%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;
 /**
@@ -26066,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 &=sysmacroname &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-%end;
+%put &=SYS_PROCHTTP_STATUS_CODE;
 %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;
@@ -26179,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
@@ -26199,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;
@@ -26217,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 &=sysmacroname &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-%end;
+%put &=SYS_PROCHTTP_STATUS_CODE;
 %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;
@@ -26251,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;

viya/mv_createfile.sas

@@ -157,28 +157,26 @@ run;
   %end;
         "Accept"="*/*";
   run;
-  %put &sysmacroname DELETE &base_uri&fileuri;
-  %if &SYS_PROCHTTP_STATUS_CODE ne 204 %then %do;
-    %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-  %end;
+  %put &sysmacroname DELETE &base_uri&fileuri
+    &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
 %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"="SVG" %then %do;
+  %if "&mimetype"="text/html" or "&mimetype"="text/css"
+  or "&mimetype"="text/javascript" %then %do;
     url="&url%str(&)typeDefName=file";
   %end;
   %else %do;
@@ -189,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"=
-  %if "&ext"="SVG" %then %do;
-    "filename=""&name"";"
-  %end;
-  %else %do;
-    "&contentdisp filename=""&name""; name=""&name"";"
-  %end;
-  ;
+    "Content-Disposition"= "&contentdisp filename=""&name""; name=""&name"";";
 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
@@ -207,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;
@@ -216,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 &=SYS_PROCHTTP_STATUS_PHRASE;
-    %end;
+    %put &=SYS_PROCHTTP_STATUS_CODE;
+    %put &=SYS_PROCHTTP_STATUS_PHRASE;
     %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 &url/SASJobExecution?_PROGRAM=&path/&name;
+%put &sysmacroname: Job &name successfully created in &path;
+%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 &=sysmacroname &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-%end;
+%put &=SYS_PROCHTTP_STATUS_CODE;
 %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 &=sysmacroname &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
-%end;
+%put &=SYS_PROCHTTP_STATUS_CODE;
 %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;