Merge pull request #232 from sasjs/allanbowe/update-headers-in-sasjs-231

fix: using latest sasjs headers, closes #231

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;
@@ -369,6 +369,48 @@ https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/baseplus.md#functionex
 %mend mf_existvarlist;
 
 /** @endcond *//**
+  @file
+  @brief Returns E8601DT26.6 if compatible else DATETIME19.3
+  @details From our experience in [Data Controller for SAS]
+  (https://datacontroller.io) deployments, the E8601DT26.6 datetime format has
+  the widest support when it comes to pass-through SQL queries.
+
+  However, it is not supported in WPS or early versions of SAS 9 (M3 and below)
+  when used as a datetime literal, eg:
+
+      data _null_;
+        demo="%sysfunc(datetime(),E8601DT26.6)"dt;
+        demo=;
+      run;
+
+  This macro will therefore return DATEITME19.3 as an alternative format
+  based on the runtime environment so that it can be used in such cases, eg:
+
+      data _null_;
+        demo="%sysfunc(datetime(),%mf_fmtdttm())"dt;
+        demo=;
+      run;
+
+  <h4> Related Macros </h4>
+  @li mf_fmtdttm.test.sas
+
+  @author Allan Bowe
+**/
+
+%macro mf_fmtdttm(
+)/*/STORE SOURCE*/;
+
+%if "&sysver"="9.2" or "&sysver"="9.3"
+  or ("&sysver"="9.4" and "%substr(&SYSVLONG,9,1)" le "3")
+  or "%substr(&sysver,1,1)"="4"
+  or "%substr(&sysver,1,1)"="5"
+%then %do;DATETIME19.3%end;
+%else %do;E8601DT26.6%end;
+
+%mend mf_fmtdttm;
+
+
+/**
   @file
   @brief Returns the appLoc from the _program variable
   @details When working with SASjs apps, web services / tests / jobs are always
@@ -994,12 +1036,12 @@ or %index(&pgm,/tests/testteardown)
   @brief Returns an unused libref
   @details Use as follows:
 
-    libname mclib0 (work);
-    libname mclib1 (work);
-    libname mclib2 (work);
+      libname mclib0 (work);
+      libname mclib1 (work);
+      libname mclib2 (work);
 
-    %let libref=%mf_getuniquelibref();
-    %put &=libref;
+      %let libref=%mf_getuniquelibref();
+      %put &=libref;
 
   which returns:
 
@@ -1148,33 +1190,50 @@ or %index(&pgm,/tests/testteardown)
   @file
   @brief Returns number of variables in a dataset
   @details Useful to identify those renagade datasets that have no columns!
+  Can also be used to count for numeric, or character columns
 
-        %put Number of Variables=%mf_getvarcount(sashelp.class);
+      %put Number of Variables=%mf_getvarcount(sashelp.class);
+      %put Character Variables=%mf_getvarcount(sashelp.class,typefilter=C);
+      %put Numeric Variables = %mf_getvarcount(sashelp.class,typefilter=N);
 
   returns:
   > Number of Variables=4
 
-  @param libds Two part dataset (or view) reference.
+
+  @param [in] libds Two part dataset (or view) reference.
+  @param [in] typefilter= (A) Filter for certain types of column.  Valid values:
+    @li A Count All columns
+    @li C Count Character columns only
+    @li N Count Numeric columns only
 
   @version 9.2
   @author Allan Bowe
 
 **/
 
-%macro mf_getvarcount(libds
+%macro mf_getvarcount(libds,typefilter=A
 )/*/STORE SOURCE*/;
-  %local dsid nvars rc ;
+  %local dsid nvars rc outcnt x;
   %let dsid=%sysfunc(open(&libds));
   %let nvars=.;
+  %let outcnt=0;
+  %let typefilter=%upcase(&typefilter);
   %if &dsid %then %do;
     %let nvars=%sysfunc(attrn(&dsid,NVARS));
+    %if &typefilter=A %then %let outcnt=&nvars;
+    %else %if &nvars>0 %then %do x=1 %to &nvars;
+      /* increment based on variable type */
+      %if %sysfunc(vartype(&dsid,&x))=&typefilter %then %do;
+        %let outcnt=%eval(&outcnt+1);
+      %end;
+    %end;
     %let rc=%sysfunc(close(&dsid));
   %end;
   %else %do;
     %put unable to open &libds (rc=&dsid);
     %let rc=%sysfunc(close(&dsid));
   %end;
-  &nvars
+  &outcnt
 %mend mf_getvarcount;/**
   @file
   @brief Returns the format of a variable
@@ -2203,7 +2262,12 @@ Usage:
     or "&SYSPROCESSNAME "="Compute Server "
     or &mode=INCLUDE
   %then %do;
-    options obs=max replace nosyntaxcheck mprint;
+    options obs=max replace mprint;
+    %if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5"
+    %then %do;
+      options nosyntaxcheck;
+    %end;
+
     %if &mode=INCLUDE %then %do;
       %if %sysfunc(exist(&errds))=1 %then %do;
         data _null_;
@@ -7458,6 +7522,7 @@ create table &outsummary as
   <h4> SAS Macros </h4>
   @li mcf_length.sas
   @li mf_getuniquename.sas
+  @li mf_getvarcount.sas
   @li mf_getvarlist.sas
   @li mf_getvartype.sas
   @li mf_getvarformat.sas
@@ -7477,7 +7542,7 @@ create table &outsummary as
   ,outds=work.mp_getmaxvarlengths
 )/*/STORE SOURCE*/;
 
-%local vars prefix x var fmt;
+%local vars prefix x var fmt srcds;
 %let vars=%mf_getvarlist(libds=&libds);
 %let prefix=%substr(%mf_getuniquename(),1,25);
 %let num2char=%upcase(&num2char);
@@ -7487,6 +7552,24 @@ create table &outsummary as
   %mcf_length(wrap=YES, insert_cmplib=YES)
 %end;
 
+%if &num2char=NO
+  and ("%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5")
+  and %mf_getvarcount(&libds,typefilter=N) gt 0
+%then %do;
+  /* custom functions not supported in summary operations */
+  %let srcds=%mf_getuniquename();
+  data &srcds/view=&srcds;
+    set &libds;
+  %do x=1 %to %sysfunc(countw(&vars,%str( )));
+    %let var=%scan(&vars,&x);
+    %if %mf_getvartype(&libds,&var)=N %then %do;
+      &prefix.&x=mcf_length(&var);
+    %end;
+  %end;
+  run;
+%end;
+%else %let srcds=&libds;
+
 proc sql;
 create table &outds (rename=(
     %do x=1 %to %sysfunc(countw(&vars,%str( )));
@@ -7511,10 +7594,15 @@ create table &outds (rename=(
         %end;
       %end;
       %else %do;
-        max(mcf_length(&var)) as &prefix.&x
+        %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do;
+          max(&prefix.&x) as &prefix.&x
+        %end;
+        %else %do;
+          max(mcf_length(&var)) as &prefix.&x
+        %end;
       %end;
     %end;
-  from &libds;
+  from &srcds;
 
   proc transpose data=&outds
     out=&outds(rename=(_name_=NAME COL1=MAXLEN));
@@ -8443,7 +8531,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;
@@ -9213,6 +9301,7 @@ options ibufsize=&ibufsize;
   @param [in] loop_secs= (1) Seconds to wait between each lock attempt
 
   <h4> SAS Macros </h4>
+  @li mf_fmtdttm.sas
   @li mp_abort.sas
   @li mp_lockfilecheck.sas
   @li mf_getuser.sas
@@ -9302,7 +9391,7 @@ run;
       LOCK_LIB ="&lib";
       LOCK_DS="&ds";
       LOCK_STATUS_CD='LOCKED';
-      LOCK_START_DTTM="%sysfunc(datetime(),E8601DT26.6)"dt;
+      LOCK_START_DTTM="%sysfunc(datetime(),%mf_fmtdttm())"dt;
       LOCK_USER_NM="&user";
       LOCK_PID="&sysjobid";
       LOCK_REF="&ref";
@@ -9322,7 +9411,7 @@ run;
     proc sql;
     update &ctl_ds
       set LOCK_STATUS_CD='LOCKED'
-        , LOCK_START_DTTM="%sysfunc(datetime(),E8601DT26.6)"dt
+        , LOCK_START_DTTM="%sysfunc(datetime(),%mf_fmtdttm())"dt
         , LOCK_USER_NM="&user"
         , LOCK_PID="&sysjobid"
         , LOCK_REF="&ref"
@@ -9397,7 +9486,7 @@ run;
     proc sql;
     update &ctl_ds
       set LOCK_STATUS_CD='UNLOCKED'
-        , LOCK_END_DTTM="%sysfunc(datetime(),E8601DT26.6)"dt
+        , LOCK_END_DTTM="%sysfunc(datetime(),%mf_fmtdttm())"dt
         , LOCK_USER_NM="&user"
         , LOCK_PID="&sysjobid"
         , LOCK_REF="&ref"
@@ -10186,6 +10275,7 @@ run;
 
   <h4> SAS Macros </h4>
   @li mf_existvar.sas
+  @li mf_fmtdttm.sas
   @li mf_getquotedstr.sas
   @li mf_getuniquename.sas
   @li mf_nobs.sas
@@ -10345,12 +10435,12 @@ quit;
     set keytable="&base_libds"
       ,keycolumn="&retained_key"
       ,max_key=%eval(&maxkey+&newkey_cnt)
-      ,processed_dttm="%sysfunc(datetime(),E8601DT26.6)"dt;
+      ,processed_dttm="%sysfunc(datetime(),%mf_fmtdttm())"dt;
   %end;
   %else %do;
   update &maxkeytable
     set max_key=%eval(&maxkey+&newkey_cnt)
-      ,processed_dttm="%sysfunc(datetime(),E8601DT26.6)"dt
+      ,processed_dttm="%sysfunc(datetime(),%mf_fmtdttm())"dt
     where keytable="&base_libds";
   %end;
   %mp_lockanytable(UNLOCK
@@ -11546,7 +11636,7 @@ select distinct tgtvar_nm into: missvars separated by ' '
 data &ds1;
   set &dslist indsname=&inds_auto;
   &hashkey=put(md5(catx('|',%mf_getquotedstr(&key,quote=N))),$hex32.);
-  &inds_keep=&inds_auto;
+  &inds_keep=upcase(&inds_auto);
 proc sort;
   by &inds_keep &hashkey;
 run;
@@ -11581,8 +11671,8 @@ data &ds4;
   tgtvar_nm=upcase(tgtvar_nm);
   if tgtvar_nm in (%upcase(&vlist));
 
-  if &inds_auto="&ds2" then tgtvar_type='N';
-  else if &inds_auto="&ds3" then tgtvar_type='C';
+  if upcase(&inds_auto)="&ds2" then tgtvar_type='N';
+  else if upcase(&inds_auto)="&ds3" then tgtvar_type='C';
   else do;
     putlog "%str(ERR)OR: unidentified vartype input!" &inds_auto;
     call symputx('syscc',98);
@@ -19229,8 +19319,8 @@ data _null_;
   file &fname1 lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Content-Type: multipart/form-data; boundary=&boundary";
-  put "Authorization: Bearer " _infile_;
+  if _n_=1 then put "Content-Type: multipart/form-data; boundary=&boundary";
+  put _infile_;
 run;
 
 %if &mdebug=1 %then %do;
@@ -19360,9 +19450,11 @@ data _null_;
   file &fref1 lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Authorization: Bearer " _infile_;
-  put "Content-Type: application/json";
-  put "accept: application/json";
+  if _n_=1 then do;
+    put "Content-Type: application/json";
+    put "accept: application/json";
+  end;
+  put _infile_;
 run;
 
 %if &mdebug=1 %then %do;
@@ -19807,6 +19899,11 @@ data _null_;
   put '%end; ';
   put ' ';
   put '%else %if &action=ARR or &action=OBJ %then %do; ';
+  put '  %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do; ';
+  put '    /* functions in formats unsupported */ ';
+  put '    %put &sysmacroname: forcing missing back to NULL as feature not supported; ';
+  put '    %let missing=NULL; ';
+  put '  %end; ';
   put '  %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref ';
   put '    ,engine=DATASTEP,missing=&missing,showmeta=&showmeta ';
   put '  ) ';
@@ -19982,7 +20079,7 @@ data _null_;
   file &headref lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Authorization: Bearer " _infile_;
+  put _infile_;
 run;
 
 proc http method='DELETE' headerin=&headref
@@ -20031,7 +20128,7 @@ data _null_;
   file &headref lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Authorization: Bearer " _infile_;
+  put _infile_;
 run;
 
 proc http method='GET' out=&binaryfref headerin=&headref
@@ -20102,8 +20199,8 @@ data _null_;
   file &fref0 lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Authorization: Bearer " _infile_;
-  put "accept: application/json";
+  if _n_=1 then put "accept: application/json";
+  put _infile_;
 run;
 
 %if &mdebug=1 %then %do;
@@ -20290,8 +20387,8 @@ data _null_;
   file &authref lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put 'Authorization: Bearer ' _infile_;
-  put "Content-Type: multipart/form-data; boundary=&boundary";
+  if _n_=1 then put "Content-Type: multipart/form-data; boundary=&boundary";
+  put _infile_;
 run;
 
 %if &mdebug=1 %then %do;
@@ -20409,7 +20506,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_;
@@ -20432,13 +20529,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;
 
@@ -20601,6 +20700,11 @@ run;
 %end;
 
 %else %if &action=ARR or &action=OBJ %then %do;
+  %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do;
+    /* functions in formats unsupported */
+    %put &sysmacroname: forcing missing back to NULL as feature not supported;
+    %let missing=NULL;
+  %end;
   %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref
     ,engine=DATASTEP,missing=&missing,showmeta=&showmeta
   )

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/mf_fmtdttm.sas

@@ -0,0 +1,42 @@
+/**
+  @file
+  @brief Returns E8601DT26.6 if compatible else DATETIME19.3
+  @details From our experience in [Data Controller for SAS]
+  (https://datacontroller.io) deployments, the E8601DT26.6 datetime format has
+  the widest support when it comes to pass-through SQL queries.
+
+  However, it is not supported in WPS or early versions of SAS 9 (M3 and below)
+  when used as a datetime literal, eg:
+
+      data _null_;
+        demo="%sysfunc(datetime(),E8601DT26.6)"dt;
+        demo=;
+      run;
+
+  This macro will therefore return DATEITME19.3 as an alternative format
+  based on the runtime environment so that it can be used in such cases, eg:
+
+      data _null_;
+        demo="%sysfunc(datetime(),%mf_fmtdttm())"dt;
+        demo=;
+      run;
+
+  <h4> Related Macros </h4>
+  @li mf_fmtdttm.test.sas
+
+  @author Allan Bowe
+**/
+
+%macro mf_fmtdttm(
+)/*/STORE SOURCE*/;
+
+%if "&sysver"="9.2" or "&sysver"="9.3"
+  or ("&sysver"="9.4" and "%substr(&SYSVLONG,9,1)" le "3")
+  or "%substr(&sysver,1,1)"="4"
+  or "%substr(&sysver,1,1)"="5"
+%then %do;DATETIME19.3%end;
+%else %do;E8601DT26.6%end;
+
+%mend mf_fmtdttm;
+
+

base/mf_getuniquelibref.sas

@@ -3,12 +3,12 @@
   @brief Returns an unused libref
   @details Use as follows:
 
-    libname mclib0 (work);
-    libname mclib1 (work);
-    libname mclib2 (work);
+      libname mclib0 (work);
+      libname mclib1 (work);
+      libname mclib2 (work);
 
-    %let libref=%mf_getuniquelibref();
-    %put &=libref;
+      %let libref=%mf_getuniquelibref();
+      %put &=libref;
 
   which returns:
 

base/mf_getvarcount.sas

@@ -2,31 +2,48 @@
   @file
   @brief Returns number of variables in a dataset
   @details Useful to identify those renagade datasets that have no columns!
+  Can also be used to count for numeric, or character columns
 
-        %put Number of Variables=%mf_getvarcount(sashelp.class);
+      %put Number of Variables=%mf_getvarcount(sashelp.class);
+      %put Character Variables=%mf_getvarcount(sashelp.class,typefilter=C);
+      %put Numeric Variables = %mf_getvarcount(sashelp.class,typefilter=N);
 
   returns:
   > Number of Variables=4
 
-  @param libds Two part dataset (or view) reference.
+
+  @param [in] libds Two part dataset (or view) reference.
+  @param [in] typefilter= (A) Filter for certain types of column.  Valid values:
+    @li A Count All columns
+    @li C Count Character columns only
+    @li N Count Numeric columns only
 
   @version 9.2
   @author Allan Bowe
 
 **/
 
-%macro mf_getvarcount(libds
+%macro mf_getvarcount(libds,typefilter=A
 )/*/STORE SOURCE*/;
-  %local dsid nvars rc ;
+  %local dsid nvars rc outcnt x;
   %let dsid=%sysfunc(open(&libds));
   %let nvars=.;
+  %let outcnt=0;
+  %let typefilter=%upcase(&typefilter);
   %if &dsid %then %do;
     %let nvars=%sysfunc(attrn(&dsid,NVARS));
+    %if &typefilter=A %then %let outcnt=&nvars;
+    %else %if &nvars>0 %then %do x=1 %to &nvars;
+      /* increment based on variable type */
+      %if %sysfunc(vartype(&dsid,&x))=&typefilter %then %do;
+        %let outcnt=%eval(&outcnt+1);
+      %end;
+    %end;
     %let rc=%sysfunc(close(&dsid));
   %end;
   %else %do;
     %put unable to open &libds (rc=&dsid);
     %let rc=%sysfunc(close(&dsid));
   %end;
-  &nvars
+  &outcnt
 %mend mf_getvarcount;

base/mp_abort.sas

@@ -89,7 +89,12 @@
     or "&SYSPROCESSNAME "="Compute Server "
     or &mode=INCLUDE
   %then %do;
-    options obs=max replace nosyntaxcheck mprint;
+    options obs=max replace mprint;
+    %if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5"
+    %then %do;
+      options nosyntaxcheck;
+    %end;
+
     %if &mode=INCLUDE %then %do;
       %if %sysfunc(exist(&errds))=1 %then %do;
         data _null_;

base/mp_getmaxvarlengths.sas

@@ -41,6 +41,7 @@
   <h4> SAS Macros </h4>
   @li mcf_length.sas
   @li mf_getuniquename.sas
+  @li mf_getvarcount.sas
   @li mf_getvarlist.sas
   @li mf_getvartype.sas
   @li mf_getvarformat.sas
@@ -60,7 +61,7 @@
   ,outds=work.mp_getmaxvarlengths
 )/*/STORE SOURCE*/;
 
-%local vars prefix x var fmt;
+%local vars prefix x var fmt srcds;
 %let vars=%mf_getvarlist(libds=&libds);
 %let prefix=%substr(%mf_getuniquename(),1,25);
 %let num2char=%upcase(&num2char);
@@ -70,6 +71,24 @@
   %mcf_length(wrap=YES, insert_cmplib=YES)
 %end;
 
+%if &num2char=NO
+  and ("%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5")
+  and %mf_getvarcount(&libds,typefilter=N) gt 0
+%then %do;
+  /* custom functions not supported in summary operations */
+  %let srcds=%mf_getuniquename();
+  data &srcds/view=&srcds;
+    set &libds;
+  %do x=1 %to %sysfunc(countw(&vars,%str( )));
+    %let var=%scan(&vars,&x);
+    %if %mf_getvartype(&libds,&var)=N %then %do;
+      &prefix.&x=mcf_length(&var);
+    %end;
+  %end;
+  run;
+%end;
+%else %let srcds=&libds;
+
 proc sql;
 create table &outds (rename=(
     %do x=1 %to %sysfunc(countw(&vars,%str( )));
@@ -94,10 +113,15 @@ create table &outds (rename=(
         %end;
       %end;
       %else %do;
-        max(mcf_length(&var)) as &prefix.&x
+        %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do;
+          max(&prefix.&x) as &prefix.&x
+        %end;
+        %else %do;
+          max(mcf_length(&var)) as &prefix.&x
+        %end;
       %end;
     %end;
-  from &libds;
+  from &srcds;
 
   proc transpose data=&outds
     out=&outds(rename=(_name_=NAME COL1=MAXLEN));

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_lockanytable.sas

@@ -22,6 +22,7 @@
   @param [in] loop_secs= (1) Seconds to wait between each lock attempt
 
   <h4> SAS Macros </h4>
+  @li mf_fmtdttm.sas
   @li mp_abort.sas
   @li mp_lockfilecheck.sas
   @li mf_getuser.sas
@@ -111,7 +112,7 @@ run;
       LOCK_LIB ="&lib";
       LOCK_DS="&ds";
       LOCK_STATUS_CD='LOCKED';
-      LOCK_START_DTTM="%sysfunc(datetime(),E8601DT26.6)"dt;
+      LOCK_START_DTTM="%sysfunc(datetime(),%mf_fmtdttm())"dt;
       LOCK_USER_NM="&user";
       LOCK_PID="&sysjobid";
       LOCK_REF="&ref";
@@ -131,7 +132,7 @@ run;
     proc sql;
     update &ctl_ds
       set LOCK_STATUS_CD='LOCKED'
-        , LOCK_START_DTTM="%sysfunc(datetime(),E8601DT26.6)"dt
+        , LOCK_START_DTTM="%sysfunc(datetime(),%mf_fmtdttm())"dt
         , LOCK_USER_NM="&user"
         , LOCK_PID="&sysjobid"
         , LOCK_REF="&ref"
@@ -206,7 +207,7 @@ run;
     proc sql;
     update &ctl_ds
       set LOCK_STATUS_CD='UNLOCKED'
-        , LOCK_END_DTTM="%sysfunc(datetime(),E8601DT26.6)"dt
+        , LOCK_END_DTTM="%sysfunc(datetime(),%mf_fmtdttm())"dt
         , LOCK_USER_NM="&user"
         , LOCK_PID="&sysjobid"
         , LOCK_REF="&ref"

base/mp_retainedkey.sas

@@ -58,6 +58,7 @@
 
   <h4> SAS Macros </h4>
   @li mf_existvar.sas
+  @li mf_fmtdttm.sas
   @li mf_getquotedstr.sas
   @li mf_getuniquename.sas
   @li mf_nobs.sas
@@ -217,12 +218,12 @@ quit;
     set keytable="&base_libds"
       ,keycolumn="&retained_key"
       ,max_key=%eval(&maxkey+&newkey_cnt)
-      ,processed_dttm="%sysfunc(datetime(),E8601DT26.6)"dt;
+      ,processed_dttm="%sysfunc(datetime(),%mf_fmtdttm())"dt;
   %end;
   %else %do;
   update &maxkeytable
     set max_key=%eval(&maxkey+&newkey_cnt)
-      ,processed_dttm="%sysfunc(datetime(),E8601DT26.6)"dt
+      ,processed_dttm="%sysfunc(datetime(),%mf_fmtdttm())"dt
     where keytable="&base_libds";
   %end;
   %mp_lockanytable(UNLOCK

base/mp_storediffs.sas

@@ -125,7 +125,7 @@
 data &ds1;
   set &dslist indsname=&inds_auto;
   &hashkey=put(md5(catx('|',%mf_getquotedstr(&key,quote=N))),$hex32.);
-  &inds_keep=&inds_auto;
+  &inds_keep=upcase(&inds_auto);
 proc sort;
   by &inds_keep &hashkey;
 run;
@@ -160,8 +160,8 @@ data &ds4;
   tgtvar_nm=upcase(tgtvar_nm);
   if tgtvar_nm in (%upcase(&vlist));
 
-  if &inds_auto="&ds2" then tgtvar_type='N';
-  else if &inds_auto="&ds3" then tgtvar_type='C';
+  if upcase(&inds_auto)="&ds2" then tgtvar_type='N';
+  else if upcase(&inds_auto)="&ds3" then tgtvar_type='C';
   else do;
     putlog "%str(ERR)OR: unidentified vartype input!" &inds_auto;
     call symputx('syscc',98);

server/ms_createfile.sas

@@ -68,8 +68,8 @@ data _null_;
   file &fname1 lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Content-Type: multipart/form-data; boundary=&boundary";
-  put "Authorization: Bearer " _infile_;
+  if _n_=1 then put "Content-Type: multipart/form-data; boundary=&boundary";
+  put _infile_;
 run;
 
 %if &mdebug=1 %then %do;

server/ms_createuser.sas

@@ -87,9 +87,11 @@ data _null_;
   file &fref1 lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Authorization: Bearer " _infile_;
-  put "Content-Type: application/json";
-  put "accept: application/json";
+  if _n_=1 then do;
+    put "Content-Type: application/json";
+    put "accept: application/json";
+  end;
+  put _infile_;
 run;
 
 %if &mdebug=1 %then %do;

server/ms_createwebservice.sas

@@ -390,6 +390,11 @@ data _null_;
   put '%end; ';
   put ' ';
   put '%else %if &action=ARR or &action=OBJ %then %do; ';
+  put '  %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do; ';
+  put '    /* functions in formats unsupported */ ';
+  put '    %put &sysmacroname: forcing missing back to NULL as feature not supported; ';
+  put '    %let missing=NULL; ';
+  put '  %end; ';
   put '  %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref ';
   put '    ,engine=DATASTEP,missing=&missing,showmeta=&showmeta ';
   put '  ) ';

server/ms_deletefile.sas

@@ -33,7 +33,7 @@ data _null_;
   file &headref lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Authorization: Bearer " _infile_;
+  put _infile_;
 run;
 
 proc http method='DELETE' headerin=&headref

server/ms_getfile.sas

@@ -34,7 +34,7 @@ data _null_;
   file &headref lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Authorization: Bearer " _infile_;
+  put _infile_;
 run;
 
 proc http method='GET' out=&binaryfref headerin=&headref

server/ms_getusers.sas

@@ -56,8 +56,8 @@ data _null_;
   file &fref0 lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put "Authorization: Bearer " _infile_;
-  put "accept: application/json";
+  if _n_=1 then put "accept: application/json";
+  put _infile_;
 run;
 
 %if &mdebug=1 %then %do;

server/ms_runstp.sas

@@ -137,8 +137,8 @@ data _null_;
   file &authref lrecl=1000;
   infile "&_sasjs_tokenfile" lrecl=1000;
   input;
-  put 'Authorization: Bearer ' _infile_;
-  put "Content-Type: multipart/form-data; boundary=&boundary";
+  if _n_=1 then put "Content-Type: multipart/form-data; boundary=&boundary";
+  put _infile_;
 run;
 
 %if &mdebug=1 %then %do;

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;
 

server/ms_webout.sas

@@ -100,6 +100,11 @@
 %end;
 
 %else %if &action=ARR or &action=OBJ %then %do;
+  %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do;
+    /* functions in formats unsupported */
+    %put &sysmacroname: forcing missing back to NULL as feature not supported;
+    %let missing=NULL;
+  %end;
   %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref
     ,engine=DATASTEP,missing=&missing,showmeta=&showmeta
   )

tests/crossplatform/mf_fmtdttm.test.sas

@@ -0,0 +1,22 @@
+/**
+  @file
+  @brief Testing mf_fmtdttm macro
+
+  <h4> SAS Macros </h4>
+  @li mf_fmtdttm.sas
+  @li mp_assert.sas
+  @li mp_assertscope.sas
+
+**/
+
+%global test1;
+
+%mp_assertscope(SNAPSHOT)
+%let test1=%mf_fmtdttm();
+%mp_assertscope(COMPARE,ignorelist=test1)
+
+%mp_assert(
+  iftrue=("&test1"="DATETIME19.3" or "&test1"="E8601DT26.6"),
+  desc=Basic test,
+  outds=work.test_results
+)

tests/crossplatform/mf_getvarcount.test.sas

@@ -0,0 +1,46 @@
+/**
+  @file
+  @brief Testing mf_getvarlist macro
+
+  <h4> SAS Macros </h4>
+  @li mf_getvarcount.sas
+  @li mp_assertscope.sas
+
+**/
+
+data work.all work.nums(keep=num1 num2) work.chars(keep=char1 char2);
+  length num1 num2 8 char1 char2 char3 $4;
+  call missing (of _all_);
+  output;
+run;
+
+%mp_assertscope(SNAPSHOT)
+%put scope check:%mf_getvarcount(work.all);
+%mp_assertscope(COMPARE)
+
+%mp_assert(
+  iftrue=(%mf_getvarcount(work.all)=5),
+  desc=%str(Checking for mixed vars),
+  outds=work.test_results
+)
+%mp_assert(
+  iftrue=(%mf_getvarcount(work.all,typefilter=C)=3),
+  desc=%str(Checking for char in mixed vars),
+  outds=work.test_results
+)
+%mp_assert(
+  iftrue=(%mf_getvarcount(work.all,typefilter=N)=2),
+  desc=%str(Checking for num in mixed vars),
+  outds=work.test_results
+)
+%mp_assert(
+  iftrue=(%mf_getvarcount(work.nums,typefilter=c)=0),
+  desc=%str(Checking for char in num vars),
+  outds=work.test_results
+)
+%mp_assert(
+  iftrue=(%mf_getvarcount(work.chars,typefilter=N)=0),
+  desc=%str(Checking for num in char vars),
+  outds=work.test_results
+)
+

tests/crossplatform/mp_getmaxvarlengths.test.sas

@@ -10,10 +10,48 @@
 
 **/
 
+data work.class ;
+attrib
+Name                             length= $8
+Sex                              length= $1
+Age                              length= 8
+Height                           length= 8
+Weight                           length= 8
+;
+infile cards dsd;
+input
+  Name                             :$char.
+  Sex                              :$char.
+  Age
+  Height
+  Weight
+;
+datalines4;
+Alfred,M,14,69,112.5
+Alice,F,13,56.5,84
+Barbara,F,13,65.3,98
+Carol,F,14,62.8,102.5
+Henry,M,14,63.5,102.5
+James,M,12,57.3,83
+Jane,F,12,59.8,84.5
+Janet,F,15,62.5,112.5
+Jeffrey,M,13,62.5,84
+John,M,12,59,99.5
+Joyce,F,11,51.3,50.5
+Judy,F,14,64.3,90
+Louise,F,12,56.3,77
+Mary,F,15,66.5,112
+Philip,M,16,72,150
+Robert,M,12,64.8,128
+Ronald,M,15,67,133
+Thomas,M,11,57.5,85
+William,M,15,66.5,112
+;;;;
+run;
 
 /* regular usage */
 %mp_assertscope(SNAPSHOT)
-%mp_getmaxvarlengths(sashelp.class,outds=work.myds)
+%mp_getmaxvarlengths(work.class,outds=work.myds)
 %mp_assertscope(COMPARE,desc=checking scope leakage on mp_getmaxvarlengths)
 %mp_assert(
   iftrue=(&syscc=0),