Merge pull request #262 from sasjs/allanbowe/mp-ds-cards-does-not-261

fix: special missing support in mp_ds2cards()
2026-01-17 13:30:05 +00:00 · 2022-06-21 19:37:51 +02:00 · 2022-06-21 17:34:44 +00:00 · 2022-06-21 19:57:11 +03:00 · 2022-06-21 19:51:23 +03:00 · 2022-06-21 16:16:07 +02:00
9 changed files with 535 additions and 462 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.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`).
--- a/all.sas
+++ b/all.sas
@@ -2246,19 +2246,19 @@ Usage:
  , mode=REGULAR
 )/*/STORE SOURCE*/;

-  %global sysprocessmode sysprocessname sasjs_stpsrv_header_loc;
-  %local fref fid i;
+%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 %superq(SYSPROCESSNAME) ne %str(Compute Server)
-  %then %do;
+%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';
@@ -2271,13 +2271,13 @@ Usage:
    run;
    %return;
  %end;
-  %end;
+%end;

-  /* Web App Context */
-  %if %symexist(_PROGRAM)
+/* Web App Context */
+%if %symexist(_PROGRAM)
  or %superq(SYSPROCESSNAME) = %str(Compute Server)
  or &mode=INCLUDE
-  %then %do;
+%then %do;
  options obs=max replace mprint;
  %if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5"
  %then %do;
@@ -2471,11 +2471,11 @@ Usage:
  %else %do;
    %abort cancel;
  %end;
-  %end;
-  %else %do;
+%end;
+%else %do;
  %put _all_;
  %abort cancel;
-  %end;
+%end;
 %mend mp_abort;

 /** @endcond */
@@ -4803,7 +4803,7 @@ drop table &out_ds;
  @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
@@ -5006,6 +5006,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;
@@ -8845,7 +8846,7 @@ options
      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 "," @@;
@@ -15225,7 +15226,7 @@ data _null_;
  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 "," @@; ';
@@ -17783,17 +17784,18 @@ libname _XML_ clear;

      %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
@@ -17801,11 +17803,13 @@ libname _XML_ clear;
 **/

 %macro mm_getusers(
-    outds=work.mm_getusers
+    outds=work.mm_getusers,
+    user=0
 )/*/STORE SOURCE*/;

 filename response temp;
-proc metadata in= '<GetMetadataObjects>
+%if %superq(user)=0 %then %do;
+  proc metadata in= '<GetMetadataObjects>
    <Reposid>$METAREPOSITORY</Reposid>
    <Type>Person</Type>
    <NS>SAS</NS>
@@ -17817,7 +17821,31 @@ proc metadata in= '<GetMetadataObjects>
    </Options>
    </GetMetadataObjects>'
    out=response;
-run;
+  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_;
@@ -19935,7 +19963,7 @@ data _null_;
  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 "," @@; ';
@@ -22278,7 +22306,7 @@ data _null_;
  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 "," @@; ';
--- a/base/mp_abort.sas
+++ b/base/mp_abort.sas
@@ -63,19 +63,19 @@
  , mode=REGULAR
 )/*/STORE SOURCE*/;

-  %global sysprocessmode sysprocessname sasjs_stpsrv_header_loc;
-  %local fref fid i;
+%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 %superq(SYSPROCESSNAME) ne %str(Compute Server)
-  %then %do;
+%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';
@@ -88,13 +88,13 @@
    run;
    %return;
  %end;
-  %end;
+%end;

-  /* Web App Context */
-  %if %symexist(_PROGRAM)
+/* Web App Context */
+%if %symexist(_PROGRAM)
  or %superq(SYSPROCESSNAME) = %str(Compute Server)
  or &mode=INCLUDE
-  %then %do;
+%then %do;
  options obs=max replace mprint;
  %if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5"
  %then %do;
@@ -288,11 +288,11 @@
  %else %do;
    %abort cancel;
  %end;
-  %end;
-  %else %do;
+%end;
+%else %do;
  %put _all_;
  %abort cancel;
-  %end;
+%end;
 %mend mp_abort;

 /** @endcond */
--- a/base/mp_ds2cards.sas
+++ b/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;
--- a/base/mp_jsonout.sas
+++ b/base/mp_jsonout.sas
@@ -263,7 +263,7 @@
      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 "," @@;
--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -296,7 +296,7 @@ data _null_;
  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 "," @@; ';
--- a/meta/mm_getusers.sas
+++ b/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,11 +27,13 @@
 **/

 %macro mm_getusers(
-    outds=work.mm_getusers
+    outds=work.mm_getusers,
+    user=0
 )/*/STORE SOURCE*/;

 filename response temp;
-proc metadata in= '<GetMetadataObjects>
+%if %superq(user)=0 %then %do;
+  proc metadata in= '<GetMetadataObjects>
    <Reposid>$METAREPOSITORY</Reposid>
    <Type>Person</Type>
    <NS>SAS</NS>
@@ -42,7 +45,31 @@ proc metadata in= '<GetMetadataObjects>
    </Options>
    </GetMetadataObjects>'
    out=response;
-run;
+  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_;
--- a/server/ms_createwebservice.sas
+++ b/server/ms_createwebservice.sas
@@ -298,7 +298,7 @@ data _null_;
  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 "," @@; ';
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -440,7 +440,7 @@ data _null_;
  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 "," @@; ';
Author	SHA1	Message	Date
Allan Bowe	f285505b79	Merge pull request #262 from sasjs/allanbowe/mp-ds-cards-does-not-261 fix: special missing support in mp_ds2cards()	2022-06-21 19:37:51 +02:00
Allan Bowe	67f5c50300	fix: special missing support in mp_ds2cards()	2022-06-21 17:34:44 +00:00
Yury Shkoda	ce39e4f779	Merge pull request #260 from sasjs/pr-template chore(template): added pull request template	2022-06-21 19:57:11 +03:00
Yury Shkoda	9c80f5664c	chore(template): added pull request template	2022-06-21 19:51:23 +03:00
Allan Bowe	83466c001b	Merge pull request #259 from sasjs/allanbowe/mp-jsonout-not-escaping-258 fix: escaping labels in mp_jsonout when showmeta=YES. Closes #258	2022-06-21 16:16:07 +02:00
Allan Bowe	ad315be503	fix: escaping labels in mp_jsonout when showmeta=YES. Closes #258	2022-06-21 14:14:35 +00:00
Allan Bowe	c41ae2dcc8	fix: enabling sasjsprocessmode as global var in mp_abort Also, reduced indentation	2022-06-18 13:11:35 +00:00
Mihajlo Medjedovic	d9f8e92fac	Merge pull request #257 from sasjs/userfeat feat: filter mm_getusers on a particular user	2022-06-17 19:59:38 +02:00
Allan Bowe	d42ede15db	fix: superq	2022-06-17 17:58:39 +00:00
Allan Bowe	08ea9f7c00	chore: all.sas	2022-06-17 17:55:28 +00:00
Allan Bowe	c327e1fc0d	fix: apostrophes	2022-06-17 17:55:01 +00:00
Allan Bowe	02fddcf9a1	fix: removing pipes	2022-06-17 17:51:36 +00:00
Allan Bowe	4752bfbb05	fix: refactor xml	2022-06-17 17:47:34 +00:00
Allan Bowe	767ddd7add	feat: filter mm_getusers on a particular user This can be useful for extracting the uri of a metadata user	2022-06-17 17:03:25 +00:00