Merge pull request #278 from sasjs/allanbowe/add-iftrue-parameter-277

fix: iftrue parameter for mp_binarycopy. Closes #277
2026-01-02 23:30:06 +00:00 · 2022-07-07 11:29:25 +01:00 · 2022-07-07 10:28:24 +00:00 · 2022-07-06 12:57:19 +01:00 · 2022-07-06 11:55:15 +00:00 · 2022-07-04 22:36:10 +01:00
13 changed files with 76 additions and 32 deletions
--- a/all.sas
+++ b/all.sas
@@ -198,6 +198,11 @@ options noquotelenmax;
    %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;
@@ -2408,7 +2413,7 @@ and %superq(SYSPROCESSNAME) ne %str(Compute Server)
    _PROGRAM=quote(trim(resolve(symget('_PROGRAM'))));
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
-    syserrortext=quote(trim(symget('syserrortext')));
+    syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"');
    put ",""SYSERRORTEXT"" : " syserrortext;
    put ",""SYSHOSTNAME"" : ""&syshostname"" ";
    put ",""SYSJOBID"" : ""&sysjobid"" ";
@@ -2416,7 +2421,7 @@ and %superq(SYSPROCESSNAME) ne %str(Compute Server)
    put ",""SYSSITE"" : ""&syssite"" ";
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
-    syswarningtext=quote(trim(symget('syswarningtext')));
+    syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"');
    put ",""SYSWARNINGTEXT"" : " syswarningtext;
    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    put "}" ;
@@ -3500,6 +3505,7 @@ run;
  @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

@@ -3513,8 +3519,12 @@ run;
    ,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;
+
+  %if not(%eval(%unquote(&iftrue))) %then %return;
+
  %if &mode=APPEND %then %let mod=mod;

  /* these IN and OUT filerefs can point to anything */
@@ -7676,6 +7686,7 @@ create table &outds (rename=(
  @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
@@ -7871,7 +7882,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
@@ -8873,6 +8889,7 @@ options
    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))));
@@ -15289,6 +15306,7 @@ data _null_;
  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)))); ';
@@ -15460,7 +15478,7 @@ data _null_;
  put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
  put '    put ",""SYSCC"" : ""&syscc"" "; ';
  put '    put ",""SYSENCODING"" : ""&sysencoding"" "; ';
-  put '    syserrortext=quote(cats(symget(''SYSERRORTEXT''))); ';
+  put '    syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); ';
  put '    put '',"SYSERRORTEXT" : '' syserrortext; ';
  put '    put ",""SYSHOSTNAME"" : ""&syshostname"" "; ';
  put '    put ",""SYSJOBID"" : ""&sysjobid"" "; ';
@@ -15468,7 +15486,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; ';
@@ -19022,7 +19040,7 @@ run;
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
    put ",""SYSENCODING"" : ""&sysencoding"" ";
-    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"');
    put ',"SYSERRORTEXT" : ' syserrortext;
    put ",""SYSHOSTNAME"" : ""&syshostname"" ";
    put ",""SYSJOBID"" : ""&sysjobid"" ";
@@ -19030,7 +19048,7 @@ run;
    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;
@@ -20090,6 +20108,7 @@ data _null_;
  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)))); ';
@@ -20249,7 +20268,7 @@ data _null_;
  put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
  put '    put ",""SYSCC"" : ""&syscc"" "; ';
  put '    put ",""SYSENCODING"" : ""&sysencoding"" "; ';
-  put '    syserrortext=quote(cats(symget(''SYSERRORTEXT''))); ';
+  put '    syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); ';
  put '    put '',"SYSERRORTEXT" : '' syserrortext; ';
  put '    SYSHOSTINFOLONG=quote(trim(symget(''SYSHOSTINFOLONG''))); ';
  put '    put '',"SYSHOSTINFOLONG" : '' SYSHOSTINFOLONG; ';
@@ -20265,7 +20284,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; ';
@@ -20703,14 +20722,16 @@ libname &libref JSON fileref=&fref1;
 %if "&group"="0" and "&gid"="0" %then %do;
  data &outds;
    length DISPLAYNAME $60 USERNAME:$30 ID 8;
-    set &libref..root;
+    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;
-    set &libref..users;
+    if nobs=0 then call missing(of _all_);
+    set &libref..users nobs=nobs;
    drop ordinal_root ordinal_users;
  run;
 %end;
@@ -21238,7 +21259,7 @@ run;
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
    put ",""SYSENCODING"" : ""&sysencoding"" ";
-    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"');
    put ',"SYSERRORTEXT" : ' syserrortext;
    SYSHOSTINFOLONG=quote(trim(symget('SYSHOSTINFOLONG')));
    put ',"SYSHOSTINFOLONG" : ' SYSHOSTINFOLONG;
@@ -21254,7 +21275,7 @@ run;
    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;
@@ -22468,6 +22489,7 @@ data _null_;
  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)))); ';
@@ -22668,14 +22690,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; ';
@@ -26456,14 +26478,14 @@ filename &fref1 clear;
    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;
--- a/base/mf_existfeature.sas
+++ b/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;
--- a/base/mp_abort.sas
+++ b/base/mp_abort.sas
@@ -225,7 +225,7 @@ and %superq(SYSPROCESSNAME) ne %str(Compute Server)
    _PROGRAM=quote(trim(resolve(symget('_PROGRAM'))));
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
-    syserrortext=quote(trim(symget('syserrortext')));
+    syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"');
    put ",""SYSERRORTEXT"" : " syserrortext;
    put ",""SYSHOSTNAME"" : ""&syshostname"" ";
    put ",""SYSJOBID"" : ""&sysjobid"" ";
@@ -233,7 +233,7 @@ and %superq(SYSPROCESSNAME) ne %str(Compute Server)
    put ",""SYSSITE"" : ""&syssite"" ";
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
-    syswarningtext=quote(trim(symget('syswarningtext')));
+    syswarningtext=cats('"',tranwrd(symget('syswarningtext'),'"','\"'),'"');
    put ",""SYSWARNINGTEXT"" : " syswarningtext;
    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    put "}" ;
--- a/base/mp_binarycopy.sas
+++ b/base/mp_binarycopy.sas
@@ -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,8 +45,12 @@
    ,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;
+
+  %if not(%eval(%unquote(&iftrue))) %then %return;
+
  %if &mode=APPEND %then %let mod=mod;

  /* these IN and OUT filerefs can point to anything */
--- a/base/mp_getpk.sas
+++ b/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
--- a/base/mp_jsonout.sas
+++ b/base/mp_jsonout.sas
@@ -296,6 +296,7 @@
    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))));
--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -319,6 +319,7 @@ data _null_;
  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)))); ';
@@ -490,7 +491,7 @@ data _null_;
  put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
  put '    put ",""SYSCC"" : ""&syscc"" "; ';
  put '    put ",""SYSENCODING"" : ""&sysencoding"" "; ';
-  put '    syserrortext=quote(cats(symget(''SYSERRORTEXT''))); ';
+  put '    syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); ';
  put '    put '',"SYSERRORTEXT" : '' syserrortext; ';
  put '    put ",""SYSHOSTNAME"" : ""&syshostname"" "; ';
  put '    put ",""SYSJOBID"" : ""&sysjobid"" "; ';
@@ -498,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; ';
--- a/meta/mm_webout.sas
+++ b/meta/mm_webout.sas
@@ -163,7 +163,7 @@
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
    put ",""SYSENCODING"" : ""&sysencoding"" ";
-    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    syserrortext=cats('"',tranwrd(symget('syserrortext'),'"','\"'),'"');
    put ',"SYSERRORTEXT" : ' syserrortext;
    put ",""SYSHOSTNAME"" : ""&syshostname"" ";
    put ",""SYSJOBID"" : ""&sysjobid"" ";
@@ -171,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;
--- a/server/ms_createwebservice.sas
+++ b/server/ms_createwebservice.sas
@@ -320,6 +320,7 @@ data _null_;
  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)))); ';
@@ -479,7 +480,7 @@ data _null_;
  put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
  put '    put ",""SYSCC"" : ""&syscc"" "; ';
  put '    put ",""SYSENCODING"" : ""&sysencoding"" "; ';
-  put '    syserrortext=quote(cats(symget(''SYSERRORTEXT''))); ';
+  put '    syserrortext=cats(''"'',tranwrd(symget(''syserrortext''),''"'',''\"''),''"''); ';
  put '    put '',"SYSERRORTEXT" : '' syserrortext; ';
  put '    SYSHOSTINFOLONG=quote(trim(symget(''SYSHOSTINFOLONG''))); ';
  put '    put '',"SYSHOSTINFOLONG" : '' SYSHOSTINFOLONG; ';
@@ -495,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; ';
--- a/server/ms_getusers.sas
+++ b/server/ms_getusers.sas
@@ -116,14 +116,16 @@ libname &libref JSON fileref=&fref1;
 %if "&group"="0" and "&gid"="0" %then %do;
  data &outds;
    length DISPLAYNAME $60 USERNAME:$30 ID 8;
-    set &libref..root;
+    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;
-    set &libref..users;
+    if nobs=0 then call missing(of _all_);
+    set &libref..users nobs=nobs;
    drop ordinal_root ordinal_users;
  run;
 %end;
--- a/server/ms_webout.sas
+++ b/server/ms_webout.sas
@@ -153,7 +153,7 @@
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
    put ",""SYSENCODING"" : ""&sysencoding"" ";
-    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    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;
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -462,6 +462,7 @@ data _null_;
  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)))); ';
@@ -662,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; ';
--- a/viya/mv_webout.sas
+++ b/viya/mv_webout.sas
@@ -191,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;
Author	SHA1	Message	Date
Allan Bowe	b377b83442	Merge pull request #278 from sasjs/allanbowe/add-iftrue-parameter-277 fix: iftrue parameter for mp_binarycopy. Closes #277	2022-07-07 11:29:25 +01:00
Allan Bowe	899b94bb6e	fix: iftrue parameter for mp_binarycopy. Closes #277	2022-07-07 10:28:24 +00:00
Allan Bowe	d97efdff61	Merge pull request #276 from sasjs/allanbowe/syswarningtext-with-embedded-275 fix: escaping SYSWARNINGTEXT and SYSERRORTEXT for JSON response	2022-07-06 12:57:19 +01:00
Allan Bowe	1097afbcb8	fix: escaping SYSWARNINGTEXT and SYSERRORTEXT for JSON response Closes #275	2022-07-06 11:55:15 +00:00
Allan Bowe	165b2d3568	Merge pull request #274 from sasjs/getpk fix: enabling cross-compatibility of mp_getpk macro	2022-07-04 22:36:10 +01:00
Allan Bowe	44a80c8985	fix: enabling cross-compatibility of mp_getpk macro	2022-07-04 21:32:41 +00:00
Allan Bowe	6e32d9b743	Merge pull request #273 from sasjs/allanbowe/mp-jsonout-fails-in-meta-272 fix: setting length of label property in mp_jsonout	2022-07-04 13:27:02 +01:00
Allan Bowe	6b167e7a4c	fix: longer label to allow for escapes	2022-07-04 12:26:19 +00:00
Allan Bowe	011672b1ed	fix: setting length of label property in mp_jsonout	2022-07-04 12:24:53 +00:00
Allan Bowe	a7eb926810	Merge pull request #271 from sasjs/ms_getusers fix: ensuring results when strict mode enabled in ms_getusers	2022-07-02 21:14:06 +01:00
Allan Bowe	cad7f13a0e	fix: ensuring results when strict mode enabled in ms_getusers	2022-07-02 20:13:02 +00:00