1
0
mirror of https://github.com/sasjs/core.git synced 2026-01-10 18:50:04 +00:00

Compare commits

...

5 Commits

Author SHA1 Message Date
Allan Bowe
e9e576b5ec fix: forcing misstype to NULL in ms_webout where not supported 2022-05-02 23:17:11 +00:00
Allan Bowe
1a32d114f1 fix: conditional execution of mp_init() 2022-05-02 22:32:32 +00:00
Allan Bowe
94e83f6b8d fix: updating mf_existfeature for constraint check 2022-05-02 22:24:56 +00:00
Allan Bowe
35a6dede6f fix: enabling ms_testservice() without inputs 2022-05-02 13:56:22 +00:00
Allan Bowe
039ec397dd chore: local scoping vars in mp_testservice 2022-04-30 19:16:25 +00:00
6 changed files with 44 additions and 20 deletions

32
all.sas
View File

@@ -188,7 +188,7 @@ options noquotelenmax;
%put No feature was requested for detection; %put No feature was requested for detection;
%end; %end;
%else %if &feature=COLCONSTRAINTS %then %do; %else %if &feature=COLCONSTRAINTS %then %do;
%if %substr(&sysver,1,1)=4 %then 0; %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then 0;
%else 1; %else 1;
%end; %end;
%else %if &feature=PROCLUA %then %do; %else %if &feature=PROCLUA %then %do;
@@ -8443,7 +8443,7 @@ options
validvarname=V7 /* avoid special characters etc in variable names */ validvarname=V7 /* avoid special characters etc in variable names */
varinitchk=%str(ERR)OR /* avoid data mistakes from variable name typos */ varinitchk=%str(ERR)OR /* avoid data mistakes from variable name typos */
varlenchk=%str(ERR)OR /* fail hard if truncation (data loss) can result */ varlenchk=%str(ERR)OR /* fail hard if truncation (data loss) can result */
%if %substr(&sysver,1,1) ne 4 %then %do; %if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5" %then %do;
noautocorrect /* disallow misspelled procedure names */ noautocorrect /* disallow misspelled procedure names */
dsoptions=note2err /* undocumented - convert bad NOTEs to ERRs */ dsoptions=note2err /* undocumented - convert bad NOTEs to ERRs */
%end; %end;
@@ -19807,6 +19807,11 @@ data _null_;
put '%end; '; put '%end; ';
put ' '; put ' ';
put '%else %if &action=ARR or &action=OBJ %then %do; '; put '%else %if &action=ARR or &action=OBJ %then %do; ';
put ' %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do; ';
put ' /* functions in formats unsupported */ ';
put ' %put &sysmacroname: forcing missing back to NULL as feature not supported; ';
put ' %let missing=NULL; ';
put ' %end; ';
put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref '; 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 ';
put ' ) '; put ' ) ';
@@ -20409,7 +20414,7 @@ options &optval;
outref=0, outref=0,
outlogds=_null_ outlogds=_null_
)/*/STORE SOURCE*/; )/*/STORE SOURCE*/;
%local dbg fref1 chopout1 chopout2; %local dbg i var ds1 fref1 chopout1 chopout2;
%if &mdebug=1 %then %do; %if &mdebug=1 %then %do;
%put &sysmacroname entry vars:; %put &sysmacroname entry vars:;
%put _local_; %put _local_;
@@ -20432,13 +20437,15 @@ options &optval;
%let ds1=%mf_getuniquename(); %let ds1=%mf_getuniquename();
data &ds1; data &ds1;
length fileref $8 name $32 filename $256 var $300; length fileref $8 name $32 filename $256 var $300;
webcount=countw("&inputfiles"); if "&inputfiles" ne "0" then do;
do i=1 to webcount; webcount=countw("&inputfiles");
var=scan("&inputfiles",i,' '); do i=1 to webcount;
fileref=scan(var,1,':'); var=scan("&inputfiles",i,' ');
name=scan(var,2,':'); fileref=scan(var,1,':');
filename=cats(name,'.csv'); name=scan(var,2,':');
output; filename=cats(name,'.csv');
output;
end;
end; end;
run; run;
@@ -20601,6 +20608,11 @@ run;
%end; %end;
%else %if &action=ARR or &action=OBJ %then %do; %else %if &action=ARR or &action=OBJ %then %do;
%if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do;
/* functions in formats unsupported */
%put &sysmacroname: forcing missing back to NULL as feature not supported;
%let missing=NULL;
%end;
%mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref
,engine=DATASTEP,missing=&missing,showmeta=&showmeta ,engine=DATASTEP,missing=&missing,showmeta=&showmeta
) )

View File

@@ -30,7 +30,7 @@
%put No feature was requested for detection; %put No feature was requested for detection;
%end; %end;
%else %if &feature=COLCONSTRAINTS %then %do; %else %if &feature=COLCONSTRAINTS %then %do;
%if %substr(&sysver,1,1)=4 %then 0; %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then 0;
%else 1; %else 1;
%end; %end;
%else %if &feature=PROCLUA %then %do; %else %if &feature=PROCLUA %then %do;

View File

@@ -67,7 +67,7 @@ options
validvarname=V7 /* avoid special characters etc in variable names */ validvarname=V7 /* avoid special characters etc in variable names */
varinitchk=%str(ERR)OR /* avoid data mistakes from variable name typos */ varinitchk=%str(ERR)OR /* avoid data mistakes from variable name typos */
varlenchk=%str(ERR)OR /* fail hard if truncation (data loss) can result */ varlenchk=%str(ERR)OR /* fail hard if truncation (data loss) can result */
%if %substr(&sysver,1,1) ne 4 %then %do; %if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5" %then %do;
noautocorrect /* disallow misspelled procedure names */ noautocorrect /* disallow misspelled procedure names */
dsoptions=note2err /* undocumented - convert bad NOTEs to ERRs */ dsoptions=note2err /* undocumented - convert bad NOTEs to ERRs */
%end; %end;

View File

@@ -390,6 +390,11 @@ data _null_;
put '%end; '; put '%end; ';
put ' '; put ' ';
put '%else %if &action=ARR or &action=OBJ %then %do; '; put '%else %if &action=ARR or &action=OBJ %then %do; ';
put ' %if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do; ';
put ' /* functions in formats unsupported */ ';
put ' %put &sysmacroname: forcing missing back to NULL as feature not supported; ';
put ' %let missing=NULL; ';
put ' %end; ';
put ' %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref '; 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 ';
put ' ) '; put ' ) ';

View File

@@ -59,7 +59,7 @@
outref=0, outref=0,
outlogds=_null_ outlogds=_null_
)/*/STORE SOURCE*/; )/*/STORE SOURCE*/;
%local dbg fref1 chopout1 chopout2; %local dbg i var ds1 fref1 chopout1 chopout2;
%if &mdebug=1 %then %do; %if &mdebug=1 %then %do;
%put &sysmacroname entry vars:; %put &sysmacroname entry vars:;
%put _local_; %put _local_;
@@ -82,13 +82,15 @@
%let ds1=%mf_getuniquename(); %let ds1=%mf_getuniquename();
data &ds1; data &ds1;
length fileref $8 name $32 filename $256 var $300; length fileref $8 name $32 filename $256 var $300;
webcount=countw("&inputfiles"); if "&inputfiles" ne "0" then do;
do i=1 to webcount; webcount=countw("&inputfiles");
var=scan("&inputfiles",i,' '); do i=1 to webcount;
fileref=scan(var,1,':'); var=scan("&inputfiles",i,' ');
name=scan(var,2,':'); fileref=scan(var,1,':');
filename=cats(name,'.csv'); name=scan(var,2,':');
output; filename=cats(name,'.csv');
output;
end;
end; end;
run; run;

View File

@@ -100,6 +100,11 @@
%end; %end;
%else %if &action=ARR or &action=OBJ %then %do; %else %if &action=ARR or &action=OBJ %then %do;
%if "%substr(&sysver,1,1)"="4" or "%substr(&sysver,1,1)"="5" %then %do;
/* functions in formats unsupported */
%put &sysmacroname: forcing missing back to NULL as feature not supported;
%let missing=NULL;
%end;
%mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref
,engine=DATASTEP,missing=&missing,showmeta=&showmeta ,engine=DATASTEP,missing=&missing,showmeta=&showmeta
) )