diff --git a/all.sas b/all.sas
index f6ca7a2..0600468 100644
--- a/all.sas
+++ b/all.sas
@@ -312,13 +312,25 @@ https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/baseplus.md#functionex
%macro mf_getapploc(pgm);
%if "&pgm"="" %then %do;
- %put &sysmacroname: No value provided;
- %return;
+ %if %symexist(_program) %then %let pgm=&_program;
+ %else %do;
+ %put &sysmacroname: No value provided and no _program variable available;
+ %return;
+ %end;
%end;
%local root;
/**
- * move up two levels to avoid matches on subfolder or service name
+ * First check we are not in the tests/macros folder (which has no subfolders)
+ */
+%if %index(&pgm,/tests/macros/) %then %do;
+ %let root=%substr(&pgm,1,%index(&pgm,/tests/macros)-1);
+ &root
+ %return;
+%end;
+
+/**
+ * Next, move up two levels to avoid matches on subfolder or service name
*/
%let root=%substr(&pgm,1,%length(&pgm)-%length(%scan(&pgm,-1,/))-1);
%let root=%substr(&root,1,%length(&root)-%length(%scan(&root,-1,/))-1);
@@ -15382,24 +15394,27 @@ filename &fname1 clear;
libname &libref1 clear;
*/
%mend mv_getclients;/**
- @file mv_getfoldermembers.sas
- @brief Gets a list of folders (and ids) for a given root
- @details Works for both root level and below, oauth or password. Default is
- oauth, and the token is expected in a global ACCESS_TOKEN variable.
+ @file
+ @brief Gets a list of folder members (and ids) for a given root
+ @details Returns all members for a particular Viya folder. Works at both root
+ level and below, and results are created in an output dataset.
- %mv_getfoldermembers(root=/Public)
+ %mv_getfoldermembers(root=/Public, outds=work.mymembers)
- @param root= The path for which to return the list of folders
- @param outds= The output dataset to create (default is work.mv_getfolders). Format:
+ @param [in] root= (/) The path for which to return the list of folders
+ @param [out] outds= (work.mv_getfolders) The output dataset to create. Format:
|ordinal_root|ordinal_items|creationTimeStamp| modifiedTimeStamp|createdBy|modifiedBy|id| uri|added| type|name|description|
|---|---|---|---|---|---|---|---|---|---|---|---|
|1|1|2021-05-25T11:15:04.204Z|2021-05-25T11:15:04.204Z|allbow|allbow|4f1e3945-9655-462b-90f2-c31534b3ca47|/folders/folders/ed701ff3-77e8-468d-a4f5-8c43dec0fd9e|2021-05-25T11:15:04.212Z|child|my_folder_name|My folder Description|
- @param access_token_var= The global macro variable to contain the access token
- @param grant_type= valid values are "password" or "authorization_code" (unquoted).
- The default is authorization_code.
-
+ @param [in] access_token_var= (ACCESS_TOKEN) The global macro variable to
+ contain the access token
+ @param [in] grant_type= (sas_services) Valid values are:
+ @li password
+ @li authorization_code
+ @li detect
+ @li sas_services
@version VIYA V.03.04
@author Allan Bowe, source: https://github.com/sasjs/core
@@ -15411,6 +15426,12 @@ libname &libref1 clear;
@li mf_getuniquelibref.sas
@li mf_isblank.sas
+ Related Macros
+ @li mv_createfolder.sas
+ @li mv_deletefoldermember.sas
+ @li mv_deleteviyafolder.sas
+ @li mv_getfoldermembers.test.sas
+
**/
%macro mv_getfoldermembers(root=/
@@ -15450,7 +15471,7 @@ options noquotelenmax;
%if "&root"="/" %then %do;
/* if root just list root folders */
proc http method='GET' out=&fname1 &oauth_bearer
- url="&base_uri/folders/rootFolders";
+ url="&base_uri/folders/rootFolders?limit=1000";
%if &grant_type=authorization_code %then %do;
headers "Authorization"="Bearer &&&access_token_var";
%end;
@@ -15471,13 +15492,17 @@ options noquotelenmax;
/*data _null_;infile &fname1;input;putlog _infile_;run;*/
libname &libref1 JSON fileref=&fname1;
/* now get the followon link to list members */
- %local href;
- %let href=0;
+ %local href cnt;
+ %let cnt=0;
data _null_;
set &libref1..links;
- if rel='members' then call symputx('href',quote("&base_uri"!!trim(href)),'l');
+ if rel='members' then do;
+ url=cats("'","&base_uri",href,"?limit=10000'");
+ call symputx('href',url,'l');
+ call symputx('cnt',1,'l');
+ end;
run;
- %if &href=0 %then %do;
+ %if &cnt=0 %then %do;
%put NOTE:;%put NOTE- No members found in &root!!;%put NOTE-;
%return;
%end;
diff --git a/base/mf_getapploc.sas b/base/mf_getapploc.sas
index 4ff64f7..1f3cbcf 100644
--- a/base/mf_getapploc.sas
+++ b/base/mf_getapploc.sas
@@ -36,13 +36,25 @@
%macro mf_getapploc(pgm);
%if "&pgm"="" %then %do;
- %put &sysmacroname: No value provided;
- %return;
+ %if %symexist(_program) %then %let pgm=&_program;
+ %else %do;
+ %put &sysmacroname: No value provided and no _program variable available;
+ %return;
+ %end;
%end;
%local root;
/**
- * move up two levels to avoid matches on subfolder or service name
+ * First check we are not in the tests/macros folder (which has no subfolders)
+ */
+%if %index(&pgm,/tests/macros/) %then %do;
+ %let root=%substr(&pgm,1,%index(&pgm,/tests/macros)-1);
+ &root
+ %return;
+%end;
+
+/**
+ * Next, move up two levels to avoid matches on subfolder or service name
*/
%let root=%substr(&pgm,1,%length(&pgm)-%length(%scan(&pgm,-1,/))-1);
%let root=%substr(&root,1,%length(&root)-%length(%scan(&root,-1,/))-1);
diff --git a/tests/crossplatform/mf_getapploc.test.sas b/tests/crossplatform/mf_getapploc.test.sas
index 0c5871a..4dbd598 100644
--- a/tests/crossplatform/mf_getapploc.test.sas
+++ b/tests/crossplatform/mf_getapploc.test.sas
@@ -38,4 +38,12 @@
),
desc=Checking jobs appLoc matches,
outds=work.test_results
+)
+
+%mp_assert(
+ iftrue=(
+ "%mf_getapploc(/some/area/tests/macros/somemacro.sas)"="/some/area"
+ ),
+ desc=Checking tests/macros appLoc matches (which has no subfolder),
+ outds=work.test_results
)
\ No newline at end of file
diff --git a/tests/viyaonly/mv_getfoldermembers.test.sas b/tests/viyaonly/mv_getfoldermembers.test.sas
new file mode 100644
index 0000000..66e1e9f
--- /dev/null
+++ b/tests/viyaonly/mv_getfoldermembers.test.sas
@@ -0,0 +1,24 @@
+/**
+ @file
+ @brief Testing mv_getfoldermembers macro
+ @details Testing is performed by ensuring that the tests/macros folder
+ contains more than 20 results (which also means the default was increased)
+
+ SAS Macros
+ @li mf_getapploc.sas
+ @li mp_assertdsobs.sas
+ @li mv_getfoldermembers.sas
+
+**/
+options mprint;
+
+%mv_getfoldermembers(
+ root=%mf_getapploc()/tests/macros,
+ outds=work.results
+)
+
+%mp_assertdsobs(work.results,
+ desc=%str(Ensuring over 20 results found in %mf_getapploc()/tests/macros),
+ test=ATLEAST 21,
+ outds=work.test_results
+)
\ No newline at end of file
diff --git a/viya/mv_getfoldermembers.sas b/viya/mv_getfoldermembers.sas
index f0452a2..99b0663 100644
--- a/viya/mv_getfoldermembers.sas
+++ b/viya/mv_getfoldermembers.sas
@@ -1,22 +1,25 @@
/**
- @file mv_getfoldermembers.sas
- @brief Gets a list of folders (and ids) for a given root
- @details Works for both root level and below, oauth or password. Default is
- oauth, and the token is expected in a global ACCESS_TOKEN variable.
+ @file
+ @brief Gets a list of folder members (and ids) for a given root
+ @details Returns all members for a particular Viya folder. Works at both root
+ level and below, and results are created in an output dataset.
- %mv_getfoldermembers(root=/Public)
+ %mv_getfoldermembers(root=/Public, outds=work.mymembers)
- @param root= The path for which to return the list of folders
- @param outds= The output dataset to create (default is work.mv_getfolders). Format:
+ @param [in] root= (/) The path for which to return the list of folders
+ @param [out] outds= (work.mv_getfolders) The output dataset to create. Format:
|ordinal_root|ordinal_items|creationTimeStamp| modifiedTimeStamp|createdBy|modifiedBy|id| uri|added| type|name|description|
|---|---|---|---|---|---|---|---|---|---|---|---|
|1|1|2021-05-25T11:15:04.204Z|2021-05-25T11:15:04.204Z|allbow|allbow|4f1e3945-9655-462b-90f2-c31534b3ca47|/folders/folders/ed701ff3-77e8-468d-a4f5-8c43dec0fd9e|2021-05-25T11:15:04.212Z|child|my_folder_name|My folder Description|
- @param access_token_var= The global macro variable to contain the access token
- @param grant_type= valid values are "password" or "authorization_code" (unquoted).
- The default is authorization_code.
-
+ @param [in] access_token_var= (ACCESS_TOKEN) The global macro variable to
+ contain the access token
+ @param [in] grant_type= (sas_services) Valid values are:
+ @li password
+ @li authorization_code
+ @li detect
+ @li sas_services
@version VIYA V.03.04
@author Allan Bowe, source: https://github.com/sasjs/core
@@ -28,6 +31,12 @@
@li mf_getuniquelibref.sas
@li mf_isblank.sas
+ Related Macros
+ @li mv_createfolder.sas
+ @li mv_deletefoldermember.sas
+ @li mv_deleteviyafolder.sas
+ @li mv_getfoldermembers.test.sas
+
**/
%macro mv_getfoldermembers(root=/
@@ -67,7 +76,7 @@ options noquotelenmax;
%if "&root"="/" %then %do;
/* if root just list root folders */
proc http method='GET' out=&fname1 &oauth_bearer
- url="&base_uri/folders/rootFolders";
+ url="&base_uri/folders/rootFolders?limit=1000";
%if &grant_type=authorization_code %then %do;
headers "Authorization"="Bearer &&&access_token_var";
%end;
@@ -88,13 +97,17 @@ options noquotelenmax;
/*data _null_;infile &fname1;input;putlog _infile_;run;*/
libname &libref1 JSON fileref=&fname1;
/* now get the followon link to list members */
- %local href;
- %let href=0;
+ %local href cnt;
+ %let cnt=0;
data _null_;
set &libref1..links;
- if rel='members' then call symputx('href',quote("&base_uri"!!trim(href)),'l');
+ if rel='members' then do;
+ url=cats("'","&base_uri",href,"?limit=10000'");
+ call symputx('href',url,'l');
+ call symputx('cnt',1,'l');
+ end;
run;
- %if &href=0 %then %do;
+ %if &cnt=0 %then %do;
%put NOTE:;%put NOTE- No members found in &root!!;%put NOTE-;
%return;
%end;