Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Context fixes on mv_jobflow and mp_testservice #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2021
Merged

Context fixes on mv_jobflow and mp_testservice #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd75bf2
fix: removing redundant parameter from mv_getjoblog
Jun 26, 2021
55d4c72
fix: updating mp_testservice.sas and mv_jobflow to use the provided c…
Jun 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions all.sas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6363,8 +6363,11 @@ libname &lib clear;
|mustbevalidname|can be anything, oops, %abort!!|

@param [in] debug= (log) Provide the _debug value
@param [in] viyaresult=(WEBOUT_JSON) The Viya result type to return. For
@param [in] mdebug= (0) Set to 1 to provide macro debugging
@param [in] viyaresult= (WEBOUT_JSON) The Viya result type to return. For
more info, see mv_getjobresult.sas
@param [in] viyacontext= (SAS Job Execution compute context) The Viya compute
context on which to run the service
@param [out] outlib= (0) Output libref to contain the final tables. Set to
0 if the service output is not in JSON format.
@param [out] outref= (0) Output fileref to create, to contain the full _webout
Expand All @@ -6388,17 +6391,18 @@ libname &lib clear;
inputfiles=0,
inputparams=0,
debug=log,
mdebug=0,
outlib=0,
outref=0,
viyaresult=WEBOUT_JSON
viyaresult=WEBOUT_JSON,
viyacontext=SAS Job Execution compute context
)/*/STORE SOURCE*/;
%local mdebug;
%if &debug ne 0 %then %do;
%let mdebug=1;
%local dbg;
%if &mdebug=1 %then %do;
%put &sysmacroname entry vars:;
%put _local_;
%end;
%else %let mdebug=0;
%else %let dbg=*;

/* sanitise inputparams */
%local pcnt;
Expand Down Expand Up @@ -6553,6 +6557,7 @@ libname &lib clear;

data &ds1;
retain _program "&program";
retain _contextname "&viyacontext";
set &ds1;
putlog "&sysmacroname inputparams:";
putlog (_all_)(=);
Expand Down Expand Up @@ -15570,7 +15575,7 @@ run;

@param [in] access_token_var= The global macro variable to contain the access
token
@param [in] mdebug= set to 1 to enable DEBUG messages
@param [in] mdebug= (0) Set to 1 to enable DEBUG messages
@param [in] grant_type= valid values:
@li password
@li authorization_code
Expand All @@ -15595,7 +15600,6 @@ run;
**/

%macro mv_getjoblog(uri=0,outref=0
,contextName=SAS Job Execution compute context
,access_token_var=ACCESS_TOKEN
,grant_type=sas_services
,mdebug=0
Expand Down Expand Up @@ -15916,7 +15920,6 @@ run;
**/

%macro mv_getjobresult(uri=0
,contextName=SAS Job Execution compute context
,access_token_var=ACCESS_TOKEN
,grant_type=sas_services
,mdebug=0
Expand Down Expand Up @@ -16030,10 +16033,11 @@ proc http method='GET' out=&fname2 &oauth_bearer
;
run;
%if &mdebug=1 %then %do;
/* send one char at a time as the json can be very wide */
data _null_;
infile &fname2 lrecl=32767;
input;
putlog _infile_;
infile &fname2 recfm=n;
input char $char1. ;
putlog char $char1. @;
run;
%end;

Expand Down Expand Up @@ -16790,6 +16794,11 @@ run;
%if &mdebug=1 %then %do;
%put &sysmacroname entry vars:;
%put _local_;
%put inds vars:;
data _null_;
set &inds;
putlog (_all_)(=);
run;
%end;
%else %let dbg=*;

Expand Down Expand Up @@ -16834,6 +16843,7 @@ run;
retain FLOW_ID 0;
%end;
set &inds;
&dbg. putlog (_all_)(=);
run;
%end;

Expand Down Expand Up @@ -16898,6 +16908,8 @@ data;run;%let jdswaitfor=&syslast;
call symputx(cats('job',_n_),_program,'l');
call symputx(cats('context',_n_),_contextName,'l');
call symputx('jcnt',_n_,'l');
&dbg. if _n_= 1 then putlog "Loop &fid";
&dbg. putlog (_all_)(=);
run;
%put exporting job variables in json format;
%do jid=1 %to &jcnt;
Expand Down Expand Up @@ -16959,6 +16971,7 @@ data;run;%let jdswaitfor=&syslast;
,name=&jobname
,paramstring=%superq(jparams&jid)
,outds=&jdsapp
,contextname=&&context&jid
)
data &jdsapp;
format jobparams $32767.;
Expand Down
17 changes: 11 additions & 6 deletions base/mp_testservice.sas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@
|mustbevalidname|can be anything, oops, %abort!!|

@param [in] debug= (log) Provide the _debug value
@param [in] viyaresult=(WEBOUT_JSON) The Viya result type to return. For
@param [in] mdebug= (0) Set to 1 to provide macro debugging
@param [in] viyaresult= (WEBOUT_JSON) The Viya result type to return. For
more info, see mv_getjobresult.sas
@param [in] viyacontext= (SAS Job Execution compute context) The Viya compute
context on which to run the service
@param [out] outlib= (0) Output libref to contain the final tables. Set to
0 if the service output is not in JSON format.
@param [out] outref= (0) Output fileref to create, to contain the full _webout
Expand All @@ -47,17 +50,18 @@
inputfiles=0,
inputparams=0,
debug=log,
mdebug=0,
outlib=0,
outref=0,
viyaresult=WEBOUT_JSON
viyaresult=WEBOUT_JSON,
viyacontext=SAS Job Execution compute context
)/*/STORE SOURCE*/;
%local mdebug;
%if &debug ne 0 %then %do;
%let mdebug=1;
%local dbg;
%if &mdebug=1 %then %do;
%put &sysmacroname entry vars:;
%put _local_;
%end;
%else %let mdebug=0;
%else %let dbg=*;

/* sanitise inputparams */
%local pcnt;
Expand Down Expand Up @@ -212,6 +216,7 @@

data &ds1;
retain _program "&program";
retain _contextname "&viyacontext";
set &ds1;
putlog "&sysmacroname inputparams:";
putlog (_all_)(=);
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"postinstall": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true"
},
"devDependencies": {
"@sasjs/cli": "^2.27.0"
"@sasjs/cli": "2.27.0"
}
}
3 changes: 1 addition & 2 deletions viya/mv_getjoblog.sas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

@param [in] access_token_var= The global macro variable to contain the access
token
@param [in] mdebug= set to 1 to enable DEBUG messages
@param [in] mdebug= (0) Set to 1 to enable DEBUG messages
@param [in] grant_type= valid values:
@li password
@li authorization_code
Expand All @@ -91,7 +91,6 @@
**/

%macro mv_getjoblog(uri=0,outref=0
,contextName=SAS Job Execution compute context
,access_token_var=ACCESS_TOKEN
,grant_type=sas_services
,mdebug=0
Expand Down
8 changes: 4 additions & 4 deletions viya/mv_getjobresult.sas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
**/

%macro mv_getjobresult(uri=0
,contextName=SAS Job Execution compute context
,access_token_var=ACCESS_TOKEN
,grant_type=sas_services
,mdebug=0
Expand Down Expand Up @@ -204,10 +203,11 @@ proc http method='GET' out=&fname2 &oauth_bearer
;
run;
%if &mdebug=1 %then %do;
/* send one char at a time as the json can be very wide */
data _null_;
infile &fname2 lrecl=32767;
input;
putlog _infile_;
infile &fname2 recfm=n;
input char $char1. ;
putlog char $char1. @;
run;
%end;

Expand Down
9 changes: 9 additions & 0 deletions viya/mv_jobflow.sas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@
%if &mdebug=1 %then %do;
%put &sysmacroname entry vars:;
%put _local_;
%put inds vars:;
data _null_;
set &inds;
putlog (_all_)(=);
run;
%end;
%else %let dbg=*;

Expand Down Expand Up @@ -184,6 +189,7 @@
retain FLOW_ID 0;
%end;
set &inds;
&dbg. putlog (_all_)(=);
run;
%end;

Expand Down Expand Up @@ -248,6 +254,8 @@ data;run;%let jdswaitfor=&syslast;
call symputx(cats('job',_n_),_program,'l');
call symputx(cats('context',_n_),_contextName,'l');
call symputx('jcnt',_n_,'l');
&dbg. if _n_= 1 then putlog "Loop &fid";
&dbg. putlog (_all_)(=);
run;
%put exporting job variables in json format;
%do jid=1 %to &jcnt;
Expand Down Expand Up @@ -309,6 +317,7 @@ data;run;%let jdswaitfor=&syslast;
,name=&jobname
,paramstring=%superq(jparams&jid)
,outds=&jdsapp
,contextname=&&context&jid
)
data &jdsapp;
format jobparams $32767.;
Expand Down