sasjs/core
1
0
Fork 0
mirror of https://github.com/sasjs/core.git synced 2026-01-15 20:40:05 +00:00
Code Issues Projects Releases Wiki Activity

fix: enabling sasjsprocessmode as global var in mp_abort

Browse Source 
Also, reduced indentation
This commit is contained in:
Allan Bowe
2022-06-18 13:11:35 +00:00
parent d9f8e92fac
commit c41ae2dcc8
2 changed files with 414 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
all.sas
View File

@@ -2246,19 +2246,19 @@ Usage:
, mode=REGULAR , mode=REGULAR
)/*/STORE SOURCE*/; )/*/STORE SOURCE*/;
%global sysprocessmode sysprocessname sasjs_stpsrv_header_loc; %global sysprocessmode sysprocessname sasjs_stpsrv_header_loc sasjsprocessmode;
%local fref fid i; %local fref fid i;
%if not(%eval(%unquote(&iftrue))) %then %return; %if not(%eval(%unquote(&iftrue))) %then %return;
%put NOTE: /// mp_abort macro executing //; %put NOTE: /// mp_abort macro executing //;
%if %length(&mac)>0 %then %put NOTE- called by &mac; %if %length(&mac)>0 %then %put NOTE- called by &mac;
%put NOTE - &msg; %put NOTE - &msg;
%if %symexist(_SYSINCLUDEFILEDEVICE) %if %symexist(_SYSINCLUDEFILEDEVICE)
/* abort cancel FILE does not restart outside the INCLUDE on Viya 3.5 */ /* abort cancel FILE does not restart outside the INCLUDE on Viya 3.5 */
and %superq(SYSPROCESSNAME) ne %str(Compute Server) and %superq(SYSPROCESSNAME) ne %str(Compute Server)
%then %do; %then %do;
%if "*&_SYSINCLUDEFILEDEVICE*" ne "**" %then %do; %if "*&_SYSINCLUDEFILEDEVICE*" ne "**" %then %do;
data &errds; data &errds;
iftrue='1=1'; iftrue='1=1';
@@ -2271,13 +2271,13 @@ Usage:
run; run;
%return; %return;
%end; %end;
%end; %end;
/* Web App Context */ /* Web App Context */
%if %symexist(_PROGRAM) %if %symexist(_PROGRAM)
or %superq(SYSPROCESSNAME) = %str(Compute Server) or %superq(SYSPROCESSNAME) = %str(Compute Server)
or &mode=INCLUDE or &mode=INCLUDE
%then %do; %then %do;
options obs=max replace mprint; options obs=max replace mprint;
%if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5" %if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5"
%then %do; %then %do;
@@ -2471,11 +2471,11 @@ Usage:
%else %do; %else %do;
%abort cancel; %abort cancel;
%end; %end;
%end; %end;
%else %do; %else %do;
%put _all_; %put _all_;
%abort cancel; %abort cancel;
%end; %end;
%mend mp_abort; %mend mp_abort;
/** @endcond */ /** @endcond */

34
base/mp_abort.sas
View File

@@ -63,19 +63,19 @@
, mode=REGULAR , mode=REGULAR
)/*/STORE SOURCE*/; )/*/STORE SOURCE*/;
%global sysprocessmode sysprocessname sasjs_stpsrv_header_loc; %global sysprocessmode sysprocessname sasjs_stpsrv_header_loc sasjsprocessmode;
%local fref fid i; %local fref fid i;
%if not(%eval(%unquote(&iftrue))) %then %return; %if not(%eval(%unquote(&iftrue))) %then %return;
%put NOTE: /// mp_abort macro executing //; %put NOTE: /// mp_abort macro executing //;
%if %length(&mac)>0 %then %put NOTE- called by &mac; %if %length(&mac)>0 %then %put NOTE- called by &mac;
%put NOTE - &msg; %put NOTE - &msg;
%if %symexist(_SYSINCLUDEFILEDEVICE) %if %symexist(_SYSINCLUDEFILEDEVICE)
/* abort cancel FILE does not restart outside the INCLUDE on Viya 3.5 */ /* abort cancel FILE does not restart outside the INCLUDE on Viya 3.5 */
and %superq(SYSPROCESSNAME) ne %str(Compute Server) and %superq(SYSPROCESSNAME) ne %str(Compute Server)
%then %do; %then %do;
%if "*&_SYSINCLUDEFILEDEVICE*" ne "**" %then %do; %if "*&_SYSINCLUDEFILEDEVICE*" ne "**" %then %do;
data &errds; data &errds;
iftrue='1=1'; iftrue='1=1';
@@ -88,13 +88,13 @@
run; run;
%return; %return;
%end; %end;
%end; %end;
/* Web App Context */ /* Web App Context */
%if %symexist(_PROGRAM) %if %symexist(_PROGRAM)
or %superq(SYSPROCESSNAME) = %str(Compute Server) or %superq(SYSPROCESSNAME) = %str(Compute Server)
or &mode=INCLUDE or &mode=INCLUDE
%then %do; %then %do;
options obs=max replace mprint; options obs=max replace mprint;
%if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5" %if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5"
%then %do; %then %do;
@@ -288,11 +288,11 @@
%else %do; %else %do;
%abort cancel; %abort cancel;
%end; %end;
%end; %end;
%else %do; %else %do;
%put _all_; %put _all_;
%abort cancel; %abort cancel;
%end; %end;
%mend mp_abort; %mend mp_abort;
/** @endcond */ /** @endcond */