From c5ec21c7a0549dd28bac5cb3c0e632e8052a1d2d Mon Sep 17 00:00:00 2001 From: allan Date: Fri, 30 May 2025 09:58:06 +0100 Subject: [PATCH] fix: ensuring svg rendering from SAS drive Also reducing put statements in the log --- viya/mv_createfile.sas | 9 ++++++++- viya/mv_createwebservice.sas | 6 +++--- viya/mv_deletejes.sas | 9 +++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/viya/mv_createfile.sas b/viya/mv_createfile.sas index 90fbf1e..8a21046 100644 --- a/viya/mv_createfile.sas +++ b/viya/mv_createfile.sas @@ -187,7 +187,14 @@ 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"= "&contentdisp filename=""&name""; name=""&name"";"; + "Content-Disposition"= + %if "&ext"="SVG" %then %do; + "filename=""&name"";" + %end; + %else %do; + "&contentdisp filename=""&name""; name=""&name"";" + %end; + ; run; %if &mdebug=1 %then %put &sysmacroname POST &=url &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE; diff --git a/viya/mv_createwebservice.sas b/viya/mv_createwebservice.sas index 7ffdefd..6c29240 100644 --- a/viya/mv_createwebservice.sas +++ b/viya/mv_createwebservice.sas @@ -122,7 +122,7 @@ options noquotelenmax; %let path=%substr(&path,1,%length(&path)-1); /* ensure folder exists */ -%put &sysmacroname: Path &path being checked / created; +%&dbg.put &sysmacroname: Path &path being checked / created; %mv_createfolder(path=&path) %local base_uri; /* location of rest apis */ @@ -955,7 +955,7 @@ run; libname &libref1 clear; %end; -%put NOTE: &sysmacroname: Job &name successfully created! Check it out:; -%put NOTE-;%put NOTE- &url/SASJobExecution?_PROGRAM=&path/&name;%put NOTE-; +%put &sysmacroname: Job &name created! Check it out:; +%put &url/SASJobExecution?_PROGRAM=&path/&name; %mend mv_createwebservice; diff --git a/viya/mv_deletejes.sas b/viya/mv_deletejes.sas index a27d540..27532a4 100644 --- a/viya/mv_deletejes.sas +++ b/viya/mv_deletejes.sas @@ -69,8 +69,7 @@ options noquotelenmax; %local base_uri; /* location of rest apis */ %let base_uri=%mf_getplatform(VIYARESTAPI); - -%put &sysmacroname: fetching details for &path ; +/* fetch the members of the folder to get the uri */ %local fname1; %let fname1=%mf_getuniquefileref(); proc http method='GET' out=&fname1 &oauth_bearer @@ -108,7 +107,9 @@ proc http method='GET' out=&fname1a &oauth_bearer headers "Authorization"="Bearer &&&access_token_var"; %end; run; -%put &=SYS_PROCHTTP_STATUS_CODE; +%if &SYS_PROCHTTP_STATUS_CODE ne 200 %then %do; + %put &=sysmacroname &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE; +%end; %local libref1a; %let libref1a=%mf_getuniquelibref(); libname &libref1a JSON fileref=&fname1a; @@ -140,7 +141,7 @@ run; ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE) ) %end; -%else %put &sysmacroname: &path/&name successfully deleted; +%else %put &sysmacroname: &path/&name deleted; /* clear refs */ filename &fname1 clear;