fix: conditional execution of mp_init()

feat: adding MARKDOWN support to `mp_streamfile()`

all.sas

@@ -188,7 +188,7 @@ options noquotelenmax;
     %put No feature was requested for detection;
   %end;
   %else %if &feature=COLCONSTRAINTS %then %do;
-    %if %substr(&sysver,1,1)=4 %then 0;
+    %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then 0;
     %else 1;
   %end;
   %else %if &feature=PROCLUA %then %do;
@@ -8443,7 +8443,7 @@ options
   validvarname=V7         /* avoid special characters etc in variable names */
   varinitchk=%str(ERR)OR  /* avoid data mistakes from variable name typos   */
   varlenchk=%str(ERR)OR   /* fail hard if truncation (data loss) can result */
-%if %substr(&sysver,1,1) ne 4 %then %do;
+%if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5" %then %do;
   noautocorrect           /* disallow misspelled procedure names            */
   dsoptions=note2err      /* undocumented - convert bad NOTEs to ERRs       */
 %end;
@@ -11722,8 +11722,9 @@ create table &outds as
 %mend mp_stprequests;/**
   @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.
+  @details Will set headers using appropriate functions per the server type
+  (Viya, EBI, [SASjs Server](https://github.com/sasjs/server)) and stream
+  content using mp_binarycopy().
 
   Usage:
 
@@ -11733,7 +11734,14 @@ create table &outds as
 
       %mp_streamfile(contenttype=csv,inloc=/some/where.txt,outname=myfile.txt)
 
-  @param [in] contenttype= (TEXT) Either TEXT, ZIP, CSV, EXCEL
+  @param [in] contenttype= (TEXT) Supported:
+    @li CSV
+    @li EXCEL
+    @li MARKDOWN
+    @li TEXT
+    @li ZIP
+    Feel free to submit PRs to support more mime types!  The official list is
+    here:  https://www.iana.org/assignments/media-types/media-types.xhtml
   @param [in] inloc= /path/to/file.ext to be sent
   @param [in] inref= fileref of file to be sent (if provided, overrides `inloc`)
   @param [in] iftrue= (1=1) Provide a condition under which to execute.
@@ -11779,7 +11787,7 @@ run;
 %if &contentype=CSV %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','application/csv');
+      rc=stpsrv_header('Content-Type','application/csv');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
@@ -11789,7 +11797,7 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,application/csv)
+    %mfs_httpheader(Content-Type,application/csv)
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;
@@ -11797,7 +11805,7 @@ run;
   /* suitable for XLS format */
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','application/vnd.ms-excel');
+      rc=stpsrv_header('Content-Type','application/vnd.ms-excel');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
@@ -11807,14 +11815,14 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,application/vnd.ms-excel)
+    %mfs_httpheader(Content-Type,application/vnd.ms-excel)
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;
 %else %if &contentype=GIF or &contentype=JPEG or &contentype=PNG %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type',"image/%lowcase(&contenttype)");
+      rc=stpsrv_header('Content-Type',"image/%lowcase(&contenttype)");
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
@@ -11822,30 +11830,30 @@ run;
       contenttype="image/%lowcase(&contenttype)";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,image/%lowcase(&contenttype))
+    %mfs_httpheader(Content-Type,image/%lowcase(&contenttype))
   %end;
 %end;
-%else %if &contentype=HTML %then %do;
+%else %if &contentype=HTML or &contenttype=MARKDOWN %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','text/html');
+      rc=stpsrv_header('Content-Type',"text/%lowcase(&contenttype)");
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
     filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
-      contenttype="text/html"
+      contenttype="text/%lowcase(&contenttype)"
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,text/html)
+    %mfs_httpheader(Content-Type,text/%lowcase(&contenttype))
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;
 %else %if &contentype=TEXT %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','application/text');
+      rc=stpsrv_header('Content-Type','application/text');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
@@ -11855,14 +11863,14 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,application/text)
+    %mfs_httpheader(Content-Type,application/text)
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;
 %else %if &contentype=WOFF or &contentype=WOFF2 or &contentype=TTF %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type',"font/%lowcase(&contenttype)");
+      rc=stpsrv_header('Content-Type',"font/%lowcase(&contenttype)");
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
@@ -11870,13 +11878,13 @@ run;
       contenttype="font/%lowcase(&contenttype)";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,font/%lowcase(&contenttype))
+    %mfs_httpheader(Content-Type,font/%lowcase(&contenttype))
   %end;
 %end;
 %else %if &contentype=XLSX %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type',
+      rc=stpsrv_header('Content-Type',
         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
@@ -11888,7 +11896,7 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type
+    %mfs_httpheader(Content-Type
       ,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
     )
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
@@ -11897,7 +11905,7 @@ run;
 %else %if &contentype=ZIP %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','application/zip');
+      rc=stpsrv_header('Content-Type','application/zip');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
@@ -11907,7 +11915,7 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,application/zip)
+    %mfs_httpheader(Content-Type,application/zip)
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;
@@ -20401,7 +20409,7 @@ options &optval;
   outref=0,
   outlogds=_null_
 )/*/STORE SOURCE*/;
-%local dbg fref1 chopout1 chopout2;
+%local dbg i var ds1 fref1 chopout1 chopout2;
 %if &mdebug=1 %then %do;
   %put &sysmacroname entry vars:;
   %put _local_;
@@ -20424,13 +20432,15 @@ options &optval;
 %let ds1=%mf_getuniquename();
 data &ds1;
   length fileref $8 name $32 filename $256 var $300;
-  webcount=countw("&inputfiles");
-  do i=1 to webcount;
-    var=scan("&inputfiles",i,' ');
-    fileref=scan(var,1,':');
-    name=scan(var,2,':');
-    filename=cats(name,'.csv');
-    output;
+  if "&inputfiles" ne "0" then do;
+    webcount=countw("&inputfiles");
+    do i=1 to webcount;
+      var=scan("&inputfiles",i,' ');
+      fileref=scan(var,1,':');
+      name=scan(var,2,':');
+      filename=cats(name,'.csv');
+      output;
+    end;
   end;
 run;
 

base/mf_existfeature.sas

@@ -30,7 +30,7 @@
     %put No feature was requested for detection;
   %end;
   %else %if &feature=COLCONSTRAINTS %then %do;
-    %if %substr(&sysver,1,1)=4 %then 0;
+    %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then 0;
     %else 1;
   %end;
   %else %if &feature=PROCLUA %then %do;

base/mp_init.sas

@@ -67,7 +67,7 @@ options
   validvarname=V7         /* avoid special characters etc in variable names */
   varinitchk=%str(ERR)OR  /* avoid data mistakes from variable name typos   */
   varlenchk=%str(ERR)OR   /* fail hard if truncation (data loss) can result */
-%if %substr(&sysver,1,1) ne 4 %then %do;
+%if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5" %then %do;
   noautocorrect           /* disallow misspelled procedure names            */
   dsoptions=note2err      /* undocumented - convert bad NOTEs to ERRs       */
 %end;

base/mp_streamfile.sas

@@ -1,8 +1,9 @@
 /**
   @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.
+  @details Will set headers using appropriate functions per the server type
+  (Viya, EBI, [SASjs Server](https://github.com/sasjs/server)) and stream
+  content using mp_binarycopy().
 
   Usage:
 
@@ -12,7 +13,14 @@
 
       %mp_streamfile(contenttype=csv,inloc=/some/where.txt,outname=myfile.txt)
 
-  @param [in] contenttype= (TEXT) Either TEXT, ZIP, CSV, EXCEL
+  @param [in] contenttype= (TEXT) Supported:
+    @li CSV
+    @li EXCEL
+    @li MARKDOWN
+    @li TEXT
+    @li ZIP
+    Feel free to submit PRs to support more mime types!  The official list is
+    here:  https://www.iana.org/assignments/media-types/media-types.xhtml
   @param [in] inloc= /path/to/file.ext to be sent
   @param [in] inref= fileref of file to be sent (if provided, overrides `inloc`)
   @param [in] iftrue= (1=1) Provide a condition under which to execute.
@@ -58,7 +66,7 @@ run;
 %if &contentype=CSV %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','application/csv');
+      rc=stpsrv_header('Content-Type','application/csv');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
@@ -68,7 +76,7 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,application/csv)
+    %mfs_httpheader(Content-Type,application/csv)
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;
@@ -76,7 +84,7 @@ run;
   /* suitable for XLS format */
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','application/vnd.ms-excel');
+      rc=stpsrv_header('Content-Type','application/vnd.ms-excel');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
@@ -86,14 +94,14 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,application/vnd.ms-excel)
+    %mfs_httpheader(Content-Type,application/vnd.ms-excel)
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;
 %else %if &contentype=GIF or &contentype=JPEG or &contentype=PNG %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type',"image/%lowcase(&contenttype)");
+      rc=stpsrv_header('Content-Type',"image/%lowcase(&contenttype)");
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
@@ -101,30 +109,30 @@ run;
       contenttype="image/%lowcase(&contenttype)";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,image/%lowcase(&contenttype))
+    %mfs_httpheader(Content-Type,image/%lowcase(&contenttype))
   %end;
 %end;
-%else %if &contentype=HTML %then %do;
+%else %if &contentype=HTML or &contenttype=MARKDOWN %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','text/html');
+      rc=stpsrv_header('Content-Type',"text/%lowcase(&contenttype)");
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
     filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
-      contenttype="text/html"
+      contenttype="text/%lowcase(&contenttype)"
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,text/html)
+    %mfs_httpheader(Content-Type,text/%lowcase(&contenttype))
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;
 %else %if &contentype=TEXT %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','application/text');
+      rc=stpsrv_header('Content-Type','application/text');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
@@ -134,14 +142,14 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,application/text)
+    %mfs_httpheader(Content-Type,application/text)
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;
 %else %if &contentype=WOFF or &contentype=WOFF2 or &contentype=TTF %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type',"font/%lowcase(&contenttype)");
+      rc=stpsrv_header('Content-Type',"font/%lowcase(&contenttype)");
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
@@ -149,13 +157,13 @@ run;
       contenttype="font/%lowcase(&contenttype)";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,font/%lowcase(&contenttype))
+    %mfs_httpheader(Content-Type,font/%lowcase(&contenttype))
   %end;
 %end;
 %else %if &contentype=XLSX %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type',
+      rc=stpsrv_header('Content-Type',
         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
@@ -167,7 +175,7 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type
+    %mfs_httpheader(Content-Type
       ,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
     )
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
@@ -176,7 +184,7 @@ run;
 %else %if &contentype=ZIP %then %do;
   %if (&platform=SASMETA and &streamweb=1) %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','application/zip');
+      rc=stpsrv_header('Content-Type','application/zip');
       rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
     run;
   %end;
@@ -186,7 +194,7 @@ run;
       contentdisp="attachment; filename=&outname";
   %end;
   %else %if &platform=SASJS %then %do;
-    %mfs_httpheader(Content-type,application/zip)
+    %mfs_httpheader(Content-Type,application/zip)
     %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
   %end;
 %end;

server/ms_testservice.sas

@@ -59,7 +59,7 @@
   outref=0,
   outlogds=_null_
 )/*/STORE SOURCE*/;
-%local dbg fref1 chopout1 chopout2;
+%local dbg i var ds1 fref1 chopout1 chopout2;
 %if &mdebug=1 %then %do;
   %put &sysmacroname entry vars:;
   %put _local_;
@@ -82,13 +82,15 @@
 %let ds1=%mf_getuniquename();
 data &ds1;
   length fileref $8 name $32 filename $256 var $300;
-  webcount=countw("&inputfiles");
-  do i=1 to webcount;
-    var=scan("&inputfiles",i,' ');
-    fileref=scan(var,1,':');
-    name=scan(var,2,':');
-    filename=cats(name,'.csv');
-    output;
+  if "&inputfiles" ne "0" then do;
+    webcount=countw("&inputfiles");
+    do i=1 to webcount;
+      var=scan("&inputfiles",i,' ');
+      fileref=scan(var,1,':');
+      name=scan(var,2,':');
+      filename=cats(name,'.csv');
+      output;
+    end;
   end;
 run;