feat: adding filref option to mp_streamfile.sas

all.sas

@@ -399,7 +399,7 @@ options noquotelenmax;
   @version 9.2
   @author Allan Bowe
 
-**/ /** \cond */
+**/
 
 %macro mf_getengine(libref
 )/*/STORE SOURCE*/;
@@ -419,9 +419,7 @@ options noquotelenmax;
 
  &engine
 
-%mend;
-
-/** \endcond *//**
+%mend;/**
   @file
   @brief Returns the size of a file in bytes.
   @details Provide full path/filename.extension to the file, eg:
@@ -1933,29 +1931,50 @@ Usage:
 
   @version 9.2
   @author Allan Bowe
+
+  <h4> Dependencies </h4>
+  @li mp_abort.sas
+  @li mf_existds.sas
+
 **/
 
-%macro mp_csv2ds(inref=0,outds=0,baseds=0);
-%if &inref=0 %then %do;
-  %put %str(ERR)OR: the INREF variable must be provided;
-  %let syscc=4;
-  %abort;
-%end;
-%if %superq(outds)=0 %then %do;
-  %put %str(ERR)OR: the OUTDS variable must be provided;
-  %let syscc=4;
-  %return;
-%end;
-%if &baseds=0 %then %do;
-  %put %str(ERR)OR: the BASEDS variable must be provided;
-  %let syscc=4;
-  %return;
-%end;
-%if %sysfunc(exist(&BASEDS)) ne 1 & %sysfunc(exist(&BASEDS,VIEW)) ne 1 %then %do;
-  %put %str(ERR)OR: the BASEDS dataset needs to be assigned, and to exist;
-  %let syscc=4;
-  %return;
-%end;
+%macro mp_csv2ds(inref=0,outds=0,baseds=0,view=NO);
+
+%mp_abort(iftrue=( &inref=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the INREF variable must be provided)
+)
+%mp_abort(iftrue=( %superq(outds)=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the OUTDS variable must be provided)
+)
+%mp_abort(iftrue=( &baseds=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the BASEDS variable must be provided)
+)
+%mp_abort(iftrue=( &baseds=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the BASEDS variable must be provided)
+)
+%mp_abort(iftrue=( %mf_existds(&baseds)=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the BASEDS dataset (&baseds) needs to be assigned, and to exist)
+)
+
+/* count rows */
+%local hasheader; %let hasheader=0;
+data _null_;
+  if _N_ > 1 then do;
+     call symputx('hasheader',1,'l');
+     stop;
+  end;
+  infile &inref;
+  input;
+run;
+%mp_abort(iftrue=( &hasheader=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(No header row in &inref)
+)
 
 /* get the variables in the CSV */
 data _data_;
@@ -2004,6 +2023,7 @@ data _null_;
     if type=1 then informat='best.';
     else informat=cats('$',length,'.');
   end;
+  else informat=cats(informat,'.');
   in=catx(' ',in,name,':',informat);
   if last then do;
     call symputx('instat',in,'l');
@@ -2019,7 +2039,9 @@ data &outds
   ;
   infile &inref dsd firstobs=2;
   input &instat;
-  drop &dropvars;
+  %if %length(&dropvars)>0 %then %do;
+    drop &dropvars;
+  %end;
 run;
 
 %mend;/**
@@ -4089,7 +4111,7 @@ proc sql
 
   options &etls_syntaxcheck;
 %mend;/**
-  @file mp_streamfile.sas
+  @file
   @brief Streams a file to _webout according to content type
   @details Will set headers using appropriate functions (SAS 9 vs Viya) and send
   content as a binary stream.
@@ -4107,6 +4129,7 @@ proc sql
 
   @param contenttype= Either TEXT, ZIP, CSV, EXCEL (default TEXT)
   @param inloc= /path/to/file.ext to be sent
+  @param inref= fileref of file to be sent (if provided, overrides `inloc`)
   @param outname= the name of the file, as downloaded by the browser
 
   @author Allan Bowe
@@ -4117,6 +4140,7 @@ proc sql
 %macro mp_streamfile(
   contenttype=TEXT
   ,inloc=
+  ,inref=0
   ,outname=
 )/*/STORE SOURCE*/;
 
@@ -4132,7 +4156,7 @@ proc sql
   %end;
   %else %if &platform=SASVIYA %then %do;
     filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.zip'
-      contenttype='application/zip' 
+      contenttype='application/zip'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
@@ -4146,7 +4170,7 @@ proc sql
   %end;
   %else %if &platform=SASVIYA %then %do;
     filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
-      contenttype='application/vnd.ms-excel' 
+      contenttype='application/vnd.ms-excel'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
@@ -4159,7 +4183,7 @@ proc sql
   %end;
   %else %if &platform=SASVIYA %then %do;
     filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
-      contenttype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' 
+      contenttype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
@@ -4192,7 +4216,7 @@ proc sql
 %else %if &contentype=HTML %then %do;
   %if &platform=SASVIYA %then %do;
     filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
-      contenttype="text/html"; 
+      contenttype="text/html";
   %end;
 %end;
 %else %do;
@@ -4200,7 +4224,12 @@ proc sql
   %return;
 %end;
 
-%mp_binarycopy(inloc="&inloc",outref=_webout)
+%if &inref ne 0 %then %do;
+ %mp_binarycopy(inref=&inref,outref=_webout)
+%end;
+%else %do;
+ %mp_binarycopy(inloc="&inloc",outref=_webout)
+%end;
 
 %mend;/**
   @file mp_unzip.sas

base/mf_getengine.sas

@@ -22,7 +22,7 @@
   @version 9.2
   @author Allan Bowe
 
-**/ /** \cond */
+**/
 
 %macro mf_getengine(libref
 )/*/STORE SOURCE*/;
@@ -42,6 +42,4 @@
 
  &engine
 
-%mend;
-
-/** \endcond */
+%mend;

base/mp_csv2ds.sas

@@ -28,29 +28,50 @@
 
   @version 9.2
   @author Allan Bowe
+
+  <h4> Dependencies </h4>
+  @li mp_abort.sas
+  @li mf_existds.sas
+
 **/
 
-%macro mp_csv2ds(inref=0,outds=0,baseds=0);
-%if &inref=0 %then %do;
-  %put %str(ERR)OR: the INREF variable must be provided;
-  %let syscc=4;
-  %abort;
-%end;
-%if %superq(outds)=0 %then %do;
-  %put %str(ERR)OR: the OUTDS variable must be provided;
-  %let syscc=4;
-  %return;
-%end;
-%if &baseds=0 %then %do;
-  %put %str(ERR)OR: the BASEDS variable must be provided;
-  %let syscc=4;
-  %return;
-%end;
-%if %sysfunc(exist(&BASEDS)) ne 1 & %sysfunc(exist(&BASEDS,VIEW)) ne 1 %then %do;
-  %put %str(ERR)OR: the BASEDS dataset needs to be assigned, and to exist;
-  %let syscc=4;
-  %return;
-%end;
+%macro mp_csv2ds(inref=0,outds=0,baseds=0,view=NO);
+
+%mp_abort(iftrue=( &inref=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the INREF variable must be provided)
+)
+%mp_abort(iftrue=( %superq(outds)=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the OUTDS variable must be provided)
+)
+%mp_abort(iftrue=( &baseds=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the BASEDS variable must be provided)
+)
+%mp_abort(iftrue=( &baseds=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the BASEDS variable must be provided)
+)
+%mp_abort(iftrue=( %mf_existds(&baseds)=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(the BASEDS dataset (&baseds) needs to be assigned, and to exist)
+)
+
+/* count rows */
+%local hasheader; %let hasheader=0;
+data _null_;
+  if _N_ > 1 then do;
+     call symputx('hasheader',1,'l');
+     stop;
+  end;
+  infile &inref;
+  input;
+run;
+%mp_abort(iftrue=( &hasheader=0 )
+  ,mac=&sysmacroname
+  ,msg=%str(No header row in &inref)
+)
 
 /* get the variables in the CSV */
 data _data_;
@@ -99,6 +120,7 @@ data _null_;
     if type=1 then informat='best.';
     else informat=cats('$',length,'.');
   end;
+  else informat=cats(informat,'.');
   in=catx(' ',in,name,':',informat);
   if last then do;
     call symputx('instat',in,'l');
@@ -114,7 +136,9 @@ data &outds
   ;
   infile &inref dsd firstobs=2;
   input &instat;
-  drop &dropvars;
+  %if %length(&dropvars)>0 %then %do;
+    drop &dropvars;
+  %end;
 run;
 
 %mend;

base/mp_streamfile.sas

@@ -1,5 +1,5 @@
 /**
-  @file mp_streamfile.sas
+  @file
   @brief Streams a file to _webout according to content type
   @details Will set headers using appropriate functions (SAS 9 vs Viya) and send
   content as a binary stream.
@@ -17,6 +17,7 @@
 
   @param contenttype= Either TEXT, ZIP, CSV, EXCEL (default TEXT)
   @param inloc= /path/to/file.ext to be sent
+  @param inref= fileref of file to be sent (if provided, overrides `inloc`)
   @param outname= the name of the file, as downloaded by the browser
 
   @author Allan Bowe
@@ -27,6 +28,7 @@
 %macro mp_streamfile(
   contenttype=TEXT
   ,inloc=
+  ,inref=0
   ,outname=
 )/*/STORE SOURCE*/;
 
@@ -42,7 +44,7 @@
   %end;
   %else %if &platform=SASVIYA %then %do;
     filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.zip'
-      contenttype='application/zip' 
+      contenttype='application/zip'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
@@ -56,7 +58,7 @@
   %end;
   %else %if &platform=SASVIYA %then %do;
     filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
-      contenttype='application/vnd.ms-excel' 
+      contenttype='application/vnd.ms-excel'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
@@ -69,7 +71,7 @@
   %end;
   %else %if &platform=SASVIYA %then %do;
     filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
-      contenttype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' 
+      contenttype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
@@ -102,7 +104,7 @@
 %else %if &contentype=HTML %then %do;
   %if &platform=SASVIYA %then %do;
     filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
-      contenttype="text/html"; 
+      contenttype="text/html";
   %end;
 %end;
 %else %do;
@@ -110,6 +112,11 @@
   %return;
 %end;
 
-%mp_binarycopy(inloc="&inloc",outref=_webout)
+%if &inref ne 0 %then %do;
+ %mp_binarycopy(inref=&inref,outref=_webout)
+%end;
+%else %do;
+ %mp_binarycopy(inloc="&inloc",outref=_webout)
+%end;
 
 %mend;