From 60153201454df175822061c27a82bc08044929dd Mon Sep 17 00:00:00 2001 From: Allan Bowe Date: Fri, 12 Aug 2022 13:12:06 +0000 Subject: [PATCH] feat: adding maxobs param to mX_webout macros --- all.sas | 54 +++++++++++++++++++--------------- base/mp_ds2fmtds.sas | 2 +- base/mp_jsonout.sas | 2 +- base/mp_perflog.sas | 15 +++++----- meta/mm_createwebservice.sas | 4 +-- meta/mm_webout.sas | 7 +++-- server/ms_createwebservice.sas | 4 +-- server/ms_webout.sas | 6 ++-- viya/mv_createwebservice.sas | 6 ++-- viya/mv_webout.sas | 8 +++-- 10 files changed, 60 insertions(+), 48 deletions(-) diff --git a/all.sas b/all.sas index 22bba1b..6541be2 100644 --- a/all.sas +++ b/all.sas @@ -5340,7 +5340,7 @@ run;

SAS Macros

@li mf_existds.sas -

Related Macros

+

Related Macros

@li mp_jsonout.sas @version 9.2 @@ -8709,7 +8709,7 @@ options @param [in] maxobs= (MAX) Provide an integer to limit the number of input rows that should be converted to JSON -

Related Macros

+

Related Macros

@li mp_ds2fmtds.sas @version 9.2 @@ -9939,14 +9939,15 @@ put(md5( %mend mp_md5; /** @file - @brief Logs the time the macro was executed in a control dataset. - @details If the dataset does not exist, it is created. Usage: + @brief Logs a message in a dataset every time it is invoked + @details If the dataset does not exist, it is created. + Usage: - %mp_perflog(started) - %mp_perflog() - %mp_perflog(startanew,libds=work.newdataset) - %mp_perflog(finished,libds=work.newdataset) - %mp_perflog(finished) + %mp_perflog(started) + %mp_perflog() + %mp_perflog(startanew,libds=work.newdataset) + %mp_perflog(finished,libds=work.newdataset) + %mp_perflog(finished) @param label Provide label to go into the control dataset @@ -15409,7 +15410,7 @@ data _null_; put ' '; put '%mend mf_getuser; '; put '%macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL '; - put ' ,showmeta=N '; + put ' ,showmeta=N,maxobs=MAX '; put '); '; put '%global _webin_file_count _webin_fileref1 _webin_name1 _program _debug '; put ' sasjs_tables; '; @@ -15476,7 +15477,7 @@ data _null_; put ' '; put '%else %if &action=ARR or &action=OBJ %then %do; '; put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref '; - put ' ,engine=&jsonengine,missing=&missing,showmeta=&showmeta '; + put ' ,engine=&jsonengine,missing=&missing,showmeta=&showmeta,maxobs=&maxobs '; put ' ) '; put '%end; '; put '%else %if &action=CLOSE %then %do; '; @@ -18968,7 +18969,8 @@ run; 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 output JSON

SAS Macros

@li mp_jsonout.sas @@ -18978,7 +18980,7 @@ run; **/ %macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL - ,showmeta=N + ,showmeta=N,maxobs=MAX ); %global _webin_file_count _webin_fileref1 _webin_name1 _program _debug sasjs_tables; @@ -19045,7 +19047,7 @@ run; %else %if &action=ARR or &action=OBJ %then %do; %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref - ,engine=&jsonengine,missing=&missing,showmeta=&showmeta + ,engine=&jsonengine,missing=&missing,showmeta=&showmeta,maxobs=&maxobs ) %end; %else %if &action=CLOSE %then %do; @@ -20274,7 +20276,7 @@ data _null_; put '%mend mf_getuser; '; put ' '; put '%macro ms_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL '; - put ' ,showmeta=N '; + put ' ,showmeta=N,maxobs=MAX '; put '); '; put '%global _webin_file_count _webin_fileref1 _webin_name1 _program _debug '; put ' sasjs_tables; '; @@ -20333,7 +20335,7 @@ data _null_; put ' %let missing=NULL; '; put ' %end; '; put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref '; - put ' ,engine=DATASTEP,missing=&missing,showmeta=&showmeta '; + put ' ,engine=DATASTEP,missing=&missing,showmeta=&showmeta,maxobs=&maxobs '; put ' ) '; put '%end; '; put '%else %if &action=CLOSE %then %do; '; @@ -21248,6 +21250,8 @@ run; 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 output JSON

SAS Macros

@li mf_getuser.sas @@ -21264,7 +21268,7 @@ run; **/ %macro ms_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL - ,showmeta=N + ,showmeta=N,maxobs=MAX ); %global _webin_file_count _webin_fileref1 _webin_name1 _program _debug sasjs_tables; @@ -21323,7 +21327,7 @@ run; %let missing=NULL; %end; %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref - ,engine=DATASTEP,missing=&missing,showmeta=&showmeta + ,engine=DATASTEP,missing=&missing,showmeta=&showmeta,maxobs=&maxobs ) %end; %else %if &action=CLOSE %then %do; @@ -22649,7 +22653,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=N '; + put ' ,showmeta=N,maxobs=MAX '; put '); '; put '%global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name '; put ' sasjs_tables SYS_JES_JOB_URI; '; @@ -22751,8 +22755,8 @@ data _null_; put ' run; '; put '%end; '; put '%else %if &action=ARR or &action=OBJ %then %do; '; - put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt '; - put ' ,jref=&fref,engine=DATASTEP,missing=&missing,showmeta=&showmeta '; + put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref '; + put ' ,engine=DATASTEP,missing=&missing,showmeta=&showmeta,maxobs=&maxobs '; put ' ) '; put '%end; '; put '%else %if &action=CLOSE %then %do; '; @@ -26435,6 +26439,8 @@ filename &fref1 clear; 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 output JSON

SAS Macros

@li mp_jsonout.sas @@ -26445,7 +26451,7 @@ filename &fref1 clear; **/ %macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL - ,showmeta=N + ,showmeta=N,maxobs=MAX ); %global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name sasjs_tables SYS_JES_JOB_URI; @@ -26547,8 +26553,8 @@ filename &fref1 clear; run; %end; %else %if &action=ARR or &action=OBJ %then %do; - %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt - ,jref=&fref,engine=DATASTEP,missing=&missing,showmeta=&showmeta + %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref + ,engine=DATASTEP,missing=&missing,showmeta=&showmeta,maxobs=&maxobs ) %end; %else %if &action=CLOSE %then %do; diff --git a/base/mp_ds2fmtds.sas b/base/mp_ds2fmtds.sas index f5ad608..d553a76 100644 --- a/base/mp_ds2fmtds.sas +++ b/base/mp_ds2fmtds.sas @@ -17,7 +17,7 @@

SAS Macros

@li mf_existds.sas -

Related Macros

+

Related Macros

@li mp_jsonout.sas @version 9.2 diff --git a/base/mp_jsonout.sas b/base/mp_jsonout.sas index bd09fae..a37a56c 100644 --- a/base/mp_jsonout.sas +++ b/base/mp_jsonout.sas @@ -62,7 +62,7 @@ @param [in] maxobs= (MAX) Provide an integer to limit the number of input rows that should be converted to JSON -

Related Macros

+

Related Macros

@li mp_ds2fmtds.sas @version 9.2 diff --git a/base/mp_perflog.sas b/base/mp_perflog.sas index c638826..d9f9e56 100644 --- a/base/mp_perflog.sas +++ b/base/mp_perflog.sas @@ -1,13 +1,14 @@ /** @file - @brief Logs the time the macro was executed in a control dataset. - @details If the dataset does not exist, it is created. Usage: + @brief Logs a message in a dataset every time it is invoked + @details If the dataset does not exist, it is created. + Usage: - %mp_perflog(started) - %mp_perflog() - %mp_perflog(startanew,libds=work.newdataset) - %mp_perflog(finished,libds=work.newdataset) - %mp_perflog(finished) + %mp_perflog(started) + %mp_perflog() + %mp_perflog(startanew,libds=work.newdataset) + %mp_perflog(finished,libds=work.newdataset) + %mp_perflog(finished) @param label Provide label to go into the control dataset diff --git a/meta/mm_createwebservice.sas b/meta/mm_createwebservice.sas index d2b9e93..f7ecdf6 100644 --- a/meta/mm_createwebservice.sas +++ b/meta/mm_createwebservice.sas @@ -369,7 +369,7 @@ data _null_; put ' '; put '%mend mf_getuser; '; put '%macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL '; - put ' ,showmeta=N '; + put ' ,showmeta=N,maxobs=MAX '; put '); '; put '%global _webin_file_count _webin_fileref1 _webin_name1 _program _debug '; put ' sasjs_tables; '; @@ -436,7 +436,7 @@ data _null_; put ' '; put '%else %if &action=ARR or &action=OBJ %then %do; '; put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref '; - put ' ,engine=&jsonengine,missing=&missing,showmeta=&showmeta '; + put ' ,engine=&jsonengine,missing=&missing,showmeta=&showmeta,maxobs=&maxobs '; put ' ) '; put '%end; '; put '%else %if &action=CLOSE %then %do; '; diff --git a/meta/mm_webout.sas b/meta/mm_webout.sas index e685e01..d8a46e3 100644 --- a/meta/mm_webout.sas +++ b/meta/mm_webout.sas @@ -34,7 +34,8 @@ 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 output JSON

SAS Macros

@li mp_jsonout.sas @@ -44,7 +45,7 @@ **/ %macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL - ,showmeta=N + ,showmeta=N,maxobs=MAX ); %global _webin_file_count _webin_fileref1 _webin_name1 _program _debug sasjs_tables; @@ -111,7 +112,7 @@ %else %if &action=ARR or &action=OBJ %then %do; %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref - ,engine=&jsonengine,missing=&missing,showmeta=&showmeta + ,engine=&jsonengine,missing=&missing,showmeta=&showmeta,maxobs=&maxobs ) %end; %else %if &action=CLOSE %then %do; diff --git a/server/ms_createwebservice.sas b/server/ms_createwebservice.sas index 0eba956..7c0bc1f 100644 --- a/server/ms_createwebservice.sas +++ b/server/ms_createwebservice.sas @@ -371,7 +371,7 @@ data _null_; put '%mend mf_getuser; '; put ' '; put '%macro ms_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL '; - put ' ,showmeta=N '; + put ' ,showmeta=N,maxobs=MAX '; put '); '; put '%global _webin_file_count _webin_fileref1 _webin_name1 _program _debug '; put ' sasjs_tables; '; @@ -430,7 +430,7 @@ data _null_; put ' %let missing=NULL; '; put ' %end; '; put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref '; - put ' ,engine=DATASTEP,missing=&missing,showmeta=&showmeta '; + put ' ,engine=DATASTEP,missing=&missing,showmeta=&showmeta,maxobs=&maxobs '; put ' ) '; put '%end; '; put '%else %if &action=CLOSE %then %do; '; diff --git a/server/ms_webout.sas b/server/ms_webout.sas index 8c62275..ce0161f 100644 --- a/server/ms_webout.sas +++ b/server/ms_webout.sas @@ -31,6 +31,8 @@ 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 output JSON

SAS Macros

@li mf_getuser.sas @@ -47,7 +49,7 @@ **/ %macro ms_webout(action,ds,dslabel=,fref=_webout,fmt=Y,missing=NULL - ,showmeta=N + ,showmeta=N,maxobs=MAX ); %global _webin_file_count _webin_fileref1 _webin_name1 _program _debug sasjs_tables; @@ -106,7 +108,7 @@ %let missing=NULL; %end; %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref - ,engine=DATASTEP,missing=&missing,showmeta=&showmeta + ,engine=DATASTEP,missing=&missing,showmeta=&showmeta,maxobs=&maxobs ) %end; %else %if &action=CLOSE %then %do; diff --git a/viya/mv_createwebservice.sas b/viya/mv_createwebservice.sas index 4a29af3..ce27fc7 100644 --- a/viya/mv_createwebservice.sas +++ b/viya/mv_createwebservice.sas @@ -512,7 +512,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=N '; + put ' ,showmeta=N,maxobs=MAX '; put '); '; put '%global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name '; put ' sasjs_tables SYS_JES_JOB_URI; '; @@ -614,8 +614,8 @@ data _null_; put ' run; '; put '%end; '; put '%else %if &action=ARR or &action=OBJ %then %do; '; - put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt '; - put ' ,jref=&fref,engine=DATASTEP,missing=&missing,showmeta=&showmeta '; + put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref '; + put ' ,engine=DATASTEP,missing=&missing,showmeta=&showmeta,maxobs=&maxobs '; put ' ) '; put '%end; '; put '%else %if &action=CLOSE %then %do; '; diff --git a/viya/mv_webout.sas b/viya/mv_webout.sas index c816f73..5d5377a 100644 --- a/viya/mv_webout.sas +++ b/viya/mv_webout.sas @@ -33,6 +33,8 @@ 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 output JSON

SAS Macros

@li mp_jsonout.sas @@ -43,7 +45,7 @@ **/ %macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL - ,showmeta=N + ,showmeta=N,maxobs=MAX ); %global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name sasjs_tables SYS_JES_JOB_URI; @@ -145,8 +147,8 @@ run; %end; %else %if &action=ARR or &action=OBJ %then %do; - %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt - ,jref=&fref,engine=DATASTEP,missing=&missing,showmeta=&showmeta + %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref + ,engine=DATASTEP,missing=&missing,showmeta=&showmeta,maxobs=&maxobs ) %end; %else %if &action=CLOSE %then %do;