Merge pull request #215 from sasjs/serverconfig

Change test server & update mx_webout() macros
fix: mx_webout
2025-12-11 14:34:35 +00:00 · 2022-04-14 15:41:44 +03:00 · 2022-04-14 13:40:14 +01:00 · 2022-04-14 11:14:35 +00:00 · 2022-04-13 23:34:52 +03:00 · 2022-04-13 21:32:47 +01:00
15 changed files with 558 additions and 2194 deletions
--- a/all.sas
+++ b/all.sas
@@ -4308,6 +4308,7 @@ run;
  data &out_ds;
    set &out_ds;
    length infoname infoval $60 fref $8;
+    if _n_=1 then call missing(fref);
    rc=filename(fref,filepath);
    drop rc infoname fid i close fref;
    if file_or_folder='file' then do;
@@ -4544,6 +4545,7 @@ drop table &out_ds;

  @version 9.2
  @author Allan Bowe
+  @cond
 **/

 %macro mp_ds2cards(base_ds=, tgt_ds=
@@ -4715,7 +4717,8 @@ data _null_;
    put '  @file';
    put "  @brief Datalines for %upcase(%scan(&base_ds,2)) dataset";
    put "  @details Generated by %nrstr(%%)mp_ds2cards()";
-    put "  Available on github.com/sasjs/core";
+    put "    Source: https://github.com/sasjs/core";
+    put '  @cond ';
    put '**/';
    put "data &tgt_ds &indexes;";
    put "attrib ";
@@ -4760,6 +4763,7 @@ data _null_;
  if __lastobs then do;
    put ';;;;';
    put 'run;';
+    put '/** @endcond **/';
    stop;
  end;
 run;
@@ -4779,7 +4783,9 @@ quit;
 %put NOTE-;%put NOTE-;
 %put NOTE- %sysfunc(dequote(&cards_file.));
 %put NOTE-;%put NOTE-;
-%mend mp_ds2cards;/**
+%mend mp_ds2cards;
+/** @endcond **/
+/**
  @file
  @brief Export a dataset to a CSV file WITH leading blanks
  @details Export a dataset to a file or fileref, retaining leading blanks.
@@ -7361,7 +7367,8 @@ create table &outds (rename=(
 )/*/STORE SOURCE*/;


-%local engine schema ds1 ds2 ds3 dsn tabs1 tabs2 sum pk4sure pkdefault finalpks;
+%local engine schema ds1 ds2 ds3 dsn tabs1 tabs2 sum pk4sure pkdefault finalpks
+  pkfromindex;

 %let lib=%upcase(&lib);
 %let ds=%upcase(&ds);
@@ -7376,6 +7383,7 @@ create table &outds (rename=(
 %let sum=%mf_getuniquename(prefix=getpk_sum);
 %let pk4sure=%mf_getuniquename(prefix=getpk_pk4sure);
 %let pkdefault=%mf_getuniquename(prefix=getpk_pkdefault);
+%let pkfromindex=%mf_getuniquename(prefix=getpk_pkfromindex);
 %let finalpks=%mf_getuniquename(prefix=getpk_finalpks);

 %local dbg;
@@ -7486,9 +7494,23 @@ create table &ds1 as
      and a.constraint_name=b.constraint_name
    order by 1,2,3,4;

+  /* extract cols from the relevant unique INDEXES */
+  create table &pkfromindex as
+    select libname as libref
+      ,memname as table_name
+      ,indxname as constraint_name
+      ,indxpos as constraint_order
+      ,name
+    from dictionary.indexes
+    where nomiss='yes' and unique='yes' and upcase(libname)="&lib"
+  %if &ds ne 0 %then %do;
+      and upcase(memname)="&ds"
+  %end;
+    order by 1,2,3,4;
+
  /* create one table */
  data &finalpks;
-    set &pkdefault &pk4sure ;
+    set &pkdefault &pk4sure &pkfromindex;
    pk_ind=1;
    /* if there are multiple unique constraints, take the first */
    by libref table_name constraint_name;
@@ -7562,7 +7584,8 @@ create table &outds as
  iftrue=(&mdebug=0)
 )

-%mend mp_getpk;/**
+%mend mp_getpk;
+/**
  @file
  @brief Performs a text substitution on a file
  @details Makes use of the GSUB function in LUA to perform a text substitution
@@ -8421,13 +8444,13 @@ options
                    prxchange('s/'!!'0A'x!!'/\n/',-1,
                    prxchange('s/'!!'0D'x!!'/\r/',-1,
                    prxchange('s/'!!'09'x!!'/\t/',-1,
-                    prxchange('s/'!!'00'x!!'/\\u0000/',-1, /* NUL */
-                    prxchange('s/'!!'0E'x!!'/\\u000E/',-1, /* SS  */
-                    prxchange('s/'!!'0F'x!!'/\\u000F/',-1, /* SF  */
-                    prxchange('s/'!!'01'x!!'/\\u0001/',-1, /* SOH */
-                    prxchange('s/'!!'02'x!!'/\\u0002/',-1, /* STX */
-                    prxchange('s/'!!'02'x!!'/\\u0010/',-1, /* DLE */
-                    prxchange('s/'!!'11'x!!'/\\u0011/',-1, /* DC1 */
+                    prxchange('s/\x00/\\u0000/',-1, /* NUL */
+                    prxchange('s/\x0E/\\u000E/',-1, /* SS  */
+                    prxchange('s/\x0F/\\u000F/',-1, /* SF  */
+                    prxchange('s/\x01/\\u0001/',-1, /* SOH */
+                    prxchange('s/\x02/\\u0002/',-1, /* STX */
+                    prxchange('s/\x10/\\u0010/',-1, /* DLE */
+                    prxchange('s/\x11/\\u0011/',-1, /* DC1 */
                    prxchange('s/\\/\\\\/',-1,&&name&i)
        ))))))))))))!!'"';
      %end;
@@ -11586,12 +11609,20 @@ run;
  %end;
 %end;
 %else %if &contentype=HTML %then %do;
-  %if &platform=SASVIYA %then %do;
+  %if (&platform=SASMETA and &streamweb=1) %then %do;
+    data _null_;
+      rc=stpsrv_header('Content-type','text/html');
+      rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
+    run;
+  %end;
+  %else %if &platform=SASVIYA %then %do;
    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
-      contenttype="text/html";
+      contenttype="text/html"
+      contentdisp="attachment; filename=&outname";
  %end;
  %else %if &platform=SASJS %then %do;
    %mfs_httpheader(Content-type,text/html)
+    %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
  %end;
 %end;
 %else %if &contentype=TEXT %then %do;
@@ -14938,13 +14969,13 @@ data _null_;
  put '                    prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
  put '                    prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';
  put '                    prxchange(''s/''!!''09''x!!''/\t/'',-1, ';
-  put '                    prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ ';
-  put '                    prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS  */ ';
-  put '                    prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF  */ ';
-  put '                    prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ ';
-  put '                    prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ ';
-  put '                    prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ ';
-  put '                    prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ ';
+  put '                    prxchange(''s/\x00/\\u0000/'',-1, /* NUL */ ';
+  put '                    prxchange(''s/\x0E/\\u000E/'',-1, /* SS  */ ';
+  put '                    prxchange(''s/\x0F/\\u000F/'',-1, /* SF  */ ';
+  put '                    prxchange(''s/\x01/\\u0001/'',-1, /* SOH */ ';
+  put '                    prxchange(''s/\x02/\\u0002/'',-1, /* STX */ ';
+  put '                    prxchange(''s/\x10/\\u0010/'',-1, /* DLE */ ';
+  put '                    prxchange(''s/\x11/\\u0011/'',-1, /* DC1 */ ';
  put '                    prxchange(''s/\\/\\\\/'',-1,&&name&i) ';
  put '        ))))))))))))!!''"''; ';
  put '      %end; ';
@@ -15130,14 +15161,16 @@ data _null_;
  put '    put '',"_METAPERSON": '' _METAPERSON; ';
  put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
  put '    put ",""SYSCC"" : ""&syscc"" "; ';
-  put '    put ",""SYSERRORTEXT"" : ""&syserrortext"" "; ';
+  put '    syserrortext=quote(cats(symget(''SYSERRORTEXT''))); ';
+  put '    put '',"SYSERRORTEXT" : '' syserrortext; ';
  put '    put ",""SYSHOSTNAME"" : ""&syshostname"" "; ';
  put '    put ",""SYSJOBID"" : ""&sysjobid"" "; ';
  put '    put ",""SYSSCPL"" : ""&sysscpl"" "; ';
  put '    put ",""SYSSITE"" : ""&syssite"" "; ';
  put '    sysvlong=quote(trim(symget(''sysvlong''))); ';
  put '    put '',"SYSVLONG" : '' sysvlong; ';
-  put '    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; ';
+  put '    syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); ';
+  put '    put '',"SYSWARNINGTEXT" : '' syswarningtext; ';
  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
  put '    length memsize $32; ';
  put '    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; ';
@@ -18667,14 +18700,16 @@ run;
    put ',"_METAPERSON": ' _METAPERSON;
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
-    put ",""SYSERRORTEXT"" : ""&syserrortext"" ";
+    syserrortext=quote(cats(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;
-    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
+    syswarningtext=quote(cats(symget('SYSWARNINGTEXT')));
+    put ',"SYSWARNINGTEXT" : ' syswarningtext;
    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length memsize $32;
    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)";
@@ -19123,7 +19158,7 @@ run;
 %end;
 %mend ms_runstp;/**
  @file
-  @brief Send data to/from @sasjs/server
+  @brief Send data to/from sasjs/server
  @details This macro should be added to the start of each web service,
  **immediately** followed by a call to:

@@ -19270,7 +19305,8 @@ run;
    put ",""_DEBUG"" : ""&_debug"" ";
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
-    put ",""SYSERRORTEXT"" : ""&syserrortext"" ";
+    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    put ',"SYSERRORTEXT" : ' syserrortext;
    SYSHOSTINFOLONG=quote(trim(symget('SYSHOSTINFOLONG')));
    put ',"SYSHOSTINFOLONG" : ' SYSHOSTINFOLONG;
    put ",""SYSHOSTNAME"" : ""&syshostname"" ";
@@ -19285,7 +19321,8 @@ run;
    put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" ";
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
-    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
+    syswarningtext=quote(cats(symget('SYSWARNINGTEXT')));
+    put ',"SYSWARNINGTEXT" : ' syswarningtext;
    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length autoexec $512;
    autoexec=quote(urlencode(trim(getoption('autoexec'))));
@@ -20416,13 +20453,13 @@ data _null_;
  put '                    prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
  put '                    prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';
  put '                    prxchange(''s/''!!''09''x!!''/\t/'',-1, ';
-  put '                    prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ ';
-  put '                    prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS  */ ';
-  put '                    prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF  */ ';
-  put '                    prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ ';
-  put '                    prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ ';
-  put '                    prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ ';
-  put '                    prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ ';
+  put '                    prxchange(''s/\x00/\\u0000/'',-1, /* NUL */ ';
+  put '                    prxchange(''s/\x0E/\\u000E/'',-1, /* SS  */ ';
+  put '                    prxchange(''s/\x0F/\\u000F/'',-1, /* SF  */ ';
+  put '                    prxchange(''s/\x01/\\u0001/'',-1, /* SOH */ ';
+  put '                    prxchange(''s/\x02/\\u0002/'',-1, /* STX */ ';
+  put '                    prxchange(''s/\x10/\\u0010/'',-1, /* DLE */ ';
+  put '                    prxchange(''s/\x11/\\u0011/'',-1, /* DC1 */ ';
  put '                    prxchange(''s/\\/\\\\/'',-1,&&name&i) ';
  put '        ))))))))))))!!''"''; ';
  put '      %end; ';
@@ -20641,13 +20678,15 @@ data _null_;
  put '    put ",""_DEBUG"" : ""&_debug"" "; ';
  put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
  put '    put ",""SYSCC"" : ""&syscc"" "; ';
-  put '    put ",""SYSERRORTEXT"" : ""&syserrortext"" "; ';
+  put '    syserrortext=quote(cats(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 '    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; ';
+  put '    syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); ';
+  put '    put '',"SYSWARNINGTEXT" : '' syswarningtext; ';
  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
  put '    length memsize $32; ';
  put '    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; ';
@@ -24448,13 +24487,15 @@ filename &fref1 clear;
    put ",""_DEBUG"" : ""&_debug"" ";
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
-    put ",""SYSERRORTEXT"" : ""&syserrortext"" ";
+    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    put ',"SYSERRORTEXT" : ' syserrortext;
    put ",""SYSHOSTNAME"" : ""&syshostname"" ";
    put ",""SYSSCPL"" : ""&sysscpl"" ";
    put ",""SYSSITE"" : ""&syssite"" ";
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
-    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
+    syswarningtext=quote(cats(symget('SYSWARNINGTEXT')));
+    put ',"SYSWARNINGTEXT" : ' syswarningtext;
    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length memsize $32;
    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)";
--- a/base/mp_dirlist.sas
+++ b/base/mp_dirlist.sas
@@ -152,6 +152,7 @@ run;
  data &out_ds;
    set &out_ds;
    length infoname infoval $60 fref $8;
+    if _n_=1 then call missing(fref);
    rc=filename(fref,filepath);
    drop rc infoname fid i close fref;
    if file_or_folder='file' then do;
--- a/base/mp_ds2cards.sas
+++ b/base/mp_ds2cards.sas
@@ -48,6 +48,7 @@

  @version 9.2
  @author Allan Bowe
+  @cond
 **/

 %macro mp_ds2cards(base_ds=, tgt_ds=
@@ -219,7 +220,8 @@ data _null_;
    put '  @file';
    put "  @brief Datalines for %upcase(%scan(&base_ds,2)) dataset";
    put "  @details Generated by %nrstr(%%)mp_ds2cards()";
-    put "  Available on github.com/sasjs/core";
+    put "    Source: https://github.com/sasjs/core";
+    put '  @cond ';
    put '**/';
    put "data &tgt_ds &indexes;";
    put "attrib ";
@@ -264,6 +266,7 @@ data _null_;
  if __lastobs then do;
    put ';;;;';
    put 'run;';
+    put '/** @endcond **/';
    stop;
  end;
 run;
@@ -283,4 +286,5 @@ quit;
 %put NOTE-;%put NOTE-;
 %put NOTE- %sysfunc(dequote(&cards_file.));
 %put NOTE-;%put NOTE-;
-%mend mp_ds2cards;
+%mend mp_ds2cards;
+/** @endcond **/
--- a/base/mp_getpk.sas
+++ b/base/mp_getpk.sas
@@ -55,7 +55,8 @@
 )/*/STORE SOURCE*/;


-%local engine schema ds1 ds2 ds3 dsn tabs1 tabs2 sum pk4sure pkdefault finalpks;
+%local engine schema ds1 ds2 ds3 dsn tabs1 tabs2 sum pk4sure pkdefault finalpks
+  pkfromindex;

 %let lib=%upcase(&lib);
 %let ds=%upcase(&ds);
@@ -70,6 +71,7 @@
 %let sum=%mf_getuniquename(prefix=getpk_sum);
 %let pk4sure=%mf_getuniquename(prefix=getpk_pk4sure);
 %let pkdefault=%mf_getuniquename(prefix=getpk_pkdefault);
+%let pkfromindex=%mf_getuniquename(prefix=getpk_pkfromindex);
 %let finalpks=%mf_getuniquename(prefix=getpk_finalpks);

 %local dbg;
@@ -180,9 +182,23 @@ create table &ds1 as
      and a.constraint_name=b.constraint_name
    order by 1,2,3,4;

+  /* extract cols from the relevant unique INDEXES */
+  create table &pkfromindex as
+    select libname as libref
+      ,memname as table_name
+      ,indxname as constraint_name
+      ,indxpos as constraint_order
+      ,name
+    from dictionary.indexes
+    where nomiss='yes' and unique='yes' and upcase(libname)="&lib"
+  %if &ds ne 0 %then %do;
+      and upcase(memname)="&ds"
+  %end;
+    order by 1,2,3,4;
+
  /* create one table */
  data &finalpks;
-    set &pkdefault &pk4sure ;
+    set &pkdefault &pk4sure &pkfromindex;
    pk_ind=1;
    /* if there are multiple unique constraints, take the first */
    by libref table_name constraint_name;
@@ -256,4 +272,4 @@ create table &outds as
  iftrue=(&mdebug=0)
 )

-%mend mp_getpk;
+%mend mp_getpk;
--- a/base/mp_jsonout.sas
+++ b/base/mp_jsonout.sas
@@ -203,13 +203,13 @@
                    prxchange('s/'!!'0A'x!!'/\n/',-1,
                    prxchange('s/'!!'0D'x!!'/\r/',-1,
                    prxchange('s/'!!'09'x!!'/\t/',-1,
-                    prxchange('s/'!!'00'x!!'/\\u0000/',-1, /* NUL */
-                    prxchange('s/'!!'0E'x!!'/\\u000E/',-1, /* SS  */
-                    prxchange('s/'!!'0F'x!!'/\\u000F/',-1, /* SF  */
-                    prxchange('s/'!!'01'x!!'/\\u0001/',-1, /* SOH */
-                    prxchange('s/'!!'02'x!!'/\\u0002/',-1, /* STX */
-                    prxchange('s/'!!'02'x!!'/\\u0010/',-1, /* DLE */
-                    prxchange('s/'!!'11'x!!'/\\u0011/',-1, /* DC1 */
+                    prxchange('s/\x00/\\u0000/',-1, /* NUL */
+                    prxchange('s/\x0E/\\u000E/',-1, /* SS  */
+                    prxchange('s/\x0F/\\u000F/',-1, /* SF  */
+                    prxchange('s/\x01/\\u0001/',-1, /* SOH */
+                    prxchange('s/\x02/\\u0002/',-1, /* STX */
+                    prxchange('s/\x10/\\u0010/',-1, /* DLE */
+                    prxchange('s/\x11/\\u0011/',-1, /* DC1 */
                    prxchange('s/\\/\\\\/',-1,&&name&i)
        ))))))))))))!!'"';
      %end;
--- a/base/mp_streamfile.sas
+++ b/base/mp_streamfile.sas
@@ -105,12 +105,20 @@ run;
  %end;
 %end;
 %else %if &contentype=HTML %then %do;
-  %if &platform=SASVIYA %then %do;
+  %if (&platform=SASMETA and &streamweb=1) %then %do;
+    data _null_;
+      rc=stpsrv_header('Content-type','text/html');
+      rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
+    run;
+  %end;
+  %else %if &platform=SASVIYA %then %do;
    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
-      contenttype="text/html";
+      contenttype="text/html"
+      contentdisp="attachment; filename=&outname";
  %end;
  %else %if &platform=SASJS %then %do;
    %mfs_httpheader(Content-type,text/html)
+    %mfs_httpheader(Content-disposition,%str(attachment; filename=&outname))
  %end;
 %end;
 %else %if &contentype=TEXT %then %do;
--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -236,13 +236,13 @@ data _null_;
  put '                    prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
  put '                    prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';
  put '                    prxchange(''s/''!!''09''x!!''/\t/'',-1, ';
-  put '                    prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ ';
-  put '                    prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS  */ ';
-  put '                    prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF  */ ';
-  put '                    prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ ';
-  put '                    prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ ';
-  put '                    prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ ';
-  put '                    prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ ';
+  put '                    prxchange(''s/\x00/\\u0000/'',-1, /* NUL */ ';
+  put '                    prxchange(''s/\x0E/\\u000E/'',-1, /* SS  */ ';
+  put '                    prxchange(''s/\x0F/\\u000F/'',-1, /* SF  */ ';
+  put '                    prxchange(''s/\x01/\\u0001/'',-1, /* SOH */ ';
+  put '                    prxchange(''s/\x02/\\u0002/'',-1, /* STX */ ';
+  put '                    prxchange(''s/\x10/\\u0010/'',-1, /* DLE */ ';
+  put '                    prxchange(''s/\x11/\\u0011/'',-1, /* DC1 */ ';
  put '                    prxchange(''s/\\/\\\\/'',-1,&&name&i) ';
  put '        ))))))))))))!!''"''; ';
  put '      %end; ';
@@ -428,14 +428,16 @@ data _null_;
  put '    put '',"_METAPERSON": '' _METAPERSON; ';
  put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
  put '    put ",""SYSCC"" : ""&syscc"" "; ';
-  put '    put ",""SYSERRORTEXT"" : ""&syserrortext"" "; ';
+  put '    syserrortext=quote(cats(symget(''SYSERRORTEXT''))); ';
+  put '    put '',"SYSERRORTEXT" : '' syserrortext; ';
  put '    put ",""SYSHOSTNAME"" : ""&syshostname"" "; ';
  put '    put ",""SYSJOBID"" : ""&sysjobid"" "; ';
  put '    put ",""SYSSCPL"" : ""&sysscpl"" "; ';
  put '    put ",""SYSSITE"" : ""&syssite"" "; ';
  put '    sysvlong=quote(trim(symget(''sysvlong''))); ';
  put '    put '',"SYSVLONG" : '' sysvlong; ';
-  put '    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; ';
+  put '    syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); ';
+  put '    put '',"SYSWARNINGTEXT" : '' syswarningtext; ';
  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
  put '    length memsize $32; ';
  put '    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; ';
--- a/meta/mm_webout.sas
+++ b/meta/mm_webout.sas
@@ -157,14 +157,16 @@
    put ',"_METAPERSON": ' _METAPERSON;
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
-    put ",""SYSERRORTEXT"" : ""&syserrortext"" ";
+    syserrortext=quote(cats(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;
-    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
+    syswarningtext=quote(cats(symget('SYSWARNINGTEXT')));
+    put ',"SYSWARNINGTEXT" : ' syswarningtext;
    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length memsize $32;
    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)";
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -26,14 +26,16 @@
  "homepage": "https://core.sasjs.io",
  "main": "index.js",
  "scripts": {
-    "build": "sasjs cbd -t viya",
+    "build": "sasjs cbd -t server",
    "docs": "sasjs doc -t docsonly && ./sasjs/utils/build.sh",
-    "test": "sasjs test -t viya",
+    "test": "sasjs test -t server",
    "lint": "sasjs lint",
    "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
  },
  "devDependencies": {
-    "@sasjs/cli": "3.6.0",
-    "@sasjs/core": "4.4.7"
+    "@sasjs/cli": "3.13.0"
+  },
+  "dependencies": {
+    "@sasjs/core": "^4.18.13"
  }
 }
--- a/sasjs/sasjsconfig.json
+++ b/sasjs/sasjsconfig.json
@@ -25,16 +25,16 @@
      "mcTestAppLoc": "/Public/temp/macrocore"
    }
  },
-  "defaultTarget": "viya",
+  "defaultTarget": "server",
  "targets": [
    {
      "name": "viya",
-      "serverUrl": "https://sas.analytium.co.uk",
+      "serverUrl": "",
      "serverType": "SASVIYA",
      "httpsAgentOptions": {
        "allowInsecureRequests": false
      },
-      "appLoc": "/Public/temp/macrocore",
+      "appLoc": "/Public/app/macrocore",
      "macroFolders": [
        "viya",
        "tests/viyaonly"
@@ -65,7 +65,7 @@
    },
    {
      "name": "server",
-      "serverUrl": "",
+      "serverUrl": "https://sas.analytium.co.uk:5000",
      "serverType": "SASJS",
      "httpsAgentOptions": {
        "allowInsecureRequests": false
--- a/server/ms_webout.sas
+++ b/server/ms_webout.sas
@@ -1,6 +1,6 @@
 /**
  @file
-  @brief Send data to/from @sasjs/server
+  @brief Send data to/from sasjs/server
  @details This macro should be added to the start of each web service,
  **immediately** followed by a call to:

@@ -147,7 +147,8 @@
    put ",""_DEBUG"" : ""&_debug"" ";
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
-    put ",""SYSERRORTEXT"" : ""&syserrortext"" ";
+    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    put ',"SYSERRORTEXT" : ' syserrortext;
    SYSHOSTINFOLONG=quote(trim(symget('SYSHOSTINFOLONG')));
    put ',"SYSHOSTINFOLONG" : ' SYSHOSTINFOLONG;
    put ",""SYSHOSTNAME"" : ""&syshostname"" ";
@@ -162,7 +163,8 @@
    put ",""SYSTCPIPHOSTNAME"" : ""&SYSTCPIPHOSTNAME"" ";
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
-    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
+    syswarningtext=quote(cats(symget('SYSWARNINGTEXT')));
+    put ',"SYSWARNINGTEXT" : ' syswarningtext;
    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length autoexec $512;
    autoexec=quote(urlencode(trim(getoption('autoexec'))));
--- a/tests/crossplatform/mp_getpk.test.sas
+++ b/tests/crossplatform/mp_getpk.test.sas
@@ -88,4 +88,50 @@ run;
 /* constraint capture at library level is functional - uses first 2 tests */
 %mp_getpk(work,outds=test4)

-%mp_assertdsobs(work.test4,test=ATLEAST 2)
+%mp_assertdsobs(work.test4,test=ATLEAST 2)
+
+/* unique & not null INDEX captured */
+proc sql;
+create table work.example5(
+  TX_FROM float format=datetime19.,
+  DD_TYPE char(16),
+  DD_SOURCE char(2048),
+  DD_SHORTDESC char(256)
+);
+proc datasets lib=work noprint;
+  modify example5;
+  index create tx_from /nomiss unique;
+quit;
+%mp_getpk(work,ds=example5,outds=test5)
+data _null_;
+  set work.test5;
+  call symputx('test5',pk_fields);
+run;
+%mp_assert(
+  iftrue=("&test5"="TX_FROM"),
+  desc=mp_getpk captures single column not null unique index,
+  outds=work.test_results
+)
+
+/* unique & not null COMPOSITE INDEX captured */
+proc sql;
+create table work.example6(
+  TX_FROM float format=datetime19.,
+  DD_TYPE char(16),
+  DD_SOURCE char(2048),
+  DD_SHORTDESC char(256)
+);
+proc datasets lib=work noprint;
+  modify example6;
+  index create pk_6=(tx_from dd_type) /nomiss unique;
+quit;
+%mp_getpk(work,ds=example6,outds=test6)
+data _null_;
+  set work.test6;
+  call symputx('test6',pk_fields);
+run;
+%mp_assert(
+  iftrue=("&test6"="TX_FROM DD_TYPE"),
+  desc=mp_getpk captures multiple column not null unique index,
+  outds=work.test_results
+)
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -380,13 +380,13 @@ data _null_;
  put '                    prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
  put '                    prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';
  put '                    prxchange(''s/''!!''09''x!!''/\t/'',-1, ';
-  put '                    prxchange(''s/''!!''00''x!!''/\\u0000/'',-1, /* NUL */ ';
-  put '                    prxchange(''s/''!!''0E''x!!''/\\u000E/'',-1, /* SS  */ ';
-  put '                    prxchange(''s/''!!''0F''x!!''/\\u000F/'',-1, /* SF  */ ';
-  put '                    prxchange(''s/''!!''01''x!!''/\\u0001/'',-1, /* SOH */ ';
-  put '                    prxchange(''s/''!!''02''x!!''/\\u0002/'',-1, /* STX */ ';
-  put '                    prxchange(''s/''!!''02''x!!''/\\u0010/'',-1, /* DLE */ ';
-  put '                    prxchange(''s/''!!''11''x!!''/\\u0011/'',-1, /* DC1 */ ';
+  put '                    prxchange(''s/\x00/\\u0000/'',-1, /* NUL */ ';
+  put '                    prxchange(''s/\x0E/\\u000E/'',-1, /* SS  */ ';
+  put '                    prxchange(''s/\x0F/\\u000F/'',-1, /* SF  */ ';
+  put '                    prxchange(''s/\x01/\\u0001/'',-1, /* SOH */ ';
+  put '                    prxchange(''s/\x02/\\u0002/'',-1, /* STX */ ';
+  put '                    prxchange(''s/\x10/\\u0010/'',-1, /* DLE */ ';
+  put '                    prxchange(''s/\x11/\\u0011/'',-1, /* DC1 */ ';
  put '                    prxchange(''s/\\/\\\\/'',-1,&&name&i) ';
  put '        ))))))))))))!!''"''; ';
  put '      %end; ';
@@ -605,13 +605,15 @@ data _null_;
  put '    put ",""_DEBUG"" : ""&_debug"" "; ';
  put '    put '',"_PROGRAM" : '' _PROGRAM ; ';
  put '    put ",""SYSCC"" : ""&syscc"" "; ';
-  put '    put ",""SYSERRORTEXT"" : ""&syserrortext"" "; ';
+  put '    syserrortext=quote(cats(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 '    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; ';
+  put '    syswarningtext=quote(cats(symget(''SYSWARNINGTEXT''))); ';
+  put '    put '',"SYSWARNINGTEXT" : '' syswarningtext; ';
  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
  put '    length memsize $32; ';
  put '    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; ';
--- a/viya/mv_webout.sas
+++ b/viya/mv_webout.sas
@@ -193,13 +193,15 @@
    put ",""_DEBUG"" : ""&_debug"" ";
    put ',"_PROGRAM" : ' _PROGRAM ;
    put ",""SYSCC"" : ""&syscc"" ";
-    put ",""SYSERRORTEXT"" : ""&syserrortext"" ";
+    syserrortext=quote(cats(symget('SYSERRORTEXT')));
+    put ',"SYSERRORTEXT" : ' syserrortext;
    put ",""SYSHOSTNAME"" : ""&syshostname"" ";
    put ",""SYSSCPL"" : ""&sysscpl"" ";
    put ",""SYSSITE"" : ""&syssite"" ";
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
-    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
+    syswarningtext=quote(cats(symget('SYSWARNINGTEXT')));
+    put ',"SYSWARNINGTEXT" : ' syswarningtext;
    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length memsize $32;
    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)";
Author	SHA1	Message	Date
Allan Bowe	6938a42896	Merge pull request #215 from sasjs/serverconfig Change test server & update mx_webout() macros	2022-04-14 15:41:44 +03:00
munja	efff77c94e	fix: mx_webout	2022-04-14 13:40:14 +01:00
Allan Bowe	134b91f266	fix: avoiding running tests on viya	2022-04-14 11:14:35 +00:00
Allan Bowe	969f551e10	Merge pull request #214 from sasjs/cond fix: adding cond/endcond to mp_ds2cards	2022-04-13 23:34:52 +03:00
munja	26623ba085	fix: adding cond/endcond to mp_ds2cards	2022-04-13 21:32:47 +01:00
Allan Bowe	8eb495890d	Merge pull request #213 from sasjs/issue212 fix: ensuring indexes are picked up in mp_getpk(). Closes #212	2022-04-13 15:59:22 +03:00
munja	c1a30977f1	chore: removing serverurl	2022-04-13 13:58:55 +01:00
munja	9a6be61651	fix: ensuring indexes are picked up in mp_getpk(). Closes #212	2022-04-13 13:57:43 +01:00
Allan Bowe	388839039e	Merge pull request #211 from sasjs/streamhtmlasfile fix: send html as attachment rather than streamed content	2022-04-11 12:56:02 +03:00
Allan Bowe	e760a89a6a	fix: send html as attachment rather than streamed content when mp_streamfile is used on all platforms	2022-04-11 09:54:07 +00:00
Allan Bowe	d2e30267e8	Merge pull request #210 from sasjs/nulfixes fix: using regex special chars instead of hex constants in mp_jsonout	2022-04-07 11:53:37 +03:00
munja	190dbddfe3	fix: using regex special chars instead of hex constants in mp_jsonout	2022-04-07 09:52:56 +01:00
Allan Bowe	05e769794e	Merge pull request #209 from sasjs/missref fix: avoid: ERROR: Variable "fref" may not be initialized	2022-04-06 18:26:45 +03:00
munja	558ebaf6f2	fix: avoid: ERROR: Variable "fref" may not be initialized	2022-04-06 16:25:50 +01:00