diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0bc6267..9bbb490 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,5 +14,5 @@ jobs: github_token: ${{ secrets.GH_TOKEN }} branch: main draft: false - version: 4.46.5 - description: 'Version 4.46.5 of sasjs/core is now on SAS PACKAGES :ok_hand:' + version: 4.46.6 + description: 'Version 4.46.6 of sasjs/core is now on SAS PACKAGES :ok_hand:' diff --git a/002_macros/mm_createfolder.sas b/002_macros/mm_createfolder.sas index 48aef16..161704f 100644 --- a/002_macros/mm_createfolder.sas +++ b/002_macros/mm_createfolder.sas @@ -51,12 +51,12 @@ data _null_; * name must not be blank; if ( folderPath = '' ) then do; - put "%str(ERR)OR: &sysmacroname PATH parameter value must be non-blank"; + put 'ERR' +(-1) "OR: &sysmacroname PATH parameter value must be non-blank"; end; * must have a starting slash ; if ( substr(folderPath,1,1) ne '/' ) then do; - put "%str(ERR)OR: &sysmacroname PATH param value must have starting slash"; + put 'ERR' +(-1) "OR: &sysmacroname PATH param value must have starting slash"; stop; end; @@ -69,14 +69,14 @@ data _null_; * do not create a root (one level) folder ; if countc(folderPath,'/')=1 then do; - put "%str(ERR)OR: &sysmacroname will not create a new ROOT folder"; + put 'ERR' +(-1) "OR: &sysmacroname will not create a new ROOT folder"; stop; end; * check that root folder exists ; root=cats('/',scan(folderpath,1,'/'),"(Folder)"); if metadata_pathobj('',root,"",objType,parentId)<1 then do; - put "%str(ERR)OR: " root " does not exist!"; + put 'ERR' +(-1) "OR: " root " does not exist!"; stop; end; @@ -141,7 +141,7 @@ run; putlog "SUCCCESS! &path created."; end; else do; - putlog "%str(ERR)OR: unsuccessful attempt to create &path"; + putlog 'ERR' +(-1) "OR: unsuccessful attempt to create &path"; call symputx('syscc',8); end; run; diff --git a/002_macros/mm_getstpinfo.sas b/002_macros/mm_getstpinfo.sas index fb9bb60..23a44f2 100644 --- a/002_macros/mm_getstpinfo.sas +++ b/002_macros/mm_getstpinfo.sas @@ -58,7 +58,7 @@ data &outds; rc5=metadata_getattr(tsuri,"Name",servercontext); end; else do; - put "%str(ERR)OR: could not find " path; + put 'ERR' +(-1) "OR: could not find " path; put (_all_)(=); end; &md.put (_all_)(=); diff --git a/003_macros/mv_createwebservice.sas b/003_macros/mv_createwebservice.sas index 1f2a63c..1eaf54b 100644 --- a/003_macros/mv_createwebservice.sas +++ b/003_macros/mv_createwebservice.sas @@ -814,9 +814,11 @@ data _null_; put '%global __program _program;'; put '%let _program=%sysfunc(coalescec(&__program,&_program));'; put ' '; - put '%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);'; + put '%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO'; + put ' ,maxobs=MAX'; + put ');'; put ' %mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing'; - put ' ,showmeta=&showmeta'; + put ' ,showmeta=&showmeta,maxobs=&maxobs'; put ' )'; put '%mend;'; run; diff --git a/005_macros/mp_applyformats.sas b/005_macros/mp_applyformats.sas index 95315db..0e4f883 100644 --- a/005_macros/mp_applyformats.sas +++ b/005_macros/mp_applyformats.sas @@ -94,7 +94,7 @@ data &outds; if libref(lib) ne 0 then do; msg=catx(' ','libref',lib,'is not assigned!'); %if &errds=0 %then %do; - putlog "%str(ERR)OR: " msg; + putlog 'ERR' +(-1) "OR: " msg; %end; output; return; @@ -102,7 +102,7 @@ data &outds; if exist(cats(lib,'.',ds)) ne 1 then do; msg=catx(' ','libds',lib,'.',ds,'does not exist!'); %if &errds=0 %then %do; - putlog "%str(ERR)OR: " msg; + putlog 'ERR' +(-1) "OR: " msg; %end; output; return; @@ -111,7 +111,7 @@ data &outds; if is_fmt=0 then do; msg=catx(' ','format',fmt,'on libds',lib,'.',ds,'.',var,'is not valid!'); %if &errds=0 %then %do; - putlog "%str(ERR)OR: " msg; + putlog 'ERR' +(-1) "OR: " msg; %end; output; return; @@ -123,7 +123,7 @@ data &outds; if dsid=0 then do; msg=catx(' ','libds',lib,'.',ds,' could not be opened!'); %if &errds=0 %then %do; - putlog "%str(ERR)OR: " msg; + putlog 'ERR' +(-1) "OR: " msg; %end; output; return; @@ -131,7 +131,7 @@ data &outds; if varnum(dsid,var)<1 then do; msg=catx(' ','Variable',lib,'.',ds,'.',var,' was not found!'); %if &errds=0 %then %do; - putlog "%str(ERR)OR: " msg; + putlog 'ERR' +(-1) "OR: " msg; %end; output; end; diff --git a/005_macros/mp_copyfolder.sas b/005_macros/mp_copyfolder.sas index 3792147..2d402e0 100644 --- a/005_macros/mp_copyfolder.sas +++ b/005_macros/mp_copyfolder.sas @@ -69,7 +69,7 @@ rc2=filename(fref2,filepath2,'disk','recfm=n'); if fcopy(fref1,fref2) ne 0 then do; msg=sysmsg(); - putlog "%str(ERR)OR: Unable to copy " filepath " to " filepath2; + putlog 'ERR' +(-1) "OR: Unable to copy " filepath " to " filepath2; putlog msg=; end; end; diff --git a/005_macros/mp_validatecol.sas b/005_macros/mp_validatecol.sas index 5381cec..440501d 100644 --- a/005_macros/mp_validatecol.sas +++ b/005_macros/mp_validatecol.sas @@ -71,7 +71,7 @@ retain &tempcol; &tempcol=prxparse('/^[_a-z]\w{0,7}\.[_a-z]\w{0,31}$/i'); if missing(&tempcol) then do; - putlog "%str(ERR)OR: Invalid expression for LIBDS"; + putlog 'ERR' +(-1) "OR: Invalid expression for LIBDS"; stop; end; drop &tempcol; @@ -85,7 +85,7 @@ retain &tempcol; &tempcol=prxparse('/^[_a-z\$]\w{0,31}\.[0-9]*$/i'); if missing(&tempcol) then do; - putlog "%str(ERR)OR: Invalid expression for FORMAT"; + putlog 'ERR' +(-1) "OR: Invalid expression for FORMAT"; stop; end; drop &tempcol; diff --git a/007_macros/ms_createwebservice.sas b/007_macros/ms_createwebservice.sas index 3a00486..04f64e3 100644 --- a/007_macros/ms_createwebservice.sas +++ b/007_macros/ms_createwebservice.sas @@ -652,9 +652,11 @@ data _null_; put ' '; put '%mend mfs_httpheader; '; /* WEBOUT END */ - put '%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);'; + put '%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO'; + put ' ,maxobs=MAX'; + put ');'; put ' %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt,missing=&missing'; - put ' ,showmeta=&showmeta'; + put ' ,showmeta=&showmeta,maxobs=&maxobs'; put ' )'; put '%mend;'; run; diff --git a/description.sas b/description.sas index 3864205..d9d3c13 100644 --- a/description.sas +++ b/description.sas @@ -1,7 +1,7 @@ Type: Package Package: SASjsCore Title: SAS Macros for Application Development -Version: 4.46.5 +Version: 4.46.6 Author: Allan Bowe Maintainer: 4GL Ltd License: MIT diff --git a/sasjscore.zip b/sasjscore.zip index d6fef73..bf55ceb 100755 Binary files a/sasjscore.zip and b/sasjscore.zip differ