Merge pull request #285 from sasjs/mf_increment

feat: new mf_increment macro

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+## Issue
+
+Link any related issue(s) in this section.
+
+## Intent
+
+What this PR intends to achieve.
+
+## Implementation
+
+What code changes have been made to achieve the intent.
+
+## Checks
+
+- [ ] Code is formatted correctly (`sasjs lint`).
+- [ ] Any new functionality has been unit tested.
+- [ ] All unit tests are passing (`sasjs test`).

base/mf_existfeature.sas

@@ -40,6 +40,11 @@
     %else %if "&SYSVLONG" < "9.04.01M3" %then 0;
     %else 1;
   %end;
+  %else %if &feature=DBMS_MEMTYPE %then %do;
+    /* does dbms_memtype exist in dictionary.tables? */
+    %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then 0;
+    %else 1;
+  %end;
   %else %if &feature=EXPORTXLS %then %do;
     /* is it possible to PROC EXPORT an excel file? */
     %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then 1;

base/mf_existvarlist.sas

@@ -6,9 +6,6 @@
 
       %put %mf_existVarList(sashelp.class, age sex name dummyvar);
 
-  <h4> SAS Macros </h4>
-  @li mf_abort.sas
-
   @param libds 2 part dataset or view reference
   @param varlist space separated variable names
 

base/mf_getuser.sas

@@ -23,18 +23,19 @@
   @author Allan Bowe
 **/
 
-%macro mf_getuser(type=META
+%macro mf_getuser(
 )/*/STORE SOURCE*/;
-  %local user metavar;
-  %if &type=OS %then %let metavar=_secureusername;
-  %else %let metavar=_metaperson;
+  %local user;
 
-  %if %symexist(SYS_COMPUTE_SESSION_OWNER) %then %let user=&SYS_COMPUTE_SESSION_OWNER;
-  %else %if %symexist(&metavar) %then %do;
-    %if %length(&&&metavar)=0 %then %let user=&sysuserid;
+  %if %symexist(_sasjs_username) %then %let user=&_sasjs_username;
+  %else %if %symexist(SYS_COMPUTE_SESSION_OWNER) %then %do;
+    %let user=&SYS_COMPUTE_SESSION_OWNER;
+  %end;
+  %else %if %symexist(_metaperson) %then %do;
+    %if %length(&_metaperson)=0 %then %let user=&sysuserid;
     /* sometimes SAS will add @domain extension - remove for consistency */
     /* but be sure to quote in case of usernames with commas */
-    %else %let user=%unquote(%scan(%quote(&&&metavar),1,@));
+    %else %let user=%unquote(%scan(%quote(&_metaperson),1,@));
   %end;
   %else %let user=&sysuserid;
 

base/mf_increment.sas

@@ -0,0 +1,29 @@
+/**
+  @file
+  @brief Increments a macro variable
+  @details Useful outside of do-loops - will increment a macro variable every
+  time it is called.
+
+  Example:
+
+      %let cnt=1;
+      %put We have run %mf_increment(cnt) lines;
+      %put Now we have run %mf_increment(cnt) lines;
+      %put There are %mf_increment(cnt) lines in total;
+
+  @param [in] MACRO_NAME the name of the macro variable to increment
+  @param [in] ITER= The amount to add or subtract to the macro
+
+  <h4> Related Files </h4>
+  @li mf_increment.test.sas
+
+**/
+
+%macro mf_increment(macro_name,incr=1);
+
+  /* iterate the value */
+  %let &macro_name=%eval(&&&macro_name+&incr);
+  /* return the value */
+  &&&macro_name
+
+%mend mf_increment;

base/mp_abort.sas

@@ -8,23 +8,29 @@
 
   The method used varies according to the context.  Important points:
 
-  @li should not use endsas or abort cancel in 9.4m3 environments as this can
-    cause hung multibridge sessions and result in a frozen STP server
+  @li should not use endsas or abort cancel in 9.4m3 WIN environments as this
+    can cause hung multibridge sessions and result in a frozen STP server
+  @li The use of endsas in 9.4m6+ windows environments for POST requests to the
+    STP server can result in an empty response body
   @li should not use endsas in viya 3.5 as this destroys the session and cannot
     fetch results (although both mv_getjoblog.sas and the @sasjs/adapter will
     recognise this and fetch the log of the parent session instead)
   @li STP environments must finish cleanly to avoid the log being sent to
     _webout.  To assist with this, we also run stpsrvset('program error', 0)
-    and set SYSCC=0.  We take a unique "soft abort" approach - we open a macro
+    and set SYSCC=0.
+    Where possible, we take a unique "soft abort" approach - we open a macro
     but don't close it!  This works everywhere EXCEPT inside a \%include inside
     a macro.  For that, we recommend you use mp_include.sas to perform the
     include, and then call \%mp_abort(mode=INCLUDE) from the source program (ie,
     OUTSIDE of the top-parent macro).
+    The soft abort has become ineffective in 9.4m6 WINDOWS environments.  We are
+    currently investigating approaches to deal with this.
 
 
-  @param mac= to contain the name of the calling macro
+  @param mac= (mp_abort.sas) To contain the name of the calling macro. Do not
+    use &sysmacroname as this will always resolve to MP_ABORT.
   @param msg= message to be returned
-  @param iftrue= supply a condition under which the macro should be executed.
+  @param iftrue= (1=1) Supply a condition for which the macro should be executed
   @param errds= (work.mp_abort_errds) There is no clean way to end a process
     within a %include called within a macro.  Furthermore, there is no way to
     test if a macro is called within a %include.  To handle this particular
@@ -45,11 +51,12 @@
     @li REGULAR (default)
     @li INCLUDE
 
+  @version 9.4
+  @author Allan Bowe
+
   <h4> Related Macros </h4>
   @li mp_include.sas
 
-  @version 9.4
-  @author Allan Bowe
   @cond
 **/
 
@@ -58,174 +65,197 @@
   , mode=REGULAR
 )/*/STORE SOURCE*/;
 
-  %global sysprocessmode sysprocessname;
+%global sysprocessmode sysprocessname sasjs_stpsrv_header_loc sasjsprocessmode;
+%local fref fid i;
 
-  %if not(%eval(%unquote(&iftrue))) %then %return;
+%if not(%eval(%unquote(&iftrue))) %then %return;
 
-  %put NOTE: ///  mp_abort macro executing //;
-  %if %length(&mac)>0 %then %put NOTE- called by &mac;
-  %put NOTE - &msg;
+%put NOTE: ///  mp_abort macro executing //;
+%if %length(&mac)>0 %then %put NOTE- called by &mac;
+%put NOTE - &msg;
 
-  %if %symexist(_SYSINCLUDEFILEDEVICE)
-  /* abort cancel FILE does not restart outside the INCLUDE on Viya 3.5 */
-  and "&SYSPROCESSNAME " ne "Compute Server "
+%if %symexist(_SYSINCLUDEFILEDEVICE)
+/* abort cancel FILE does not restart outside the INCLUDE on Viya 3.5 */
+and %superq(SYSPROCESSNAME) ne %str(Compute Server)
+%then %do;
+  %if "*&_SYSINCLUDEFILEDEVICE*" ne "**" %then %do;
+    data &errds;
+      iftrue='1=1';
+      length mac $100 msg $5000;
+      mac=symget('mac');
+      msg=symget('msg');
+    run;
+    data _null_;
+      abort cancel FILE;
+    run;
+    %return;
+  %end;
+%end;
+
+/* Web App Context */
+%if %symexist(_PROGRAM)
+  or %superq(SYSPROCESSNAME) = %str(Compute Server)
+  or &mode=INCLUDE
+%then %do;
+  options obs=max replace mprint;
+  %if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5"
   %then %do;
-    %if "*&_SYSINCLUDEFILEDEVICE*" ne "**" %then %do;
-      data &errds;
-        iftrue='1=1';
-        length mac $100 msg $5000;
-        mac=symget('mac');
-        msg=symget('msg');
-      run;
+    options nosyntaxcheck;
+  %end;
+
+  %if &mode=INCLUDE %then %do;
+    %if %sysfunc(exist(&errds))=1 %then %do;
       data _null_;
-        abort cancel FILE;
+        set &errds;
+        call symputx('iftrue',iftrue,'l');
+        call symputx('mac',mac,'l');
+        call symputx('msg',msg,'l');
+        putlog (_all_)(=);
       run;
+      %if (&iftrue)=0 %then %return;
+    %end;
+    %else %do;
+      %put &sysmacroname: No include errors found;
       %return;
     %end;
   %end;
 
-  /* Web App Context */
-  %if %symexist(_PROGRAM)
-    or "&SYSPROCESSNAME "="Compute Server "
-    or &mode=INCLUDE
-  %then %do;
-    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_;
-          set &errds;
-          call symputx('iftrue',iftrue,'l');
-          call symputx('mac',mac,'l');
-          call symputx('msg',msg,'l');
-          putlog (_all_)(=);
-        run;
-        %if (&iftrue)=0 %then %return;
-      %end;
-      %else %do;
-        %put &sysmacroname: No include errors found;
-        %return;
-      %end;
-    %end;
-
-    /* extract log errs / warns, if exist */
-    %local logloc logline;
-    %global logmsg; /* capture global messages */
-    %if %symexist(SYSPRINTTOLOG) %then %let logloc=&SYSPRINTTOLOG;
-    %else %let logloc=%qsysfunc(getoption(LOG));
-    proc printto log=log;run;
-    %let logline=0;
-    %if %length(&logloc)>0 %then %do;
+  /* extract log errs / warns, if exist */
+  %local logloc logline;
+  %global logmsg; /* capture global messages */
+  %if %symexist(SYSPRINTTOLOG) %then %let logloc=&SYSPRINTTOLOG;
+  %else %let logloc=%qsysfunc(getoption(LOG));
+  proc printto log=log;run;
+  %let logline=0;
+  %if %length(&logloc)>0 %then %do;
+    data _null_;
+      infile &logloc lrecl=5000;
+      input; putlog _infile_;
+      i=1;
+      retain logonce 0;
+      if (
+          _infile_=:"%str(WARN)ING" or _infile_=:"%str(ERR)OR"
+        ) and logonce=0 then
+      do;
+        call symputx('logline',_n_);
+        logonce+1;
+      end;
+    run;
+    /* capture log including lines BEFORE the err */
+    %if &logline>0 %then %do;
       data _null_;
         infile &logloc lrecl=5000;
-        input; putlog _infile_;
+        input;
         i=1;
-        retain logonce 0;
-        if (
-            _infile_=:"%str(WARN)ING" or _infile_=:"%str(ERR)OR"
-          ) and logonce=0 then
-        do;
-          call symputx('logline',_n_);
-          logonce+1;
-        end;
-      run;
-      /* capture log including lines BEFORE the err */
-      %if &logline>0 %then %do;
-        data _null_;
-          infile &logloc lrecl=5000;
+        stoploop=0;
+        if _n_ ge &logline-15 and stoploop=0 then do until (i>22);
+          call symputx('logmsg',catx('\n',symget('logmsg'),_infile_));
           input;
-          i=1;
-          stoploop=0;
-          if _n_ ge &logline-15 and stoploop=0 then do until (i>22);
-            call symputx('logmsg',catx('\n',symget('logmsg'),_infile_));
-            input;
-            i+1;
-            stoploop=1;
-          end;
-          if stoploop=1 then stop;
-        run;
-      %end;
-    %end;
-
-    %if %symexist(SYS_JES_JOB_URI) %then %do;
-      /* setup webout */
-      OPTIONS NOBOMFILE;
-      %if "X&SYS_JES_JOB_URI.X"="XX" %then %do;
-          filename _webout temp lrecl=999999 mod;
-      %end;
-      %else %do;
-        filename _webout filesrvc parenturi="&SYS_JES_JOB_URI"
-          name="_webout.json" lrecl=999999 mod;
-      %end;
-    %end;
-
-    /* send response in SASjs JSON format */
-    data _null_;
-      file _webout mod lrecl=32000 encoding='utf-8';
-      length msg syswarningtext syserrortext $32767 ;
-      sasdatetime=datetime();
-      msg=symget('msg');
-    %if &logline>0 %then %do;
-      msg=cats(msg,'\n\nLog Extract:\n',symget('logmsg'));
-    %end;
-      /* escape the escapes */
-      msg=tranwrd(msg,'\','\\');
-      /* escape the quotes */
-      msg=tranwrd(msg,'"','\"');
-      /* ditch the CRLFs as chrome complains */
-      msg=compress(msg,,'kw');
-      /* quote without quoting the quotes (which are escaped instead) */
-      msg=cats('"',msg,'"');
-      if symexist('_debug') then debug=quote(trim(symget('_debug')));
-      else debug='""';
-      put '>>weboutBEGIN<<';
-      put '{"SYSDATE" : "' "&SYSDATE" '"';
-      put ',"SYSTIME" : "' "&SYSTIME" '"';
-      put ',"sasjsAbort" : [{';
-      put ' "MSG":' msg ;
-      put ' ,"MAC": "' "&mac" '"}]';
-      put ",""SYSUSERID"" : ""&sysuserid"" ";
-      put ',"_DEBUG":' debug ;
-      if symexist('_metauser') then do;
-        _METAUSER=quote(trim(symget('_METAUSER')));
-        put ",""_METAUSER"": " _METAUSER;
-        _METAPERSON=quote(trim(symget('_METAPERSON')));
-        put ',"_METAPERSON": ' _METAPERSON;
-      end;
-      if symexist('SYS_JES_JOB_URI') then do;
-        SYS_JES_JOB_URI=quote(trim(symget('SYS_JES_JOB_URI')));
-        put ',"SYS_JES_JOB_URI": ' SYS_JES_JOB_URI;
-      end;
-      _PROGRAM=quote(trim(resolve(symget('_PROGRAM'))));
-      put ',"_PROGRAM" : ' _PROGRAM ;
-      put ",""SYSCC"" : ""&syscc"" ";
-      syserrortext=quote(trim(symget('syserrortext')));
-      put ",""SYSERRORTEXT"" : " syserrortext;
-      put ",""SYSHOSTNAME"" : ""&syshostname"" ";
-      put ",""SYSJOBID"" : ""&sysjobid"" ";
-      put ",""SYSSCPL"" : ""&sysscpl"" ";
-      put ",""SYSSITE"" : ""&syssite"" ";
-      sysvlong=quote(trim(symget('sysvlong')));
-      put ',"SYSVLONG" : ' sysvlong;
-      syswarningtext=quote(trim(symget('syswarningtext')));
-      put ",""SYSWARNINGTEXT"" : " syswarningtext;
-      put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
-      put "}" @;
-      put '>>weboutEND<<';
-    run;
-
-    %put _all_;
-
-    %if "&sysprocessmode " = "SAS Stored Process Server " %then %do;
-      data _null_;
-        putlog 'stpsrvset program err and syscc';
-        rc=stpsrvset('program error', 0);
-        call symputx("syscc",0,"g");
+          i+1;
+          stoploop=1;
+        end;
+        if stoploop=1 then stop;
       run;
+    %end;
+  %end;
+
+  %if %symexist(SYS_JES_JOB_URI) %then %do;
+    /* setup webout for Viya */
+    options nobomfile;
+    %if "X&SYS_JES_JOB_URI.X"="XX" %then %do;
+        filename _webout temp lrecl=999999 mod;
+    %end;
+    %else %do;
+      filename _webout filesrvc parenturi="&SYS_JES_JOB_URI"
+        name="_webout.json" lrecl=999999 mod;
+    %end;
+  %end;
+  %else %if %sysfunc(filename(fref,&sasjs_stpsrv_header_loc))=0 %then %do;
+    options nobomfile;
+    /* set up http header for SASjs Server */
+    %let fid=%sysfunc(fopen(&fref,A));
+    %if &fid=0 %then %do;
+      %put %str(ERR)OR: %sysfunc(sysmsg());
+      %return;
+    %end;
+    %let rc=%sysfunc(fput(&fid,%str(Content-Type: application/json)));
+    %let rc=%sysfunc(fwrite(&fid));
+    %let rc=%sysfunc(fclose(&fid));
+    %let rc=%sysfunc(filename(&fref));
+  %end;
+
+  /* send response in SASjs JSON format */
+  data _null_;
+    file _webout mod lrecl=32000 encoding='utf-8';
+    length msg syswarningtext syserrortext $32767 mode $10 ;
+    sasdatetime=datetime();
+    msg=symget('msg');
+  %if &logline>0 %then %do;
+    msg=cats(msg,'\n\nLog Extract:\n',symget('logmsg'));
+  %end;
+    /* escape the escapes */
+    msg=tranwrd(msg,'\','\\');
+    /* escape the quotes */
+    msg=tranwrd(msg,'"','\"');
+    /* ditch the CRLFs as chrome complains */
+    msg=compress(msg,,'kw');
+    /* quote without quoting the quotes (which are escaped instead) */
+    msg=cats('"',msg,'"');
+    if symexist('_debug') then debug=quote(trim(symget('_debug')));
+    else debug='""';
+    if symget('sasjsprocessmode')='Stored Program' then mode='SASJS';
+    if mode ne 'SASJS' then put '>>weboutBEGIN<<';
+    put '{"SYSDATE" : "' "&SYSDATE" '"';
+    put ',"SYSTIME" : "' "&SYSTIME" '"';
+    put ',"sasjsAbort" : [{';
+    put ' "MSG":' msg ;
+    put ' ,"MAC": "' "&mac" '"}]';
+    put ",""SYSUSERID"" : ""&sysuserid"" ";
+    put ',"_DEBUG":' debug ;
+    if symexist('_metauser') then do;
+      _METAUSER=quote(trim(symget('_METAUSER')));
+      put ",""_METAUSER"": " _METAUSER;
+      _METAPERSON=quote(trim(symget('_METAPERSON')));
+      put ',"_METAPERSON": ' _METAPERSON;
+    end;
+    if symexist('SYS_JES_JOB_URI') then do;
+      SYS_JES_JOB_URI=quote(trim(symget('SYS_JES_JOB_URI')));
+      put ',"SYS_JES_JOB_URI": ' SYS_JES_JOB_URI;
+    end;
+    _PROGRAM=quote(trim(resolve(symget('_PROGRAM'))));
+    put ',"_PROGRAM" : ' _PROGRAM ;
+    put ",""SYSCC"" : ""&syscc"" ";
+    syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"');
+    put ",""SYSERRORTEXT"" : " syserrortext;
+    put ",""SYSHOSTNAME"" : ""&syshostname"" ";
+    put ",""SYSJOBID"" : ""&sysjobid"" ";
+    put ",""SYSSCPL"" : ""&sysscpl"" ";
+    put ",""SYSSITE"" : ""&syssite"" ";
+    sysvlong=quote(trim(symget('sysvlong')));
+    put ',"SYSVLONG" : ' sysvlong;
+    syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"');
+    put ",""SYSWARNINGTEXT"" : " syswarningtext;
+    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
+    put "}" ;
+    if mode ne 'SASJS' then put '>>weboutEND<<';
+  run;
+
+  %put _all_;
+
+  %if "&sysprocessmode " = "SAS Stored Process Server " %then %do;
+    data _null_;
+      putlog 'stpsrvset program err and syscc';
+      rc=stpsrvset('program error', 0);
+      call symputx("syscc",0,"g");
+    run;
+    %if &sysscp=WIN
+    and 1=0 /* deprecating this logic until we figure out a consistent abort */
+    and "%substr(%str(&sysvlong         ),1,8)"="9.04.01M"
+    and "%substr(%str(&sysvlong         ),9,1)">"5" %then %do;
+      /* skip approach (below) does not work in windows m6+ envs */
+      endsas;
+    %end;
+    %else %do;
       /**
         * endsas kills 9.4m3 deployments by orphaning multibridges.
         * Abort variants are ungraceful (non zero return code)
@@ -243,28 +273,29 @@
       run;
       %inc skip;
     %end;
-    %else %if "&sysprocessmode " = "SAS Compute Server " %then %do;
-      /* endsas kills the session making it harder to fetch results */
-      data _null_;
-        syswarningtext=symget('syswarningtext');
-        syserrortext=symget('syserrortext');
-        abort_msg=symget('msg');
-        syscc=symget('syscc');
-        sysuserid=symget('sysuserid');
-        iftrue=symget('iftrue');
-        put (_all_)(/=);
-        call symputx('syscc',0);
-        abort cancel nolist;
-      run;
-    %end;
-    %else %do;
-      %abort cancel;
-    %end;
+  %end;
+  %else %if "&sysprocessmode " = "SAS Compute Server " %then %do;
+    /* endsas kills the session making it harder to fetch results */
+    data _null_;
+      syswarningtext=symget('syswarningtext');
+      syserrortext=symget('syserrortext');
+      abort_msg=symget('msg');
+      syscc=symget('syscc');
+      sysuserid=symget('sysuserid');
+      iftrue=symget('iftrue');
+      put (_all_)(/=);
+      call symputx('syscc',0);
+      abort cancel nolist;
+    run;
   %end;
   %else %do;
-    %put _all_;
     %abort cancel;
   %end;
+%end;
+%else %do;
+  %put _all_;
+  %abort cancel;
+%end;
 %mend mp_abort;
 
 /** @endcond */

base/mp_binarycopy.sas

@@ -4,8 +4,8 @@
   @details Reads in a file byte by byte and writes it back out.  Is an
   os-independent method to copy files.  In case of naming collision, the
   default filerefs can be modified.
-  Based on:
-  https://stackoverflow.com/questions/13046116/using-sas-to-copy-a-text-file
+  Note that if you have a new enough version of SAS, and you don't need features
+  such as APPEND, you may be better of using the fcopy() function instead.
 
         %mp_binarycopy(inloc="/home/me/blah.txt", outref=_webout)
 
@@ -31,6 +31,7 @@
   @param [in] mode (CREATE) Valid values:
     @li CREATE - Create the file (even if it already exists)
     @li APPEND - Append to the file (don't overwrite)
+  @param iftrue= (1=1) Supply a condition for which the macro should be executed
 
   @returns nothing
 
@@ -44,15 +45,14 @@
     ,inref=____in   /* override default to use own filerefs */
     ,outref=____out /* override default to use own filerefs */
     ,mode=CREATE
+    ,iftrue=%str(1=1)
 )/*/STORE SOURCE*/;
-  %local mod outmode;
-  %if &mode=APPEND %then %do;
-    %let mod=mod;
-    %let outmode='a';
-  %end;
-  %else %do;
-    %let outmode='o';
-  %end;
+  %local mod;
+
+  %if not(%eval(%unquote(&iftrue))) %then %return;
+
+  %if &mode=APPEND %then %let mod=mod;
+
   /* these IN and OUT filerefs can point to anything */
   %if &inref = ____in %then %do;
     filename &inref &inloc lrecl=1048576 ;
@@ -63,22 +63,17 @@
 
   /* copy the file byte-for-byte  */
   data _null_;
-    length filein 8 fileid 8;
-    filein = fopen("&inref",'I',1,'B');
-    fileid = fopen("&outref",&outmode,1,'B');
-    rec = '20'x;
-    do while(fread(filein)=0);
-      rc = fget(filein,rec,1);
-      rc = fput(fileid, rec);
-      rc =fwrite(fileid);
-    end;
-    rc = fclose(filein);
-    rc = fclose(fileid);
+    infile &inref lrecl=1 recfm=n;
+    file &outref &mod recfm=n;
+    input sourcechar $char1. @@;
+    format sourcechar hex2.;
+    put sourcechar char1. @@;
   run;
+
   %if &inref = ____in %then %do;
     filename &inref clear;
   %end;
   %if &outref=____out %then %do;
     filename &outref clear;
   %end;
-%mend mp_binarycopy;
+%mend mp_binarycopy;

base/mp_ds2cards.sas

@@ -51,7 +51,7 @@
   @cond
 **/
 
-%macro mp_ds2cards(base_ds=, tgt_ds=
+%macro mp_ds2cards(base_ds, tgt_ds=
     ,cards_file="%sysfunc(pathname(work))/cardgen.sas"
     ,maxobs=max
     ,random_sample=NO
@@ -254,6 +254,7 @@ data _null_;
         ;
       %end;
       put ";";
+      put 'missing a b c d e f g h i j k l m n o p q r s t u v w x y z _;';
       put "datalines4;";
     end;
   end;

base/mp_filtercheck.sas

@@ -92,7 +92,8 @@ data &outds;
   /*length GROUP_LOGIC SUBGROUP_LOGIC $3 SUBGROUP_ID 8 VARIABLE_NM $32
     OPERATOR_NM $10 RAW_VALUE $4000;*/
   set &inds;
-  length reason_cd $4032 vtype $1 vnum dsid 8;
+  length reason_cd $4032 vtype $1 vnum dsid 8 tmp $4000;
+  drop tmp;
 
   /* quick check to ensure column exists */
   if upcase(VARIABLE_NM) not in
@@ -168,18 +169,32 @@ data &outds;
   end;
 
   /* special logic */
-  if OPERATOR_NM='BETWEEN' then raw_value1=tranwrd(raw_value,' AND ','');
-  else if OPERATOR_NM in ('IN','NOT IN') then do;
-    if substr(raw_value,1,1) ne '('
-    or substr(cats(reverse(raw_value)),1,1) ne ')'
-    then do;
-      REASON_CD='Missing start/end bracket in RAW_VALUE';
-      putlog REASON_CD= OPERATOR_NM= raw_value= raw_value1= ;
-      call symputx('reason_cd',reason_cd,'l');
-      call symputx('nobs',_n_,'l');
-      output;
+  if OPERATOR_NM in ('IN','NOT IN','BETWEEN') then do;
+    if OPERATOR_NM='BETWEEN' then raw_value1=tranwrd(raw_value,' AND ',',');
+    else do;
+      if substr(raw_value,1,1) ne '('
+      or substr(cats(reverse(raw_value)),1,1) ne ')'
+      then do;
+        REASON_CD='Missing start/end bracket in RAW_VALUE';
+        putlog REASON_CD= OPERATOR_NM= raw_value= raw_value1= ;
+        call symputx('reason_cd',reason_cd,'l');
+        call symputx('nobs',_n_,'l');
+        output;
+      end;
+      else raw_value1=substr(raw_value,2,max(length(raw_value)-2,0));
+    end;
+    /* we now have a comma seperated list of values */
+    if vtype='N' then do i=1 to countc(raw_value1, ',')+1;
+      tmp=scan(raw_value1,i,',');
+      if cats(tmp) ne '.' and input(tmp, ?? 8.) eq . then do;
+        REASON_CD='Non Numeric value provided';
+        putlog REASON_CD= OPERATOR_NM= raw_value= raw_value1= ;
+        call symputx('reason_cd',reason_cd,'l');
+        call symputx('nobs',_n_,'l');
+        output;
+      end;
+      return;
     end;
-    else raw_value1=substr(raw_value,2,max(length(raw_value)-2,0));
   end;
   else raw_value1=raw_value;
 

base/mp_getconstraints.sas

@@ -94,8 +94,11 @@ create table &outds as
 /**
   * We cannot apply this clause to the underlying dictionary table.  See:
   * https://communities.sas.com/t5/SAS-Programming/Unexpected-Where-Clause-behaviour-in-dictionary-TABLE/m-p/771554#M244867
+  * cannot use`where calculated libref="&lib"` either as it will STILL execute
+  * all the underlying constraint queries, causing exception errors in some
+  * cases: https://github.com/sasjs/core/issues/283
   */
-  where calculated libref="&lib"
+  where a.TABLE_CATALOG="&lib"
   %if "&ds" ne "" %then %do;
     and upcase(a.TABLE_NAME)="&ds"
     and upcase(b.TABLE_NAME)="&ds"

base/mp_getpk.sas

@@ -34,6 +34,7 @@
   @param [out] outds= (work.mp_getpk) The name of the output table to create.
 
   <h4> SAS Macros </h4>
+  @li mf_existfeature.sas
   @li mf_getengine.sas
   @li mf_getschema.sas
   @li mp_dropmembers.sas
@@ -229,7 +230,12 @@ create table work.&tabs1 as select
   libname as libref
   ,upcase(memname) as dsn
   ,memtype
+%if %mf_existfeature(DBMS_MEMTYPE)=1 %then %do;
   ,dbms_memtype
+%end;
+%else %do;
+  ,'n/a' as dbms_memtype format=$32.
+%end;
   ,typemem
   ,memlabel
   ,nvar

base/mp_jsonout.sas

@@ -1,7 +1,12 @@
 /**
   @file mp_jsonout.sas
   @brief Writes JSON in SASjs format to a fileref
-  @details PROC JSON is faster but will produce errs like the ones below if
+  @details This macro can be used to OPEN a JSON stream and send one or more
+  tables as arrays of rows, where each row can be an object or a nested array.
+
+  There are two engines available - DATASTEP or PROCJSON.
+
+  PROC JSON is fast but will produce errs like the ones below if
   special chars are encountered.
 
   > (ERR)OR: Some code points did not transcode.
@@ -12,6 +17,10 @@
 
   If this happens, try running with ENGINE=DATASTEP.
 
+  The DATASTEP engine is used to handle special SAS missing numerics, and
+  can also convert entire datasets to formatted values.  Output JSON is always
+  in UTF-8.
+
   Usage:
 
         filename tmp temp;
@@ -19,7 +28,7 @@
 
         %mp_jsonout(OPEN,jref=tmp)
         %mp_jsonout(OBJ,class,jref=tmp)
-        %mp_jsonout(OBJ,class,dslabel=class2,jref=tmp,showmeta=YES)
+        %mp_jsonout(OBJ,class,dslabel=class2,jref=tmp,showmeta=Y)
         %mp_jsonout(CLOSE,jref=tmp)
 
         data _null_;
@@ -46,10 +55,12 @@
     @li DATASTEP (more reliable when data has non standard characters)
   @param [in] missing= (NULL) Special numeric missing values can be sent as NULL
     (eg `null`) or as STRING values (eg `".a"` or `".b"`)
-  @param [in] showmeta= (NO) Set to YES to output metadata alongside each table,
+  @param [in] showmeta= (N) Set to Y to output metadata alongside each table,
     such as the column formats and types.  The metadata is contained inside an
     object with the same name as the table but prefixed with a dollar sign - ie,
     `,"$tablename":{"formats":{"col1":"$CHAR1"},"types":{"COL1":"C"}}`
+  @param [in] maxobs= (MAX) Provide an integer to limit the number of input rows
+    that should be converted to JSON
 
   <h4> Related Macros <h4>
   @li mp_ds2fmtds.sas
@@ -63,10 +74,12 @@
 %macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y
   ,engine=DATASTEP
   ,missing=NULL
-  ,showmeta=NO
+  ,showmeta=N
+  ,maxobs=MAX
 )/*/STORE SOURCE*/;
-%local tempds colinfo fmtds i numcols;
+%local tempds colinfo fmtds i numcols stmt_obs;
 %let numcols=0;
+%if &maxobs ne MAX %then %let stmt_obs=%str(if _n_>&maxobs then stop;);
 
 %if &action=OPEN %then %do;
   options nobomfile;
@@ -75,9 +88,23 @@
   run;
 %end;
 %else %if (&action=ARR or &action=OBJ) %then %do;
+  /* force variable names to always be uppercase in the JSON */
   options validvarname=upcase;
-  data _null_; file &jref encoding='utf-8' mod;
+  /* To avoid issues with _webout on EBI - such as encoding diffs and truncation
+    (https://support.sas.com/kb/49/325.html) we use temporary files */
+  filename _sjs1 temp lrecl=200 ;
+  data _null_; file _sjs1 encoding='utf-8';
     put ", ""%lowcase(%sysfunc(coalescec(&dslabel,&ds)))"":";
+  run;
+  /* now write to _webout 1 char at a time */
+  data _null_;
+    infile _sjs1 lrecl=1 recfm=n;
+    file &jref mod lrecl=1 recfm=n;
+    input sourcechar $char1. @@;
+    format sourcechar hex2.;
+    put sourcechar char1. @@;
+  run;
+  filename _sjs1 clear;
 
   /* grab col defs */
   proc contents noprint data=&ds
@@ -131,13 +158,25 @@
       %put &sysmacroname: Switching to DATASTEP engine;
       %goto datastep;
     %end;
-    data &tempds;set &ds;
+    data &tempds;
+      set &ds;
+      &stmt_obs;
     %if &fmt=N %then format _numeric_ best32.;;
     /* PRETTY is necessary to avoid line truncation in large files */
-    proc json out=&jref pretty
+    filename _sjs2 temp lrecl=131068 encoding='utf-8';
+    proc json out=_sjs2 pretty
         %if &action=ARR %then nokeys ;
         ;export &tempds / nosastags fmtnumeric;
     run;
+    /* send back to webout */
+    data _null_;
+      infile _sjs2 lrecl=1 recfm=n;
+      file &jref mod lrecl=1 recfm=n;
+      input sourcechar $char1. @@;
+      format sourcechar hex2.;
+      put sourcechar char1. @@;
+    run;
+    filename _sjs2 clear;
   %end;
   %else %if &engine=DATASTEP %then %do;
     %datastep:
@@ -196,6 +235,7 @@
       %else %do;
         set &ds;
       %end;
+      &stmt_obs;
       format _numeric_ bart.;
     %do i=1 %to &numcols;
       %if &&typelong&i=char or &fmt=Y %then %do;
@@ -220,10 +260,9 @@
     %end;
     run;
 
-    /* write to temp loc to avoid _webout truncation
-      - https://support.sas.com/kb/49/325.html */
-    filename _sjs temp lrecl=131068 encoding='utf-8';
-    data _null_; file _sjs lrecl=131068 encoding='utf-8' mod ;
+    filename _sjs3 temp lrecl=131068 ;
+    data _null_;
+      file _sjs3 encoding='utf-8';
       if _n_=1 then put "[";
       set &tempds;
       if _n_>1 then put "," @; put
@@ -234,36 +273,35 @@
         "&&name&i"n /* name literal for reserved variable names */
       %end;
       %if &action=ARR %then "]" ; %else "}" ; ;
-    /* now write the long strings to _webout 1 byte at a time */
+
+    /* close out the table */
     data _null_;
-      length filein 8 fileid 8;
-      filein=fopen("_sjs",'I',1,'B');
-      fileid=fopen("&jref",'A',1,'B');
-      rec='20'x;
-      do while(fread(filein)=0);
-        rc=fget(filein,rec,1);
-        rc=fput(fileid, rec);
-        rc=fwrite(fileid);
-      end;
-      /* close out the table */
-      rc=fput(fileid, "]");
-      rc=fwrite(fileid);
-      rc=fclose(filein);
-      rc=fclose(fileid);
+      file _sjs3 mod encoding='utf-8';
+      put ']';
     run;
-    filename _sjs clear;
+    data _null_;
+      infile _sjs3 lrecl=1 recfm=n;
+      file &jref mod lrecl=1 recfm=n;
+      input sourcechar $char1. @@;
+      format sourcechar hex2.;
+      put sourcechar char1. @@;
+    run;
+    filename _sjs3 clear;
   %end;
 
   proc sql;
   drop table &colinfo, &tempds;
 
-  %if &showmeta=YES %then %do;
-    data _null_; file &jref encoding='utf-8' mod;
+  %if %substr(&showmeta,1,1)=Y %then %do;
+    filename _sjs4 temp lrecl=131068 encoding='utf-8';
+    data _null_;
+      file _sjs4;
+      length label $350;
       put ", ""$%lowcase(%sysfunc(coalescec(&dslabel,&ds)))"":{""vars"":{";
       do i=1 to &numcols;
         name=quote(trim(symget(cats('name',i))));
         format=quote(trim(symget(cats('fmt',i))));
-        label=quote(trim(symget(cats('label',i))));
+        label=quote(prxchange('s/\\/\\\\/',-1,trim(symget(cats('label',i)))));
         length=quote(trim(symget(cats('length',i))));
         type=quote(trim(symget(cats('typelong',i))));
         if i>1 then put "," @@;
@@ -272,6 +310,15 @@
       end;
       put '}}';
     run;
+    /* send back to webout */
+    data _null_;
+      infile _sjs4 lrecl=1 recfm=n;
+      file &jref mod lrecl=1 recfm=n;
+      input sourcechar $char1. @@;
+      format sourcechar hex2.;
+      put sourcechar char1. @@;
+    run;
+    filename _sjs4 clear;
   %end;
 %end;
 

base/mp_storediffs.sas

@@ -154,7 +154,9 @@ run;
 %else %let vlist=%mf_getvarlist(&libds,dlm=%str(,),quote=DOUBLE);
 
 data &ds4;
-  length &inds_keep $41 tgtvar_nm $32;
+  length &inds_keep $41 tgtvar_nm $32 _label_ $256;
+  if _n_=1 then call missing(_label_);
+  drop _label_;
   set &ds2 &ds3 indsname=&inds_auto;
 
   tgtvar_nm=upcase(tgtvar_nm);

meta/mm_adduser2group.sas

@@ -2,7 +2,10 @@
   @file mm_adduser2group.sas
   @brief Adds a user to a group
   @details Adds a user to a metadata group.  The macro first checks whether the
-    user is in that group, and if not, the user is added.
+  user is in that group, and if not, the user is added.
+
+  Note that the macro does not check inherited group memberships - it looks at
+    direct members only.
 
   Usage:
 
@@ -12,10 +15,10 @@
 
   @param user= the user name (not displayname)
   @param group= the group to which to add the user
-  @param mdebug= set to 1 to show debug info in log
+  @param mdebug= (0) set to 1 to show debug info in log
 
-  @warning the macro does not check inherited group memberships - it looks at
-    direct members only
+  <h4> Related Files </h4>
+  @li ms_adduser2group.sas
 
   @version 9.3
   @author Allan Bowe

meta/mm_createfolder.sas

@@ -17,7 +17,7 @@
       %mm_createfolder(path=/some/meta/folder)
 
   @param [in] path= Name of the folder to create.
-  @param [in] mdebug= set DBG to 1 to disable DEBUG messages
+  @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
 
 
   @version 9.4

meta/mm_createwebservice.sas

@@ -2,7 +2,8 @@
   @file mm_createwebservice.sas
   @brief Create a Web Ready Stored Process
   @details This macro creates a Type 2 Stored Process with the mm_webout macro
-    included as pre-code.
+  (and dependencies) included as pre-code.
+
 Usage:
 
     %* compile macros ;
@@ -96,10 +97,12 @@ data _null_;
   put '%macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y ';
   put '  ,engine=DATASTEP ';
   put '  ,missing=NULL ';
-  put '  ,showmeta=NO ';
+  put '  ,showmeta=N ';
+  put '  ,maxobs=MAX ';
   put ')/*/STORE SOURCE*/; ';
-  put '%local tempds colinfo fmtds i numcols; ';
+  put '%local tempds colinfo fmtds i numcols stmt_obs; ';
   put '%let numcols=0; ';
+  put '%if &maxobs ne MAX %then %let stmt_obs=%str(if _n_>&maxobs then stop;); ';
   put ' ';
   put '%if &action=OPEN %then %do; ';
   put '  options nobomfile; ';
@@ -108,9 +111,23 @@ data _null_;
   put '  run; ';
   put '%end; ';
   put '%else %if (&action=ARR or &action=OBJ) %then %do; ';
+  put '  /* force variable names to always be uppercase in the JSON */ ';
   put '  options validvarname=upcase; ';
-  put '  data _null_; file &jref encoding=''utf-8'' mod; ';
+  put '  /* To avoid issues with _webout on EBI - such as encoding diffs and truncation ';
+  put '    (https://support.sas.com/kb/49/325.html) we use temporary files */ ';
+  put '  filename _sjs1 temp lrecl=200 ; ';
+  put '  data _null_; file _sjs1 encoding=''utf-8''; ';
   put '    put ", ""%lowcase(%sysfunc(coalescec(&dslabel,&ds)))"":"; ';
+  put '  run; ';
+  put '  /* now write to _webout 1 char at a time */ ';
+  put '  data _null_; ';
+  put '    infile _sjs1 lrecl=1 recfm=n; ';
+  put '    file &jref mod lrecl=1 recfm=n; ';
+  put '    input sourcechar $char1. @@; ';
+  put '    format sourcechar hex2.; ';
+  put '    put sourcechar char1. @@; ';
+  put '  run; ';
+  put '  filename _sjs1 clear; ';
   put ' ';
   put '  /* grab col defs */ ';
   put '  proc contents noprint data=&ds ';
@@ -164,13 +181,25 @@ data _null_;
   put '      %put &sysmacroname: Switching to DATASTEP engine; ';
   put '      %goto datastep; ';
   put '    %end; ';
-  put '    data &tempds;set &ds; ';
+  put '    data &tempds; ';
+  put '      set &ds; ';
+  put '      &stmt_obs; ';
   put '    %if &fmt=N %then format _numeric_ best32.;; ';
   put '    /* PRETTY is necessary to avoid line truncation in large files */ ';
-  put '    proc json out=&jref pretty ';
+  put '    filename _sjs2 temp lrecl=131068 encoding=''utf-8''; ';
+  put '    proc json out=_sjs2 pretty ';
   put '        %if &action=ARR %then nokeys ; ';
   put '        ;export &tempds / nosastags fmtnumeric; ';
   put '    run; ';
+  put '    /* send back to webout */ ';
+  put '    data _null_; ';
+  put '      infile _sjs2 lrecl=1 recfm=n; ';
+  put '      file &jref mod lrecl=1 recfm=n; ';
+  put '      input sourcechar $char1. @@; ';
+  put '      format sourcechar hex2.; ';
+  put '      put sourcechar char1. @@; ';
+  put '    run; ';
+  put '    filename _sjs2 clear; ';
   put '  %end; ';
   put '  %else %if &engine=DATASTEP %then %do; ';
   put '    %datastep: ';
@@ -229,6 +258,7 @@ data _null_;
   put '      %else %do; ';
   put '        set &ds; ';
   put '      %end; ';
+  put '      &stmt_obs; ';
   put '      format _numeric_ bart.; ';
   put '    %do i=1 %to &numcols; ';
   put '      %if &&typelong&i=char or &fmt=Y %then %do; ';
@@ -253,10 +283,9 @@ data _null_;
   put '    %end; ';
   put '    run; ';
   put ' ';
-  put '    /* write to temp loc to avoid _webout truncation ';
-  put '      - https://support.sas.com/kb/49/325.html */ ';
-  put '    filename _sjs temp lrecl=131068 encoding=''utf-8''; ';
-  put '    data _null_; file _sjs lrecl=131068 encoding=''utf-8'' mod ; ';
+  put '    filename _sjs3 temp lrecl=131068 ; ';
+  put '    data _null_; ';
+  put '      file _sjs3 encoding=''utf-8''; ';
   put '      if _n_=1 then put "["; ';
   put '      set &tempds; ';
   put '      if _n_>1 then put "," @; put ';
@@ -267,36 +296,35 @@ data _null_;
   put '        "&&name&i"n /* name literal for reserved variable names */ ';
   put '      %end; ';
   put '      %if &action=ARR %then "]" ; %else "}" ; ; ';
-  put '    /* now write the long strings to _webout 1 byte at a time */ ';
+  put ' ';
+  put '    /* close out the table */ ';
   put '    data _null_; ';
-  put '      length filein 8 fileid 8; ';
-  put '      filein=fopen("_sjs",''I'',1,''B''); ';
-  put '      fileid=fopen("&jref",''A'',1,''B''); ';
-  put '      rec=''20''x; ';
-  put '      do while(fread(filein)=0); ';
-  put '        rc=fget(filein,rec,1); ';
-  put '        rc=fput(fileid, rec); ';
-  put '        rc=fwrite(fileid); ';
-  put '      end; ';
-  put '      /* close out the table */ ';
-  put '      rc=fput(fileid, "]"); ';
-  put '      rc=fwrite(fileid); ';
-  put '      rc=fclose(filein); ';
-  put '      rc=fclose(fileid); ';
+  put '      file _sjs3 mod encoding=''utf-8''; ';
+  put '      put '']''; ';
   put '    run; ';
-  put '    filename _sjs clear; ';
+  put '    data _null_; ';
+  put '      infile _sjs3 lrecl=1 recfm=n; ';
+  put '      file &jref mod lrecl=1 recfm=n; ';
+  put '      input sourcechar $char1. @@; ';
+  put '      format sourcechar hex2.; ';
+  put '      put sourcechar char1. @@; ';
+  put '    run; ';
+  put '    filename _sjs3 clear; ';
   put '  %end; ';
   put ' ';
   put '  proc sql; ';
   put '  drop table &colinfo, &tempds; ';
   put ' ';
-  put '  %if &showmeta=YES %then %do; ';
-  put '    data _null_; file &jref encoding=''utf-8'' mod; ';
+  put '  %if %substr(&showmeta,1,1)=Y %then %do; ';
+  put '    filename _sjs4 temp lrecl=131068 encoding=''utf-8''; ';
+  put '    data _null_; ';
+  put '      file _sjs4; ';
+  put '      length label $350; ';
   put '      put ", ""$%lowcase(%sysfunc(coalescec(&dslabel,&ds)))"":{""vars"":{"; ';
   put '      do i=1 to &numcols; ';
   put '        name=quote(trim(symget(cats(''name'',i)))); ';
   put '        format=quote(trim(symget(cats(''fmt'',i)))); ';
-  put '        label=quote(trim(symget(cats(''label'',i)))); ';
+  put '        label=quote(prxchange(''s/\\/\\\\/'',-1,trim(symget(cats(''label'',i))))); ';
   put '        length=quote(trim(symget(cats(''length'',i)))); ';
   put '        type=quote(trim(symget(cats(''typelong'',i)))); ';
   put '        if i>1 then put "," @@; ';
@@ -305,6 +333,15 @@ data _null_;
   put '      end; ';
   put '      put ''}}''; ';
   put '    run; ';
+  put '    /* send back to webout */ ';
+  put '    data _null_; ';
+  put '      infile _sjs4 lrecl=1 recfm=n; ';
+  put '      file &jref mod lrecl=1 recfm=n; ';
+  put '      input sourcechar $char1. @@; ';
+  put '      format sourcechar hex2.; ';
+  put '      put sourcechar char1. @@; ';
+  put '    run; ';
+  put '    filename _sjs4 clear; ';
   put '  %end; ';
   put '%end; ';
   put ' ';
@@ -315,18 +352,19 @@ data _null_;
   put '%end; ';
   put '%mend mp_jsonout; ';
   put ' ';
-  put '%macro mf_getuser(type=META ';
+  put '%macro mf_getuser( ';
   put ')/*/STORE SOURCE*/; ';
-  put '  %local user metavar; ';
-  put '  %if &type=OS %then %let metavar=_secureusername; ';
-  put '  %else %let metavar=_metaperson; ';
+  put '  %local user; ';
   put ' ';
-  put '  %if %symexist(SYS_COMPUTE_SESSION_OWNER) %then %let user=&SYS_COMPUTE_SESSION_OWNER; ';
-  put '  %else %if %symexist(&metavar) %then %do; ';
-  put '    %if %length(&&&metavar)=0 %then %let user=&sysuserid; ';
+  put '  %if %symexist(_sasjs_username) %then %let user=&_sasjs_username; ';
+  put '  %else %if %symexist(SYS_COMPUTE_SESSION_OWNER) %then %do; ';
+  put '    %let user=&SYS_COMPUTE_SESSION_OWNER; ';
+  put '  %end; ';
+  put '  %else %if %symexist(_metaperson) %then %do; ';
+  put '    %if %length(&_metaperson)=0 %then %let user=&sysuserid; ';
   put '    /* sometimes SAS will add @domain extension - remove for consistency */ ';
   put '    /* but be sure to quote in case of usernames with commas */ ';
-  put '    %else %let user=%unquote(%scan(%quote(&&&metavar),1,@)); ';
+  put '    %else %let user=%unquote(%scan(%quote(&_metaperson),1,@)); ';
   put '  %end; ';
   put '  %else %let user=&sysuserid; ';
   put ' ';
@@ -334,7 +372,7 @@ data _null_;
   put ' ';
   put '%mend mf_getuser; ';
   put '%macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL ';
-  put '  ,showmeta=NO ';
+  put '  ,showmeta=N ';
   put '); ';
   put '%global _webin_file_count _webin_fileref1 _webin_name1 _program _debug ';
   put '  sasjs_tables; ';
@@ -405,9 +443,10 @@ data _null_;
   put '  ) ';
   put '%end; ';
   put '%else %if &action=CLOSE %then %do; ';
+  put '  /* To avoid issues with _webout on EBI we use a temporary file */ ';
+  put '  filename _sjsref temp lrecl=131068; ';
   put '  %if %str(&_debug) ge 131 %then %do; ';
   put '    /* if debug mode, send back first 10 records of each work table also */ ';
-  put '    options obs=10; ';
   put '    data;run;%let tempds=%scan(&syslast,2,.); ';
   put '    ods output Members=&tempds; ';
   put '    proc datasets library=WORK memtype=data; ';
@@ -418,11 +457,11 @@ data _null_;
   put '      i+1; ';
   put '      call symputx(cats(''wt'',i),name,''l''); ';
   put '      call symputx(''wtcnt'',i,''l''); ';
-  put '    data _null_; file &fref mod encoding=''utf-8''; ';
+  put '    data _null_; file _sjsref mod encoding=''utf-8''; ';
   put '      put ",""WORK"":{"; ';
   put '    %do i=1 %to &wtcnt; ';
   put '      %let wt=&&wt&i; ';
-  put '      data _null_; file &fref mod encoding=''utf-8''; ';
+  put '      data _null_; file _sjsref mod encoding=''utf-8''; ';
   put '        dsid=open("WORK.&wt",''is''); ';
   put '        nlobs=attrn(dsid,''NLOBS''); ';
   put '        nvars=attrn(dsid,''NVARS''); ';
@@ -431,16 +470,16 @@ data _null_;
   put '        put " ""&wt"" : {"; ';
   put '        put ''"nlobs":'' nlobs; ';
   put '        put '',"nvars":'' nvars; ';
-  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=YES) ';
-  put '      data _null_; file &fref mod encoding=''utf-8''; ';
+  put '      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y,maxobs=10) ';
+  put '      data _null_; file _sjsref mod encoding=''utf-8''; ';
   put '        put "}"; ';
   put '    %end; ';
-  put '    data _null_; file &fref mod encoding=''utf-8''; ';
+  put '    data _null_; file _sjsref mod encoding=''utf-8''; ';
   put '      put "}"; ';
   put '    run; ';
   put '  %end; ';
   put '  /* close off json */ ';
-  put '  data _null_;file &fref mod encoding=''utf-8''; ';
+  put '  data _null_;file _sjsref mod encoding=''utf-8''; ';
   put '    _PROGRAM=quote(trim(resolve(symget(''_PROGRAM'')))); ';
   put '    put ",""SYSUSERID"" : ""&sysuserid"" "; ';
   put '    put ",""MF_GETUSER"" : ""%mf_getuser()"" "; ';
@@ -451,7 +490,8 @@ data _null_;
   put '    put '',"_METAPERSON": '' _METAPERSON; ';
   put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
   put '    put ",""SYSCC"" : ""&syscc"" "; ';
-  put '    syserrortext=quote(cats(symget(''SYSERRORTEXT''))); ';
+  put '    put ",""SYSENCODING"" : ""&sysencoding"" "; ';
+  put '    syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); ';
   put '    put '',"SYSERRORTEXT" : '' syserrortext; ';
   put '    put ",""SYSHOSTNAME"" : ""&syshostname"" "; ';
   put '    put ",""SYSJOBID"" : ""&sysjobid"" "; ';
@@ -459,7 +499,7 @@ data _null_;
   put '    put ",""SYSSITE"" : ""&syssite"" "; ';
   put '    sysvlong=quote(trim(symget(''sysvlong''))); ';
   put '    put '',"SYSVLONG" : '' sysvlong; ';
-  put '    syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); ';
+  put '    syswarningtext=cats(''"'',tranwrd(symget(''syswarningtext''),''"'',''\"''),''"''); ';
   put '    put '',"SYSWARNINGTEXT" : '' syswarningtext; ';
   put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
   put '    length memsize $32; ';
@@ -471,6 +511,16 @@ data _null_;
   put '    put ''>>weboutEND<<''; ';
   put '  %end; ';
   put '  run; ';
+  put '  /* now write to _webout 1 char at a time */ ';
+  put '  data _null_; ';
+  put '    infile _sjsref lrecl=1 recfm=n; ';
+  put '    file &fref mod lrecl=1 recfm=n; ';
+  put '    input sourcechar $char1. @@; ';
+  put '    format sourcechar hex2.; ';
+  put '    put sourcechar char1. @@; ';
+  put '  run; ';
+  put '  filename _sjsref clear; ';
+  put ' ';
   put '%end; ';
   put ' ';
   put '%mend mm_webout; ';
@@ -492,7 +542,7 @@ run;
   %if &x>1 %then %let mod=mod;
 
   %let fref=%scan(&freflist,&x);
-  %put &sysmacroname: adding &fref;
+  %&mD.put &sysmacroname: adding &fref;
   data _null_;
     file "&work/&tmpfile" lrecl=3000 &mod;
     infile &fref;
@@ -528,12 +578,10 @@ data _null_;
   if rc=0 then call symputx('url',url,'l');
 run;
 
-%put ;%put ;%put ;%put ;%put ;%put ;
 %put &sysmacroname: STP &name successfully created in &path;
-%put ;%put ;%put ;
 %put Check it out here:;
 %put ;%put ;%put ;
 %put &url?_PROGRAM=&path/&name;
-%put ;%put ;%put ;%put ;%put ;%put ;
+%put ;%put ;%put ;
 
 %mend mm_createwebservice;

meta/mm_getfoldertree.sas

@@ -8,17 +8,15 @@
 
   Usage:
 
-    options ps=max nonotes nosource;
-    %mm_getfoldertree(root=/My/Meta/Path, outds=iwantthisdataset)
-    options notes source;
+      options ps=max nonotes nosource;
+      %mm_getfoldertree(root=/My/Meta/Path, outds=iwantthisdataset)
+      options notes source;
 
   @param [in] root= the parent folder under which to return all contents
   @param [out] outds= the dataset to create that contains the list of
     directories
   @param [in] mDebug= set to 1 to show debug messages in the log
 
-  <h4> SAS Macros </h4>
-
   @version 9.4
   @author Allan Bowe
 

meta/mm_getstpcode.sas

@@ -21,6 +21,7 @@
 
   <h4> SAS Macros </h4>
   @li mf_getuniquefileref.sas
+  @li mp_abort.sas
 
   @author Allan Bowe
 
@@ -57,7 +58,7 @@ data _null_;
     cnt=1;
     do while (metadata_getnasn(uri,"Notes",cnt,tsuri)>0);
       rc=metadata_getattr(tsuri,"Name",value);
-      put tsuri= value=;
+      &mD.put tsuri= value=;
       if value="SourceCode" then do;
         /* found it! */
         rc=metadata_getattr(tsuri,"Id",value);
@@ -70,11 +71,10 @@ data _null_;
   else put (_all_)(=);
 run;
 
-%if &tsuri=stopifempty %then %do;
-  %put %str(WARN)ING:  &tree&name.(StoredProcess) not found!;
-  %return;
-%end;
-
+%mp_abort(iftrue= (&tsuri=stopifempty)
+  ,mac=mm_getstpcode
+  ,msg=%str(&tree&name.(StoredProcess) not found!)
+)
 
 /**
   * Now we can extract the textstore

meta/mm_getusers.sas

@@ -8,17 +8,18 @@
 
       %mm_getusers()
 
+  Optionally, filter for a user (useful to get the uri):
+
+      %mm_getusers(user=&_metaperson)
+
   @param outds the dataset to create that contains the list of libraries
 
   @returns outds  dataset containing all users, with the following columns:
     - uri
     - name
 
-  @warning The following filenames are created and then de-assigned:
-
-      filename sxlemap clear;
-      filename response clear;
-      libname _XML_ clear;
+  @param user= (0) Set to a metadata user to filter on that user
+  @param outds= (work.mm_getusers) The output table to create
 
   @version 9.3
   @author Allan Bowe
@@ -26,23 +27,49 @@
 **/
 
 %macro mm_getusers(
-    outds=work.mm_getusers
+    outds=work.mm_getusers,
+    user=0
 )/*/STORE SOURCE*/;
 
 filename response temp;
-proc metadata in= '<GetMetadataObjects>
-  <Reposid>$METAREPOSITORY</Reposid>
-  <Type>Person</Type>
-  <NS>SAS</NS>
-  <Flags>0</Flags>
-  <Options>
-  <Templates>
-  <Person Name=""/>
-  </Templates>
-  </Options>
-  </GetMetadataObjects>'
-  out=response;
-run;
+%if %superq(user)=0 %then %do;
+  proc metadata in= '<GetMetadataObjects>
+    <Reposid>$METAREPOSITORY</Reposid>
+    <Type>Person</Type>
+    <NS>SAS</NS>
+    <Flags>0</Flags>
+    <Options>
+    <Templates>
+    <Person Name=""/>
+    </Templates>
+    </Options>
+    </GetMetadataObjects>'
+    out=response;
+  run;
+%end;
+%else %do;
+  filename inref temp;
+  data _null_;
+    file inref;
+    put "<GetMetadataObjects>";
+    put "<Reposid>$METAREPOSITORY</Reposid>";
+    put "<Type>Person</Type>";
+    put "<NS>SAS</NS>";
+    put "<!-- Specify the OMI_XMLSELECT (128) flag  -->";
+    put "<Flags>128</Flags>";
+    put "<Options>";
+    put "<Templates>";
+    put '<Person Name=""/>';
+    put "</Templates>";
+    length string $10000;
+    string=cats('<XMLSELECT search="Person[@Name=',"'&user'",']"/>');
+    put string;
+    put "</Options>";
+    put "</GetMetadataObjects>";
+  run;
+  proc metadata in=inref out=response;
+  run;
+%end;
 
 filename sxlemap temp;
 data _null_;

meta/mm_updatestpsourcecode.sas

@@ -43,7 +43,9 @@ data _null_;
     cnt=1;
     do while (metadata_getnasn(uri,"Notes",cnt,tsuri)>0);
       rc=metadata_getattr(tsuri,"Name",value);
+    %if &mdebug=1 %then %do;
       put tsuri= value=;
+    %end;
       if value="SourceCode" then do;
         /* found it! */
         rc=metadata_getattr(tsuri,"Id",value);
@@ -126,4 +128,4 @@ run;
   filename &frefout clear;
 %end;
 
-%mend mm_updatestpsourcecode;
+%mend mm_updatestpsourcecode;

meta/mm_webout.sas

@@ -4,23 +4,23 @@
   @details This macro should be added to the start of each Stored Process,
   **immediately** followed by a call to:
 
-        %mm_webout(FETCH)
+      %mm_webout(FETCH)
 
-    This will read all the input data and create same-named SAS datasets in the
-    WORK library.  You can then insert your code, and send data back using the
-    following syntax:
+  This will read all the input data and create same-named SAS datasets in the
+  WORK library.  You can then insert your code, and send data back using the
+  following syntax:
 
-        data some datasets; * make some data ;
-        retain some columns;
-        run;
+      data some datasets; * make some data ;
+      retain some columns;
+      run;
 
-        %mm_webout(OPEN)
-        %mm_webout(ARR,some)  * Array format, fast, suitable for large tables ;
-        %mm_webout(OBJ,datasets) * Object format, easier to work with ;
+      %mm_webout(OPEN)
+      %mm_webout(ARR,some)  * Array format, fast, suitable for large tables ;
+      %mm_webout(OBJ,datasets) * Object format, easier to work with ;
 
-    Finally, wrap everything up send some helpful system variables too
+  Finally, wrap everything up send some helpful system variables too
 
-        %mm_webout(CLOSE)
+      %mm_webout(CLOSE)
 
 
   @param [in] action Either FETCH, OPEN, ARR, OBJ or CLOSE
@@ -30,17 +30,21 @@
   @param [out] fref= (_webout) The fileref to which to write the JSON
   @param [in] missing= (NULL) Special numeric missing values can be sent as NULL
     (eg `null`) or as STRING values (eg `".a"` or `".b"`)
-  @param [in] showmeta= (NO) Set to YES to output metadata alongside each table,
+  @param [in] showmeta= (N) Set to Y to output metadata alongside each table,
     such as the column formats and types.  The metadata is contained inside an
     object with the same name as the table but prefixed with a dollar sign - ie,
     `,"$tablename":{"formats":{"col1":"$CHAR1"},"types":{"COL1":"C"}}`
 
+
+  <h4> SAS Macros </h4>
+  @li mp_jsonout.sas
+
   @version 9.3
   @author Allan Bowe
 
 **/
 %macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL
-  ,showmeta=NO
+  ,showmeta=N
 );
 %global _webin_file_count _webin_fileref1 _webin_name1 _program _debug
   sasjs_tables;
@@ -111,9 +115,10 @@
   )
 %end;
 %else %if &action=CLOSE %then %do;
+  /* To avoid issues with _webout on EBI we use a temporary file */
+  filename _sjsref temp lrecl=131068;
   %if %str(&_debug) ge 131 %then %do;
     /* if debug mode, send back first 10 records of each work table also */
-    options obs=10;
     data;run;%let tempds=%scan(&syslast,2,.);
     ods output Members=&tempds;
     proc datasets library=WORK memtype=data;
@@ -124,11 +129,11 @@
       i+1;
       call symputx(cats('wt',i),name,'l');
       call symputx('wtcnt',i,'l');
-    data _null_; file &fref mod encoding='utf-8';
+    data _null_; file _sjsref mod encoding='utf-8';
       put ",""WORK"":{";
     %do i=1 %to &wtcnt;
       %let wt=&&wt&i;
-      data _null_; file &fref mod encoding='utf-8';
+      data _null_; file _sjsref mod encoding='utf-8';
         dsid=open("WORK.&wt",'is');
         nlobs=attrn(dsid,'NLOBS');
         nvars=attrn(dsid,'NVARS');
@@ -137,16 +142,16 @@
         put " ""&wt"" : {";
         put '"nlobs":' nlobs;
         put ',"nvars":' nvars;
-      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=YES)
-      data _null_; file &fref mod encoding='utf-8';
+      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y,maxobs=10)
+      data _null_; file _sjsref mod encoding='utf-8';
         put "}";
     %end;
-    data _null_; file &fref mod encoding='utf-8';
+    data _null_; file _sjsref mod encoding='utf-8';
       put "}";
     run;
   %end;
   /* close off json */
-  data _null_;file &fref mod encoding='utf-8';
+  data _null_;file _sjsref mod encoding='utf-8';
     _PROGRAM=quote(trim(resolve(symget('_PROGRAM'))));
     put ",""SYSUSERID"" : ""&sysuserid"" ";
     put ",""MF_GETUSER"" : ""%mf_getuser()"" ";
@@ -157,7 +162,8 @@
     put ',"_METAPERSON": ' _METAPERSON;
     put ',"_PROGRAM" : ' _PROGRAM ;
     put ",""SYSCC"" : ""&syscc"" ";
-    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    put ",""SYSENCODING"" : ""&sysencoding"" ";
+    syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"');
     put ',"SYSERRORTEXT" : ' syserrortext;
     put ",""SYSHOSTNAME"" : ""&syshostname"" ";
     put ",""SYSJOBID"" : ""&sysjobid"" ";
@@ -165,7 +171,7 @@
     put ",""SYSSITE"" : ""&syssite"" ";
     sysvlong=quote(trim(symget('sysvlong')));
     put ',"SYSVLONG" : ' sysvlong;
-    syswarningtext=quote(cats(symget('SYSWARNINGTEXT')));
+    syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"');
     put ',"SYSWARNINGTEXT" : ' syswarningtext;
     put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
     length memsize $32;
@@ -177,6 +183,16 @@
     put '>>weboutEND<<';
   %end;
   run;
+  /* now write to _webout 1 char at a time */
+  data _null_;
+    infile _sjsref lrecl=1 recfm=n;
+    file &fref mod lrecl=1 recfm=n;
+    input sourcechar $char1. @@;
+    format sourcechar hex2.;
+    put sourcechar char1. @@;
+  run;
+  filename _sjsref clear;
+
 %end;
 
 %mend mm_webout;

sasjs/sasjsconfig.json

@@ -67,7 +67,7 @@
     },
     {
       "name": "server",
-      "serverUrl": "https://sas.analytium.co.uk:5007",
+      "serverUrl": "https://sas.4gl.io",
       "serverType": "SASJS",
       "httpsAgentOptions": {
         "allowInsecureRequests": false
@@ -107,4 +107,4 @@
       "contextName": "SAS Job Execution compute context"
     }
   ]
-}
+}

server/ms_adduser2group.sas

@@ -0,0 +1,122 @@
+/**
+  @file
+  @brief Adds a user to a group on SASjs Server
+  @details Adds a user to a group based on userid and groupid.  Both user and
+  group must already exist.
+
+  Examples:
+
+      %ms_adduser2group(uid=1,gid=1)
+
+
+  @param [in] uid= (0) The User ID to be added
+  @param [in] gid= (0) The Group ID to contain the new user
+  @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
+  @param [out] outds= (work.ms_adduser2group) This output dataset will contain
+    the new list of group members, eg:
+|DISPLAYNAME:$18.|USERNAME:$10.|ID:best.|
+|---|---|---|
+|`Super Admin `|`secretuser `|`1`|
+|`Sabir Hassan`|`sabir`|`2`|
+|`Mihajlo Medjedovic `|`mihajlo `|`3`|
+|`Ivor Townsend `|`ivor `|`4`|
+|`New User `|`newuser `|`5`|
+
+
+
+  <h4> SAS Macros </h4>
+  @li mf_getuniquefileref.sas
+  @li mf_getuniquelibref.sas
+  @li mp_abort.sas
+
+  <h4> Related Files </h4>
+  @li ms_creategroup.sas
+  @li ms_createuser.sas
+
+**/
+
+%macro ms_adduser2group(uid=0
+    ,gid=0
+    ,outds=work.ms_adduser2group
+    ,mdebug=0
+  );
+
+%mp_abort(
+  iftrue=(&syscc ne 0)
+  ,mac=ms_adduser2group.sas
+  ,msg=%str(syscc=&syscc on macro entry)
+)
+
+%local fref0 fref1 fref2 libref optval rc msg;
+%let fref0=%mf_getuniquefileref();
+%let fref1=%mf_getuniquefileref();
+%let libref=%mf_getuniquelibref();
+
+/* avoid sending bom marker to API */
+%let optval=%sysfunc(getoption(bomfile));
+options nobomfile;
+
+data _null_;
+  file &fref0 lrecl=1000;
+  infile "&_sasjs_tokenfile" lrecl=1000;
+  input;
+  if _n_=1 then put "accept: application/json";
+  put _infile_;
+run;
+
+%if &mdebug=1 %then %do;
+  %put _local_;
+  data _null_;
+    infile &fref0;
+    input;
+    put _infile_;
+  run;
+%end;
+
+proc http method='POST' headerin=&fref0 out=&fref1
+  url="&_sasjs_apiserverurl/SASjsApi/group/&gid/&uid";
+%if &mdebug=1 %then %do;
+  debug level=1;
+%end;
+run;
+
+%mp_abort(
+  iftrue=(&syscc ne 0)
+  ,mac=ms_adduser2group.sas
+  ,msg=%str(Issue submitting query to SASjsApi/group)
+)
+
+libname &libref JSON fileref=&fref1;
+
+data &outds;
+  set &libref..users;
+  drop ordinal_root ordinal_users;
+%if &mdebug=1 %then %do;
+  putlog _all_;
+%end;
+run;
+
+
+%mp_abort(
+  iftrue=(&syscc ne 0)
+  ,mac=ms_creategroup.sas
+  ,msg=%str(Issue reading response JSON)
+)
+
+/* reset options */
+options &optval;
+
+%if &mdebug=0 %then %do;
+  filename &fref0 clear;
+  filename &fref1 clear;
+  libname &libref clear;
+%end;
+%else %do;
+  data _null_;
+    infile &fref1;
+    input;
+    putlog _infile_;
+  run;
+%end;
+
+%mend ms_adduser2group;

server/ms_createwebservice.sas

@@ -98,10 +98,12 @@ data _null_;
   put '%macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y ';
   put '  ,engine=DATASTEP ';
   put '  ,missing=NULL ';
-  put '  ,showmeta=NO ';
+  put '  ,showmeta=N ';
+  put '  ,maxobs=MAX ';
   put ')/*/STORE SOURCE*/; ';
-  put '%local tempds colinfo fmtds i numcols; ';
+  put '%local tempds colinfo fmtds i numcols stmt_obs; ';
   put '%let numcols=0; ';
+  put '%if &maxobs ne MAX %then %let stmt_obs=%str(if _n_>&maxobs then stop;); ';
   put ' ';
   put '%if &action=OPEN %then %do; ';
   put '  options nobomfile; ';
@@ -110,9 +112,23 @@ data _null_;
   put '  run; ';
   put '%end; ';
   put '%else %if (&action=ARR or &action=OBJ) %then %do; ';
+  put '  /* force variable names to always be uppercase in the JSON */ ';
   put '  options validvarname=upcase; ';
-  put '  data _null_; file &jref encoding=''utf-8'' mod; ';
+  put '  /* To avoid issues with _webout on EBI - such as encoding diffs and truncation ';
+  put '    (https://support.sas.com/kb/49/325.html) we use temporary files */ ';
+  put '  filename _sjs1 temp lrecl=200 ; ';
+  put '  data _null_; file _sjs1 encoding=''utf-8''; ';
   put '    put ", ""%lowcase(%sysfunc(coalescec(&dslabel,&ds)))"":"; ';
+  put '  run; ';
+  put '  /* now write to _webout 1 char at a time */ ';
+  put '  data _null_; ';
+  put '    infile _sjs1 lrecl=1 recfm=n; ';
+  put '    file &jref mod lrecl=1 recfm=n; ';
+  put '    input sourcechar $char1. @@; ';
+  put '    format sourcechar hex2.; ';
+  put '    put sourcechar char1. @@; ';
+  put '  run; ';
+  put '  filename _sjs1 clear; ';
   put ' ';
   put '  /* grab col defs */ ';
   put '  proc contents noprint data=&ds ';
@@ -166,13 +182,25 @@ data _null_;
   put '      %put &sysmacroname: Switching to DATASTEP engine; ';
   put '      %goto datastep; ';
   put '    %end; ';
-  put '    data &tempds;set &ds; ';
+  put '    data &tempds; ';
+  put '      set &ds; ';
+  put '      &stmt_obs; ';
   put '    %if &fmt=N %then format _numeric_ best32.;; ';
   put '    /* PRETTY is necessary to avoid line truncation in large files */ ';
-  put '    proc json out=&jref pretty ';
+  put '    filename _sjs2 temp lrecl=131068 encoding=''utf-8''; ';
+  put '    proc json out=_sjs2 pretty ';
   put '        %if &action=ARR %then nokeys ; ';
   put '        ;export &tempds / nosastags fmtnumeric; ';
   put '    run; ';
+  put '    /* send back to webout */ ';
+  put '    data _null_; ';
+  put '      infile _sjs2 lrecl=1 recfm=n; ';
+  put '      file &jref mod lrecl=1 recfm=n; ';
+  put '      input sourcechar $char1. @@; ';
+  put '      format sourcechar hex2.; ';
+  put '      put sourcechar char1. @@; ';
+  put '    run; ';
+  put '    filename _sjs2 clear; ';
   put '  %end; ';
   put '  %else %if &engine=DATASTEP %then %do; ';
   put '    %datastep: ';
@@ -231,6 +259,7 @@ data _null_;
   put '      %else %do; ';
   put '        set &ds; ';
   put '      %end; ';
+  put '      &stmt_obs; ';
   put '      format _numeric_ bart.; ';
   put '    %do i=1 %to &numcols; ';
   put '      %if &&typelong&i=char or &fmt=Y %then %do; ';
@@ -255,10 +284,9 @@ data _null_;
   put '    %end; ';
   put '    run; ';
   put ' ';
-  put '    /* write to temp loc to avoid _webout truncation ';
-  put '      - https://support.sas.com/kb/49/325.html */ ';
-  put '    filename _sjs temp lrecl=131068 encoding=''utf-8''; ';
-  put '    data _null_; file _sjs lrecl=131068 encoding=''utf-8'' mod ; ';
+  put '    filename _sjs3 temp lrecl=131068 ; ';
+  put '    data _null_; ';
+  put '      file _sjs3 encoding=''utf-8''; ';
   put '      if _n_=1 then put "["; ';
   put '      set &tempds; ';
   put '      if _n_>1 then put "," @; put ';
@@ -269,36 +297,35 @@ data _null_;
   put '        "&&name&i"n /* name literal for reserved variable names */ ';
   put '      %end; ';
   put '      %if &action=ARR %then "]" ; %else "}" ; ; ';
-  put '    /* now write the long strings to _webout 1 byte at a time */ ';
+  put ' ';
+  put '    /* close out the table */ ';
   put '    data _null_; ';
-  put '      length filein 8 fileid 8; ';
-  put '      filein=fopen("_sjs",''I'',1,''B''); ';
-  put '      fileid=fopen("&jref",''A'',1,''B''); ';
-  put '      rec=''20''x; ';
-  put '      do while(fread(filein)=0); ';
-  put '        rc=fget(filein,rec,1); ';
-  put '        rc=fput(fileid, rec); ';
-  put '        rc=fwrite(fileid); ';
-  put '      end; ';
-  put '      /* close out the table */ ';
-  put '      rc=fput(fileid, "]"); ';
-  put '      rc=fwrite(fileid); ';
-  put '      rc=fclose(filein); ';
-  put '      rc=fclose(fileid); ';
+  put '      file _sjs3 mod encoding=''utf-8''; ';
+  put '      put '']''; ';
   put '    run; ';
-  put '    filename _sjs clear; ';
+  put '    data _null_; ';
+  put '      infile _sjs3 lrecl=1 recfm=n; ';
+  put '      file &jref mod lrecl=1 recfm=n; ';
+  put '      input sourcechar $char1. @@; ';
+  put '      format sourcechar hex2.; ';
+  put '      put sourcechar char1. @@; ';
+  put '    run; ';
+  put '    filename _sjs3 clear; ';
   put '  %end; ';
   put ' ';
   put '  proc sql; ';
   put '  drop table &colinfo, &tempds; ';
   put ' ';
-  put '  %if &showmeta=YES %then %do; ';
-  put '    data _null_; file &jref encoding=''utf-8'' mod; ';
+  put '  %if %substr(&showmeta,1,1)=Y %then %do; ';
+  put '    filename _sjs4 temp lrecl=131068 encoding=''utf-8''; ';
+  put '    data _null_; ';
+  put '      file _sjs4; ';
+  put '      length label $350; ';
   put '      put ", ""$%lowcase(%sysfunc(coalescec(&dslabel,&ds)))"":{""vars"":{"; ';
   put '      do i=1 to &numcols; ';
   put '        name=quote(trim(symget(cats(''name'',i)))); ';
   put '        format=quote(trim(symget(cats(''fmt'',i)))); ';
-  put '        label=quote(trim(symget(cats(''label'',i)))); ';
+  put '        label=quote(prxchange(''s/\\/\\\\/'',-1,trim(symget(cats(''label'',i))))); ';
   put '        length=quote(trim(symget(cats(''length'',i)))); ';
   put '        type=quote(trim(symget(cats(''typelong'',i)))); ';
   put '        if i>1 then put "," @@; ';
@@ -307,6 +334,15 @@ data _null_;
   put '      end; ';
   put '      put ''}}''; ';
   put '    run; ';
+  put '    /* send back to webout */ ';
+  put '    data _null_; ';
+  put '      infile _sjs4 lrecl=1 recfm=n; ';
+  put '      file &jref mod lrecl=1 recfm=n; ';
+  put '      input sourcechar $char1. @@; ';
+  put '      format sourcechar hex2.; ';
+  put '      put sourcechar char1. @@; ';
+  put '    run; ';
+  put '    filename _sjs4 clear; ';
   put '  %end; ';
   put '%end; ';
   put ' ';
@@ -317,18 +353,19 @@ data _null_;
   put '%end; ';
   put '%mend mp_jsonout; ';
   put ' ';
-  put '%macro mf_getuser(type=META ';
+  put '%macro mf_getuser( ';
   put ')/*/STORE SOURCE*/; ';
-  put '  %local user metavar; ';
-  put '  %if &type=OS %then %let metavar=_secureusername; ';
-  put '  %else %let metavar=_metaperson; ';
+  put '  %local user; ';
   put ' ';
-  put '  %if %symexist(SYS_COMPUTE_SESSION_OWNER) %then %let user=&SYS_COMPUTE_SESSION_OWNER; ';
-  put '  %else %if %symexist(&metavar) %then %do; ';
-  put '    %if %length(&&&metavar)=0 %then %let user=&sysuserid; ';
+  put '  %if %symexist(_sasjs_username) %then %let user=&_sasjs_username; ';
+  put '  %else %if %symexist(SYS_COMPUTE_SESSION_OWNER) %then %do; ';
+  put '    %let user=&SYS_COMPUTE_SESSION_OWNER; ';
+  put '  %end; ';
+  put '  %else %if %symexist(_metaperson) %then %do; ';
+  put '    %if %length(&_metaperson)=0 %then %let user=&sysuserid; ';
   put '    /* sometimes SAS will add @domain extension - remove for consistency */ ';
   put '    /* but be sure to quote in case of usernames with commas */ ';
-  put '    %else %let user=%unquote(%scan(%quote(&&&metavar),1,@)); ';
+  put '    %else %let user=%unquote(%scan(%quote(&_metaperson),1,@)); ';
   put '  %end; ';
   put '  %else %let user=&sysuserid; ';
   put ' ';
@@ -337,7 +374,7 @@ data _null_;
   put '%mend mf_getuser; ';
   put ' ';
   put '%macro ms_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL ';
-  put '  ,showmeta=NO ';
+  put '  ,showmeta=N ';
   put '); ';
   put '%global _webin_file_count _webin_fileref1 _webin_name1 _program _debug ';
   put '  sasjs_tables; ';
@@ -402,7 +439,6 @@ data _null_;
   put '%else %if &action=CLOSE %then %do; ';
   put '  %if %str(&_debug) ge 131 %then %do; ';
   put '    /* if debug mode, send back first 10 records of each work table also */ ';
-  put '    options obs=10; ';
   put '    data;run;%let tempds=%scan(&syslast,2,.); ';
   put '    ods output Members=&tempds; ';
   put '    proc datasets library=WORK memtype=data; ';
@@ -427,7 +463,7 @@ data _null_;
   put '        put " ""&wt"" : {"; ';
   put '        put ''"nlobs":'' nlobs; ';
   put '        put '',"nvars":'' nvars; ';
-  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=YES) ';
+  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y,maxobs=10) ';
   put '      data _null_; file &fref mod encoding=''utf-8'' termstr=lf; ';
   put '        put "}"; ';
   put '    %end; ';
@@ -443,7 +479,8 @@ data _null_;
   put '    put ",""_DEBUG"" : ""&_debug"" "; ';
   put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
   put '    put ",""SYSCC"" : ""&syscc"" "; ';
-  put '    syserrortext=quote(cats(symget(''SYSERRORTEXT''))); ';
+  put '    put ",""SYSENCODING"" : ""&sysencoding"" "; ';
+  put '    syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); ';
   put '    put '',"SYSERRORTEXT" : '' syserrortext; ';
   put '    SYSHOSTINFOLONG=quote(trim(symget(''SYSHOSTINFOLONG''))); ';
   put '    put '',"SYSHOSTINFOLONG" : '' SYSHOSTINFOLONG; ';
@@ -459,7 +496,7 @@ data _null_;
   put '    put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" "; ';
   put '    sysvlong=quote(trim(symget(''sysvlong''))); ';
   put '    put '',"SYSVLONG" : '' sysvlong; ';
-  put '    syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); ';
+  put '    syswarningtext=cats(''"'',tranwrd(symget(''syswarningtext''),''"'',''\"''),''"''); ';
   put '    put '',"SYSWARNINGTEXT" : '' syswarningtext; ';
   put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
   put '    length autoexec $512; ';

server/ms_getgroups.sas

@@ -2,13 +2,24 @@
   @file
   @brief Fetches the list of groups from SASjs Server
   @details Fetches the list of groups from SASjs Server and writes them to an
-  output dataset.
+  output dataset.  Provide a username to filter for the groups for a particular
+  user.
 
   Example:
 
       %ms_getgroups(outds=userlist)
 
+  With filter on username:
+
+      %ms_getgroups(outds=userlist, user=James)
+
+  With filter on userid:
+
+      %ms_getgroups(outds=userlist, uid=1)
+
   @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
+  @param [in] user= (0) Provide the username on which to filter
+  @param [in] uid= (0) Provide the userid on which to filter
   @param [out] outds= (work.ms_getgroups) This output dataset will contain the
     list of groups. Format:
 |NAME:$32.|DESCRIPTION:$64.|GROUPID:best.|
@@ -25,22 +36,38 @@
 
   <h4> Related Files </h4>
   @li ms_creategroup.sas
-  @li ms_getusers.test.sas
+  @li ms_getgroups.test.sas
 
 **/
 
 %macro ms_getgroups(
-    outds=work.ms_getgroups
-    ,mdebug=0
-  );
+  user=0,
+  uid=0,
+  outds=work.ms_getgroups,
+  mdebug=0
+);
 
 %mp_abort(
   iftrue=(&syscc ne 0)
-  ,mac=ms_getusers.sas
+  ,mac=ms_getgroups.sas
   ,msg=%str(syscc=&syscc on macro entry)
 )
 
-%local fref0 fref1 libref optval rc msg;
+%local fref0 fref1 libref optval rc msg url;
+
+%if %sysget(MODE)=desktop %then %do;
+  /* groups api does not exist in desktop mode */
+  data &outds;
+    length NAME $32 DESCRIPTION $64. GROUPID 8;
+    name="&sysuserid";
+    description="&sysuserid (group - desktop mode)";
+    groupid=1;
+    output;
+    stop;
+  run;
+  %return;
+%end;
+
 %let fref0=%mf_getuniquefileref();
 %let fref1=%mf_getuniquefileref();
 %let libref=%mf_getuniquelibref();
@@ -65,8 +92,13 @@ run;
   run;
 %end;
 
+%if "&user" ne "0" %then %let url=/SASjsApi/user/by/username/&user;
+%else %if "&uid" ne "0" %then %let url=/SASjsApi/user/&uid;
+%else %let url=/SASjsApi/group;
+
+
 proc http method='GET' headerin=&fref0 out=&fref1
-  url="&_sasjs_apiserverurl/SASjsApi/group";
+  url="&_sasjs_apiserverurl.&url";
 %if &mdebug=1 %then %do;
   debug level=1;
 %end;
@@ -75,21 +107,31 @@ run;
 %mp_abort(
   iftrue=(&syscc ne 0)
   ,mac=ms_getgroups.sas
-  ,msg=%str(Issue submitting GET query to SASjsApi/group)
+  ,msg=%str(Issue submitting GET query to SASjsApi)
 )
 
 libname &libref JSON fileref=&fref1;
 
-data &outds;
-  length NAME $32 DESCRIPTION $64. GROUPID 8;
-  if _n_=1 then call missing(of _all_);
-  set &libref..root;
-  drop ordinal_root;
-run;
+%if "&user"="0" and "&uid"="0" %then %do;
+  data &outds;
+    length NAME $32 DESCRIPTION $64. GROUPID 8;
+    if _n_=1 then call missing(of _all_);
+    set &libref..root;
+    drop ordinal_root;
+  run;
+%end;
+%else %do;
+  data &outds;
+    length NAME $32 DESCRIPTION $64. GROUPID 8;
+    if _n_=1 then call missing(of _all_);
+    set &libref..groups;
+    drop ordinal_:;
+  run;
+%end;
 
 %mp_abort(
   iftrue=(&syscc ne 0)
-  ,mac=ms_getusers.sas
+  ,mac=ms_getgroups.sas
   ,msg=%str(Issue reading response JSON)
 )
 

server/ms_getusers.sas

@@ -2,16 +2,26 @@
   @file
   @brief Fetches the list of users from SASjs Server
   @details Fetches the list of users from SASjs Server and writes them to an
-  output dataset.
+  output dataset.  Can also be filtered, for a particular group.
 
   Example:
 
       %ms_getusers(outds=userlist)
 
+  Filtering for a group by group name:
+
+      %ms_getusers(outds=work.groupmembers, group=GROUPNAME)
+
+  Filtering for a group by group id:
+
+      %ms_getusers(outds=work.groupmembers, gid=1)
+
   @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
+  @param [in] group= (0) Set to a group name to filter members for that group
+  @param [in] gid= (0) Set to a group id to filter members for that group
   @param [out] outds= (work.ms_getusers) This output dataset will contain the
     list of user accounts. Format:
-|DISPLAYNAME:$18.|USERNAME:$10.|ID:best.|
+|DISPLAYNAME:$60.|USERNAME:$30.|ID:best.|
 |---|---|---|
 |`Super Admin `|`secretuser `|`1`|
 |`Sabir Hassan`|`sabir`|`2`|
@@ -20,7 +30,6 @@
 |`New User `|`newuser `|`5`|
 
 
-
   <h4> SAS Macros </h4>
   @li mf_getuniquefileref.sas
   @li mf_getuniquelibref.sas
@@ -28,14 +37,17 @@
 
   <h4> Related Files </h4>
   @li ms_createuser.sas
+  @li ms_getgroups.sas
   @li ms_getusers.test.sas
 
 **/
 
 %macro ms_getusers(
-    outds=work.ms_getusers
-    ,mdebug=0
-  );
+  outds=work.ms_getusers,
+  group=0,
+  gid=0,
+  mdebug=0
+);
 
 %mp_abort(
   iftrue=(&syscc ne 0)
@@ -43,11 +55,24 @@
   ,msg=%str(syscc=&syscc on macro entry)
 )
 
-%local fref0 fref1 libref optval rc msg;
+%local fref0 fref1 libref optval rc msg url;
 %let fref0=%mf_getuniquefileref();
 %let fref1=%mf_getuniquefileref();
 %let libref=%mf_getuniquelibref();
 
+%if %sysget(MODE)=desktop %then %do;
+  /* users api does not exist in desktop mode */
+  data &outds;
+    length DISPLAYNAME $60 USERNAME:$30 ID 8;
+    USERNAME="&sysuserid";
+    DISPLAYNAME="&sysuserid (desktop mode)";
+    ID=1;
+    output;
+    stop;
+  run;
+  %return;
+%end;
+
 /* avoid sending bom marker to API */
 %let optval=%sysfunc(getoption(bomfile));
 options nobomfile;
@@ -68,26 +93,42 @@ run;
   run;
 %end;
 
+%if "&group" ne "0" %then %let url=/SASjsApi/group/by/groupname/&group;
+%else %if "&gid" ne "0" %then %let url=/SASjsApi/group/&gid;
+%else %let url=/SASjsApi/user;
+
 proc http method='GET' headerin=&fref0 out=&fref1
-  url="&_sasjs_apiserverurl/SASjsApi/user";
+  url="&_sasjs_apiserverurl.&url";
 %if &mdebug=1 %then %do;
   debug level=1;
 %end;
 run;
 
+
 %mp_abort(
   iftrue=(&syscc ne 0)
   ,mac=ms_getusers.sas
-  ,msg=%str(Issue submitting GET query to SASjsApi/user)
+  ,msg=%str(Issue submitting API query)
 )
 
 libname &libref JSON fileref=&fref1;
 
-data &outds;
-  set &libref..root;
-  drop ordinal_root;
-run;
-
+%if "&group"="0" and "&gid"="0" %then %do;
+  data &outds;
+    length DISPLAYNAME $60 USERNAME:$30 ID 8;
+    if nobs=0 then call missing(of _all_);
+    set &libref..root nobs=nobs;
+    drop ordinal_root;
+  run;
+%end;
+%else %do;
+  data &outds;
+    length DISPLAYNAME $60 USERNAME:$30 ID 8;
+    if nobs=0 then call missing(of _all_);
+    set &libref..users nobs=nobs;
+    drop ordinal_root ordinal_users;
+  run;
+%end;
 
 %mp_abort(
   iftrue=(&syscc ne 0)

server/ms_webout.sas

@@ -27,7 +27,7 @@
   @param [out] fref= (_webout) The fileref to which to write the JSON
   @param [in] missing= (NULL) Special numeric missing values can be sent as NULL
     (eg `null`) or as STRING values (eg `".a"` or `".b"`)
-  @param [in] showmeta= (NO) Set to YES to output metadata alongside each table,
+  @param [in] showmeta= (N) Set to Y to output metadata alongside each table,
     such as the column formats and types.  The metadata is contained inside an
     object with the same name as the table but prefixed with a dollar sign - ie,
     `,"$tablename":{"formats":{"col1":"$CHAR1"},"types":{"COL1":"C"}}`
@@ -47,7 +47,7 @@
 **/
 
 %macro ms_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL
-  ,showmeta=NO
+  ,showmeta=N
 );
 %global _webin_file_count _webin_fileref1 _webin_name1 _program _debug
   sasjs_tables;
@@ -112,7 +112,6 @@
 %else %if &action=CLOSE %then %do;
   %if %str(&_debug) ge 131 %then %do;
     /* if debug mode, send back first 10 records of each work table also */
-    options obs=10;
     data;run;%let tempds=%scan(&syslast,2,.);
     ods output Members=&tempds;
     proc datasets library=WORK memtype=data;
@@ -137,7 +136,7 @@
         put " ""&wt"" : {";
         put '"nlobs":' nlobs;
         put ',"nvars":' nvars;
-      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=YES)
+      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y,maxobs=10)
       data _null_; file &fref mod encoding='utf-8' termstr=lf;
         put "}";
     %end;
@@ -153,7 +152,8 @@
     put ",""_DEBUG"" : ""&_debug"" ";
     put ',"_PROGRAM" : ' _PROGRAM ;
     put ",""SYSCC"" : ""&syscc"" ";
-    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    put ",""SYSENCODING"" : ""&sysencoding"" ";
+    syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"');
     put ',"SYSERRORTEXT" : ' syserrortext;
     SYSHOSTINFOLONG=quote(trim(symget('SYSHOSTINFOLONG')));
     put ',"SYSHOSTINFOLONG" : ' SYSHOSTINFOLONG;
@@ -169,7 +169,7 @@
     put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" ";
     sysvlong=quote(trim(symget('sysvlong')));
     put ',"SYSVLONG" : ' sysvlong;
-    syswarningtext=quote(cats(symget('SYSWARNINGTEXT')));
+    syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"');
     put ',"SYSWARNINGTEXT" : ' syswarningtext;
     put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
     length autoexec $512;

tests/base/mf_increment.test.sas

@@ -0,0 +1,35 @@
+/**
+  @file
+  @brief Testing mf_increment macro
+
+  <h4> SAS Macros </h4>
+  @li mf_increment.sas
+  @li mp_assert.sas
+
+**/
+
+%let var=0;
+
+%mp_assert(
+  iftrue=(
+    "%mf_increment(var)"="1"
+  ),
+  desc=Checking basic mf_increment usage 1,
+  outds=work.test_results
+)
+
+%mp_assert(
+  iftrue=(
+    "%mf_increment(var)"="2"
+  ),
+  desc=Checking basic mf_increment usage 2,
+  outds=work.test_results
+)
+
+%mp_assert(
+  iftrue=(
+    "%mf_increment(var,incr=2)"="4"
+  ),
+  desc=Checking incr option,
+  outds=work.test_results
+)

tests/base/mp_binarycopy.test.sas

@@ -5,6 +5,7 @@
   <h4> SAS Macros </h4>
   @li mp_binarycopy.sas
   @li mp_assert.sas
+  @li mp_hashdataset.sas
 
 **/
 
@@ -96,4 +97,40 @@ run;
   iftrue=("&string4"="&string4_check"),
   desc=Append Check (ref to file),
   outds=work.test_results
-)
+)
+
+/* test 5 - ensure copy works for binary characters */
+/* do this backwards to avoid null chars in JSON preview */
+data work.test5;
+do i=255 to 1 by -1;
+  str=byte(i);
+  output;
+end;
+run;
+/* get an md5 hash of the ds */
+%mp_hashdataset(work.test5,outds=myhash)
+
+/* copy it */
+%mp_binarycopy(inloc="%sysfunc(pathname(work))/test5.sas7bdat",
+  outloc="%sysfunc(pathname(work))/test5copy.sas7bdat"
+)
+
+/* get an md5 hash of the copied ds */
+%mp_hashdataset(work.test5copy,outds=myhash2)
+
+/* compare hashes */
+%let test5a=0;
+%let test5b=1;
+data _null_;
+  set myhash;
+  call symputx('test5a',hashkey);
+run;
+data _null_;
+  set myhash2;
+  call symputx('test5b',hashkey);
+run;
+%mp_assert(
+  iftrue=("&test5a"="&test5b"),
+  desc=Ensuring binary copy works on binary characters,
+  outds=work.test_results
+)

tests/base/mp_filtercheck.test.sas

@@ -38,7 +38,7 @@ William,M,15,66.5,112
 ;;;;
 run;
 
-/* valid filter conditions */
+/* VALID filter conditions */
 data work.inds;
   infile datalines4 dsd;
   input GROUP_LOGIC:$3. SUBGROUP_LOGIC:$3. SUBGROUP_ID:8. VARIABLE_NM:$32.
@@ -51,6 +51,9 @@ AND,OR,2,Weight,>=,77.7
 AND,OR,2,Weight,NE,77.7
 AND,AND,1,age,=,.A
 AND,AND,1,height,<,.B
+AND,AND,1,age,IN,"(.a,.b,.)"
+AND,AND,1,age,IN,"(.A)"
+
 ;;;;
 run;
 
@@ -115,6 +118,28 @@ run;
   outds=work.test_results
 )
 
+/* invalid IN value */
+data work.inds;
+  infile datalines4 dsd;
+  input GROUP_LOGIC:$3. SUBGROUP_LOGIC:$3. SUBGROUP_ID:8. VARIABLE_NM:$32.
+    OPERATOR_NM:$10. RAW_VALUE:$4000.;
+datalines4;
+AND,OR,2,age,IN,"(.,.a,X)"
+;;;;
+run;
+
+%mp_filtercheck(work.inds,
+  targetds=work.class,
+  outds=work.badrecords,
+  abort=NO
+)
+%let syscc=0;
+%mp_assertdsobs(work.badrecords,
+  desc=Invalid IN value,
+  test=HASOBS,
+  outds=work.test_results
+)
+
 /* Code injection - column name */
 data work.inds;
   infile datalines4 dsd;
@@ -163,7 +188,7 @@ run;
 data work.inds;
   infile datalines4 dsd;
   input GROUP_LOGIC:$3. SUBGROUP_LOGIC:$3. SUBGROUP_ID:8. VARIABLE_NM:$32.
-    OPERATOR_NM:$10. RAW_VALUE:8;
+    OPERATOR_NM:$10. RAW_VALUE:8.;
 datalines4;
 AND,AND,1,age,=,0
 ;;;;

tests/base/mp_filterstore.test.1.sas

@@ -56,6 +56,9 @@ AND,AND,1,SEX,<=,"'M'"
 AND,OR,2,Name,NOT IN,"('Jane','Alfred')"
 AND,OR,2,Weight,>=,77.7
 AND,OR,2,Weight,NE,77.7
+AND,AND,3,age,NOT IN,"(.a,.b,.)"
+AND,AND,3,age,NOT IN,"(.A)"
+AND,AND,4,Name,=,"'Jeremiah'"
 ;;;;
 run;
 

tests/serveronly/ms_adduser2group.test.sas

@@ -0,0 +1,52 @@
+/**
+  @file
+  @brief Testing ms_adduser2group.sas macro
+
+  <h4> SAS Macros </h4>
+  @li mf_getuniquename.sas
+  @li mp_assert.sas
+  @li mp_assertscope.sas
+  @li ms_adduser2group.sas
+  @li ms_creategroup.sas
+
+**/
+
+/* first, create an empty group */
+%let group=%substr(%mf_getuniquename(),1,8);
+%ms_creategroup(&group, desc=The description,mdebug=&sasjs_mdebug,outds=test1a)
+%let groupid=0;
+data _null_;
+  set work.test1a;
+  call symputx('groupid',groupid);
+run;
+%mp_assert(
+  iftrue=(&groupid>0),
+  desc=Checking that group was created with an ID,
+  outds=work.test_results
+)
+
+/* now add a user (user 1 always exists) */
+
+
+%mp_assertscope(SNAPSHOT)
+%ms_adduser2group(uid=1,gid=&groupid,mdebug=&sasjs_mdebug,outds=test1)
+%mp_assertscope(COMPARE
+  ,ignorelist=MCLIB0_JADP1LEN MCLIB0_JADPNUM MCLIB0_JADVLEN
+)
+
+/* check the user is in the output list */
+%let checkid=0;
+data _null_;
+  set work.test1;
+  if id=1 then call symputx('checkid',1);
+run;
+%mp_assert(
+  iftrue=(&checkid=1),
+  desc=Checking that user was created in the new group,
+  outds=work.test_results
+)
+
+
+
+
+

tests/serveronly/ms_creategroup.test.sas

@@ -35,7 +35,7 @@ run;
 %let checkid=0;
 data _null_;
   set work.test2;
-  where name="&group";
+  where upcase(name)="%upcase(&group)";
   call symputx('checkid',groupid);
 run;
 %mp_assert(

tests/serveronly/ms_createuser.test.sas

@@ -23,6 +23,7 @@
 data _null_;
   set work.test1;
   call symputx('id',id);
+  putlog (_all_)(=);
 run;
 %mp_assert(
   iftrue=(&id>0),
@@ -35,7 +36,8 @@ run;
 %let checkid=0;
 data _null_;
   set work.test2;
-  where username="&user";
+  if _n_<20 then putlog (_all_)(=);
+  if upcase(username)="%upcase(&user)";
   call symputx('checkid',id);
 run;
 %mp_assert(

tests/serveronly/ms_getgroups.test.sas

@@ -3,21 +3,64 @@
   @brief Testing ms_getgroups.sas macro
 
   <h4> SAS Macros </h4>
+  @li mf_getuniquename.sas
+  @li ms_adduser2group.sas
+  @li ms_creategroup.sas
   @li ms_getgroups.sas
+  @li mp_assert.sas
   @li mp_assertdsobs.sas
   @li mp_assertscope.sas
 
 **/
 
+/* create a group */
+%let group=%substr(%mf_getuniquename(),1,8);
+%ms_creategroup(&group, desc=The description,mdebug=&sasjs_mdebug,outds=test1)
 
+/* get groups */
 %mp_assertscope(SNAPSHOT)
 %ms_getgroups(outds=work.test1,mdebug=&sasjs_mdebug)
 %mp_assertscope(COMPARE
   ,ignorelist=MCLIB0_JADP1LEN MCLIB0_JADPNUM MCLIB0_JADVLEN
 )
 
+/* check the group was created */
 %mp_assertdsobs(work.test1,test=ATLEAST 1)
 
+%let test2=0;
+%put &=group;
+data _null_;
+  set work.test1;
+  putlog (_all_)(=);
+  if upcase(name)="%upcase(&group)" then do;
+    putlog "&group found!";
+    call symputx('test2',1);
+    call symputx('gid',groupid); /* used in next test */
+  end;
+run;
+
+%mp_assert(
+  iftrue=("&test2"="1"),
+  desc=Checking group was created,
+  outds=work.test_results
+)
 
 
+/* now check if the filter for the groups for a user works */
 
+/* add a member */
+%ms_adduser2group(uid=1,gid=&gid)
+
+%ms_getgroups(user=secretuser,outds=work.test3)
+
+%let test3=0;
+data _null_;
+  set work.test3;
+  if groupid=&gid then call symputx('test3',1);
+run;
+
+%mp_assert(
+  iftrue=("&test3"="1"),
+  desc=Checking group list was returned for a user,
+  outds=work.test_results
+)

tests/serveronly/ms_getusers.test.sas

@@ -3,6 +3,8 @@
   @brief Testing ms_getusers.sas macro
 
   <h4> SAS Macros </h4>
+  @li ms_creategroup.sas
+  @li ms_adduser2group.sas
   @li ms_getusers.sas
   @li mp_assertdsobs.sas
   @li mp_assertscope.sas
@@ -18,6 +20,39 @@
 
 %mp_assertdsobs(work.test1,test=ATLEAST 1)
 
+/**
+  * test the extraction of group members
+  */
+
+/* create a group */
+%let group=%substr(%mf_getuniquename(),1,8);
+%ms_creategroup(&group, desc=some desc,mdebug=&sasjs_mdebug,outds=work.group)
+%let gid=0;
+data _null_;
+  set work.group;
+  call symputx('gid',groupid);
+run;
+
+/* add a member */
+%ms_adduser2group(uid=1,gid=&gid)
+
+/* extract the members */
+%ms_getusers(group=&group,outds=test2)
+
+/* check the user is in the output list */
+%let checkid=0;
+data _null_;
+  set work.test2;
+  if id=1 then call symputx('checkid',1);
+run;
+%mp_assert(
+  iftrue=(&checkid=1),
+  desc=Checking that admin user was created in the new group,
+  outds=work.test_results
+)
+
+
+
 
 
 

tests/serveronly/ms_runstp.test.sas

@@ -34,7 +34,7 @@ options mprint;
 )
 %mp_assertscope(COMPARE)
 
-libname webeen json (weboot);
+libname webeen json fileref=weboot;
 
 data _null_;
   infile weboot;

tests/serveronly/ms_testservice.test.sas

@@ -10,7 +10,12 @@
 **/
 
 filename ft15f001 temp;
-parmcards4;
+data _null_;
+  file ft15f001;
+  infile cards;
+  input;
+  put _infile_;
+cards4;
   %put Initialising sendObj: ;
   %put _all_;
   %webout(FETCH)
@@ -27,6 +32,7 @@ parmcards4;
   %mend x; %x()
   %webout(CLOSE)
 ;;;;
+run;
 %put creating web service: &mcTestAppLoc/services;
 %ms_createwebservice(
   path=&mcTestAppLoc/services,

tests/serveronly/ms_webout.test.sas

@@ -20,7 +20,7 @@ run;
 %ms_webout(OBJ,datasets,fref=&fref)
 %ms_webout(CLOSE,fref=&fref)
 
-libname test JSON (&fref);
+libname test JSON fileref=&fref;
 data root;
   set test.root;
   call symputx('checkval',sysvlong);

viya/mv_createwebservice.sas

@@ -240,10 +240,12 @@ data _null_;
   put '%macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y ';
   put '  ,engine=DATASTEP ';
   put '  ,missing=NULL ';
-  put '  ,showmeta=NO ';
+  put '  ,showmeta=N ';
+  put '  ,maxobs=MAX ';
   put ')/*/STORE SOURCE*/; ';
-  put '%local tempds colinfo fmtds i numcols; ';
+  put '%local tempds colinfo fmtds i numcols stmt_obs; ';
   put '%let numcols=0; ';
+  put '%if &maxobs ne MAX %then %let stmt_obs=%str(if _n_>&maxobs then stop;); ';
   put ' ';
   put '%if &action=OPEN %then %do; ';
   put '  options nobomfile; ';
@@ -252,9 +254,23 @@ data _null_;
   put '  run; ';
   put '%end; ';
   put '%else %if (&action=ARR or &action=OBJ) %then %do; ';
+  put '  /* force variable names to always be uppercase in the JSON */ ';
   put '  options validvarname=upcase; ';
-  put '  data _null_; file &jref encoding=''utf-8'' mod; ';
+  put '  /* To avoid issues with _webout on EBI - such as encoding diffs and truncation ';
+  put '    (https://support.sas.com/kb/49/325.html) we use temporary files */ ';
+  put '  filename _sjs1 temp lrecl=200 ; ';
+  put '  data _null_; file _sjs1 encoding=''utf-8''; ';
   put '    put ", ""%lowcase(%sysfunc(coalescec(&dslabel,&ds)))"":"; ';
+  put '  run; ';
+  put '  /* now write to _webout 1 char at a time */ ';
+  put '  data _null_; ';
+  put '    infile _sjs1 lrecl=1 recfm=n; ';
+  put '    file &jref mod lrecl=1 recfm=n; ';
+  put '    input sourcechar $char1. @@; ';
+  put '    format sourcechar hex2.; ';
+  put '    put sourcechar char1. @@; ';
+  put '  run; ';
+  put '  filename _sjs1 clear; ';
   put ' ';
   put '  /* grab col defs */ ';
   put '  proc contents noprint data=&ds ';
@@ -308,13 +324,25 @@ data _null_;
   put '      %put &sysmacroname: Switching to DATASTEP engine; ';
   put '      %goto datastep; ';
   put '    %end; ';
-  put '    data &tempds;set &ds; ';
+  put '    data &tempds; ';
+  put '      set &ds; ';
+  put '      &stmt_obs; ';
   put '    %if &fmt=N %then format _numeric_ best32.;; ';
   put '    /* PRETTY is necessary to avoid line truncation in large files */ ';
-  put '    proc json out=&jref pretty ';
+  put '    filename _sjs2 temp lrecl=131068 encoding=''utf-8''; ';
+  put '    proc json out=_sjs2 pretty ';
   put '        %if &action=ARR %then nokeys ; ';
   put '        ;export &tempds / nosastags fmtnumeric; ';
   put '    run; ';
+  put '    /* send back to webout */ ';
+  put '    data _null_; ';
+  put '      infile _sjs2 lrecl=1 recfm=n; ';
+  put '      file &jref mod lrecl=1 recfm=n; ';
+  put '      input sourcechar $char1. @@; ';
+  put '      format sourcechar hex2.; ';
+  put '      put sourcechar char1. @@; ';
+  put '    run; ';
+  put '    filename _sjs2 clear; ';
   put '  %end; ';
   put '  %else %if &engine=DATASTEP %then %do; ';
   put '    %datastep: ';
@@ -373,6 +401,7 @@ data _null_;
   put '      %else %do; ';
   put '        set &ds; ';
   put '      %end; ';
+  put '      &stmt_obs; ';
   put '      format _numeric_ bart.; ';
   put '    %do i=1 %to &numcols; ';
   put '      %if &&typelong&i=char or &fmt=Y %then %do; ';
@@ -397,10 +426,9 @@ data _null_;
   put '    %end; ';
   put '    run; ';
   put ' ';
-  put '    /* write to temp loc to avoid _webout truncation ';
-  put '      - https://support.sas.com/kb/49/325.html */ ';
-  put '    filename _sjs temp lrecl=131068 encoding=''utf-8''; ';
-  put '    data _null_; file _sjs lrecl=131068 encoding=''utf-8'' mod ; ';
+  put '    filename _sjs3 temp lrecl=131068 ; ';
+  put '    data _null_; ';
+  put '      file _sjs3 encoding=''utf-8''; ';
   put '      if _n_=1 then put "["; ';
   put '      set &tempds; ';
   put '      if _n_>1 then put "," @; put ';
@@ -411,36 +439,35 @@ data _null_;
   put '        "&&name&i"n /* name literal for reserved variable names */ ';
   put '      %end; ';
   put '      %if &action=ARR %then "]" ; %else "}" ; ; ';
-  put '    /* now write the long strings to _webout 1 byte at a time */ ';
+  put ' ';
+  put '    /* close out the table */ ';
   put '    data _null_; ';
-  put '      length filein 8 fileid 8; ';
-  put '      filein=fopen("_sjs",''I'',1,''B''); ';
-  put '      fileid=fopen("&jref",''A'',1,''B''); ';
-  put '      rec=''20''x; ';
-  put '      do while(fread(filein)=0); ';
-  put '        rc=fget(filein,rec,1); ';
-  put '        rc=fput(fileid, rec); ';
-  put '        rc=fwrite(fileid); ';
-  put '      end; ';
-  put '      /* close out the table */ ';
-  put '      rc=fput(fileid, "]"); ';
-  put '      rc=fwrite(fileid); ';
-  put '      rc=fclose(filein); ';
-  put '      rc=fclose(fileid); ';
+  put '      file _sjs3 mod encoding=''utf-8''; ';
+  put '      put '']''; ';
   put '    run; ';
-  put '    filename _sjs clear; ';
+  put '    data _null_; ';
+  put '      infile _sjs3 lrecl=1 recfm=n; ';
+  put '      file &jref mod lrecl=1 recfm=n; ';
+  put '      input sourcechar $char1. @@; ';
+  put '      format sourcechar hex2.; ';
+  put '      put sourcechar char1. @@; ';
+  put '    run; ';
+  put '    filename _sjs3 clear; ';
   put '  %end; ';
   put ' ';
   put '  proc sql; ';
   put '  drop table &colinfo, &tempds; ';
   put ' ';
-  put '  %if &showmeta=YES %then %do; ';
-  put '    data _null_; file &jref encoding=''utf-8'' mod; ';
+  put '  %if %substr(&showmeta,1,1)=Y %then %do; ';
+  put '    filename _sjs4 temp lrecl=131068 encoding=''utf-8''; ';
+  put '    data _null_; ';
+  put '      file _sjs4; ';
+  put '      length label $350; ';
   put '      put ", ""$%lowcase(%sysfunc(coalescec(&dslabel,&ds)))"":{""vars"":{"; ';
   put '      do i=1 to &numcols; ';
   put '        name=quote(trim(symget(cats(''name'',i)))); ';
   put '        format=quote(trim(symget(cats(''fmt'',i)))); ';
-  put '        label=quote(trim(symget(cats(''label'',i)))); ';
+  put '        label=quote(prxchange(''s/\\/\\\\/'',-1,trim(symget(cats(''label'',i))))); ';
   put '        length=quote(trim(symget(cats(''length'',i)))); ';
   put '        type=quote(trim(symget(cats(''typelong'',i)))); ';
   put '        if i>1 then put "," @@; ';
@@ -449,6 +476,15 @@ data _null_;
   put '      end; ';
   put '      put ''}}''; ';
   put '    run; ';
+  put '    /* send back to webout */ ';
+  put '    data _null_; ';
+  put '      infile _sjs4 lrecl=1 recfm=n; ';
+  put '      file &jref mod lrecl=1 recfm=n; ';
+  put '      input sourcechar $char1. @@; ';
+  put '      format sourcechar hex2.; ';
+  put '      put sourcechar char1. @@; ';
+  put '    run; ';
+  put '    filename _sjs4 clear; ';
   put '  %end; ';
   put '%end; ';
   put ' ';
@@ -459,18 +495,19 @@ data _null_;
   put '%end; ';
   put '%mend mp_jsonout; ';
   put ' ';
-  put '%macro mf_getuser(type=META ';
+  put '%macro mf_getuser( ';
   put ')/*/STORE SOURCE*/; ';
-  put '  %local user metavar; ';
-  put '  %if &type=OS %then %let metavar=_secureusername; ';
-  put '  %else %let metavar=_metaperson; ';
+  put '  %local user; ';
   put ' ';
-  put '  %if %symexist(SYS_COMPUTE_SESSION_OWNER) %then %let user=&SYS_COMPUTE_SESSION_OWNER; ';
-  put '  %else %if %symexist(&metavar) %then %do; ';
-  put '    %if %length(&&&metavar)=0 %then %let user=&sysuserid; ';
+  put '  %if %symexist(_sasjs_username) %then %let user=&_sasjs_username; ';
+  put '  %else %if %symexist(SYS_COMPUTE_SESSION_OWNER) %then %do; ';
+  put '    %let user=&SYS_COMPUTE_SESSION_OWNER; ';
+  put '  %end; ';
+  put '  %else %if %symexist(_metaperson) %then %do; ';
+  put '    %if %length(&_metaperson)=0 %then %let user=&sysuserid; ';
   put '    /* sometimes SAS will add @domain extension - remove for consistency */ ';
   put '    /* but be sure to quote in case of usernames with commas */ ';
-  put '    %else %let user=%unquote(%scan(%quote(&&&metavar),1,@)); ';
+  put '    %else %let user=%unquote(%scan(%quote(&_metaperson),1,@)); ';
   put '  %end; ';
   put '  %else %let user=&sysuserid; ';
   put ' ';
@@ -478,7 +515,7 @@ data _null_;
   put ' ';
   put '%mend mf_getuser; ';
   put '%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL ';
-  put '  ,showmeta=NO ';
+  put '  ,showmeta=N ';
   put '); ';
   put '%global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name ';
   put '  sasjs_tables SYS_JES_JOB_URI; ';
@@ -570,8 +607,7 @@ data _null_;
   put ' ';
   put '  /* setup temp ref */ ';
   put '  %if %upcase(&fref) ne _WEBOUT %then %do; ';
-  put '    filename &fref temp lrecl=999999 permission=''A::u::rwx,A::g::rw-,A::o::---'' ';
-  put '      mod; ';
+  put '    filename &fref temp lrecl=999999 permission=''A::u::rwx,A::g::rw-,A::o::---''; ';
   put '  %end; ';
   put ' ';
   put '  /* setup json */ ';
@@ -588,7 +624,6 @@ data _null_;
   put '%else %if &action=CLOSE %then %do; ';
   put '  %if %str(&_debug) ge 131 %then %do; ';
   put '    /* send back first 10 records of each work table for debugging */ ';
-  put '    options obs=10; ';
   put '    data;run;%let tempds=%scan(&syslast,2,.); ';
   put '    ods output Members=&tempds; ';
   put '    proc datasets library=WORK memtype=data; ';
@@ -611,7 +646,7 @@ data _null_;
   put '        put " ""&wt"" : {"; ';
   put '        put ''"nlobs":'' nlobs; ';
   put '        put '',"nvars":'' nvars; ';
-  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=YES) ';
+  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y,maxobs=10) ';
   put '      data _null_; file &fref mod;put "}"; ';
   put '    %end; ';
   put '    data _null_; file &fref mod;put "}";run; ';
@@ -628,14 +663,14 @@ data _null_;
   put '    put ",""_DEBUG"" : ""&_debug"" "; ';
   put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
   put '    put ",""SYSCC"" : ""&syscc"" "; ';
-  put '    syserrortext=quote(cats(symget(''SYSERRORTEXT''))); ';
+  put '    syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); ';
   put '    put '',"SYSERRORTEXT" : '' syserrortext; ';
   put '    put ",""SYSHOSTNAME"" : ""&syshostname"" "; ';
   put '    put ",""SYSSCPL"" : ""&sysscpl"" "; ';
   put '    put ",""SYSSITE"" : ""&syssite"" "; ';
   put '    sysvlong=quote(trim(symget(''sysvlong''))); ';
   put '    put '',"SYSVLONG" : '' sysvlong; ';
-  put '    syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); ';
+  put '    syswarningtext=cats(''"'',tranwrd(symget(''syswarningtext''),''"'',''\"''),''"''); ';
   put '    put '',"SYSWARNINGTEXT" : '' syswarningtext; ';
   put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
   put '    length memsize $32; ';

viya/mv_webout.sas

@@ -29,7 +29,7 @@
   @param [in] stream=(Y) Change to N if not streaming to _webout
   @param [in] missing= (NULL) Special numeric missing values can be sent as NULL
     (eg `null`) or as STRING values (eg `".a"` or `".b"`)
-  @param [in] showmeta= (NO) Set to YES to output metadata alongside each table,
+  @param [in] showmeta= (N) Set to Y to output metadata alongside each table,
     such as the column formats and types.  The metadata is contained inside an
     object with the same name as the table but prefixed with a dollar sign - ie,
     `,"$tablename":{"formats":{"col1":"$CHAR1"},"types":{"COL1":"C"}}`
@@ -43,7 +43,7 @@
 
 **/
 %macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL
-  ,showmeta=NO
+  ,showmeta=N
 );
 %global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name
   sasjs_tables SYS_JES_JOB_URI;
@@ -135,8 +135,7 @@
 
   /* setup temp ref */
   %if %upcase(&fref) ne _WEBOUT %then %do;
-    filename &fref temp lrecl=999999 permission='A::u::rwx,A::g::rw-,A::o::---'
-      mod;
+    filename &fref temp lrecl=999999 permission='A::u::rwx,A::g::rw-,A::o::---';
   %end;
 
   /* setup json */
@@ -153,7 +152,6 @@
 %else %if &action=CLOSE %then %do;
   %if %str(&_debug) ge 131 %then %do;
     /* send back first 10 records of each work table for debugging */
-    options obs=10;
     data;run;%let tempds=%scan(&syslast,2,.);
     ods output Members=&tempds;
     proc datasets library=WORK memtype=data;
@@ -176,7 +174,7 @@
         put " ""&wt"" : {";
         put '"nlobs":' nlobs;
         put ',"nvars":' nvars;
-      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=YES)
+      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y,maxobs=10)
       data _null_; file &fref mod;put "}";
     %end;
     data _null_; file &fref mod;put "}";run;
@@ -193,14 +191,14 @@
     put ",""_DEBUG"" : ""&_debug"" ";
     put ',"_PROGRAM" : ' _PROGRAM ;
     put ",""SYSCC"" : ""&syscc"" ";
-    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"');
     put ',"SYSERRORTEXT" : ' syserrortext;
     put ",""SYSHOSTNAME"" : ""&syshostname"" ";
     put ",""SYSSCPL"" : ""&sysscpl"" ";
     put ",""SYSSITE"" : ""&syssite"" ";
     sysvlong=quote(trim(symget('sysvlong')));
     put ',"SYSVLONG" : ' sysvlong;
-    syswarningtext=quote(cats(symget('SYSWARNINGTEXT')));
+    syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"');
     put ',"SYSWARNINGTEXT" : ' syswarningtext;
     put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
     length memsize $32;

xplatform/mx_getcode.sas

@@ -35,7 +35,7 @@
   %ms_getfile(&loc..sas, outref=&outref)
 %end;
 %else %if &platform=SAS9 or &platform=SASMETA %then %do;
-  %mm_getstpcode(tree=&loc,outloc=&outref)
+  %mm_getstpcode(tree=&loc,outref=&outref)
 %end;
 %else %if &platform=SASVIYA %then %do;
   /* extract name & path from &loc */