diff --git a/README.md b/README.md index ea60490..0771eff 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ In this repository we are presenting the **SAS Packages Framework** which allows ### Current version: -**The latest version** of SPF is **`20230411`**. +**The latest version** of SPF is **`20230520`**. To get started with SAS Packages try this [**`Getting Started with SAS Packages`**](https://github.com/yabwon/SAS_PACKAGES/blob/main/SPF/Documentation/Getting_Started_with_SAS_Packages.pdf "Getting Started with SAS Packages") presentation (see the `./SPF/Documentation` directory). @@ -224,7 +224,7 @@ SHA256 digest for macroArray: F*85E3BE4D163AC5223B6EC9D3C25C46564A656E3830998B45 [MacroArray in SASPAC](https://github.com/SASPAC/macroarray "MacroArray in SASPAC") -- **BasePlus**\[1.24.0\] adds a bunch of functionalities I am missing in BASE SAS, such as: +- **BasePlus**\[1.24.1\] adds a bunch of functionalities I am missing in BASE SAS, such as: ```sas call arrMissToRight(myArray); call arrFillMiss(17, myArray); @@ -248,7 +248,7 @@ format x bool.; %put %repeatTxt(#,15,s=$) HELLO SAS! %repeatTxt(#,15,s=$); ``` -SHA256 digest for BasePlus: F*B297440903337E1AE6F12A6001B80B8AB743079847D16D63DF1C649AE51AA411 +SHA256 digest for BasePlus: F*0CCAA009D64CC20ED315FA123C233E0383967E635EB8708E7A48EEE3767C6BC5 [Documentation for BasePlus](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/baseplus.md "Documentation for BasePlus") diff --git a/SPF/Macros/extendpackagesfileref.sas b/SPF/Macros/extendpackagesfileref.sas index 8d7b534..a643b6a 100644 --- a/SPF/Macros/extendpackagesfileref.sas +++ b/SPF/Macros/extendpackagesfileref.sas @@ -6,7 +6,7 @@ when empty the "packages" value is used */ )/secure /*** HELP END ***/ -des = 'Macro to list directories pointed by "packages" fileref, version 20230411. Run %extendPackagesFileref(HELP) for help info.' +des = 'Macro to list directories pointed by "packages" fileref, version 20230520. Run %extendPackagesFileref(HELP) for help info.' ; %if %QUPCASE(&packages.) = HELP %then @@ -22,7 +22,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20230411 %put ### This is short help information for the `extendPackagesFileref` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list directories pointed by 'packages' fileref, version `20230411` #; + %put # Macro to list directories pointed by 'packages' fileref, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/generatepackage.sas b/SPF/Macros/generatepackage.sas index 7554e2b..57ad7d7 100644 --- a/SPF/Macros/generatepackage.sas +++ b/SPF/Macros/generatepackage.sas @@ -23,7 +23,7 @@ default value 1 means "delete tests work" */ )/ secure minoperator /*** HELP END ***/ -des = 'Macro to generate SAS packages, version 20230411. Run %generatePackage() for help info.' +des = 'Macro to generate SAS packages, version 20230520. Run %generatePackage() for help info.' ; %if (%superq(filesLocation) = ) OR (%qupcase(&filesLocation.) = HELP) %then %do; @@ -38,7 +38,7 @@ des = 'Macro to generate SAS packages, version 20230411. Run %generatePackage() %put ### This is short help information for the `generatePackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to generate SAS packages, version `20230411` #; + %put # Macro to generate SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -724,7 +724,7 @@ run; run; data &filesWithCodes.addCnt; - length root dname $ 2048 filename $ 256 dir level 8; + length root dname $ 8192 filename $ 256 dir level 8; root = "&filesLocation./&additionalContent."; retain filename dname ' ' level 0 dir 1; label @@ -1478,7 +1478,7 @@ data _null_; %end; put +(-1) '`.;''' / ' !! '' %put The macro generated: '' !! put(dtCASLudf, E8601DT19.-L) !! ";"' / - ' !! '' %put with the SAS Packages Framework version 20230411.;''' / + ' !! '' %put with the SAS Packages Framework version 20230520.;''' / ' !! '' %put ****************************************************************************;''' / ' !! '' %GOTO theEndOfTheMacro;''' / ' !! '' %end;''' ; @@ -1651,7 +1651,7 @@ data _null_; %end; put +(-1) '`.; '' !!' / ''' %put The macro generated: ''' " !! put(dtIML, E8601DT19.-L) !! " '''; '' !!' / - ''' %put with the SAS Packages Framework version 20230411.; '' !! ' / + ''' %put with the SAS Packages Framework version 20230520.; '' !! ' / ''' %put ****************************************************************************; '' !! ' / ''' %GOTO theEndOfTheMacro; '' !! ' / ''' %end; '' !! ' / @@ -2267,7 +2267,7 @@ data _null_; put "put @3 'localization (only if additional content was deployed during the installation process).';" / "put ;"; %end; - put 'put "***"; put "* SAS package generated by generatePackage, version 20230411 *"; put "***";'; + put 'put "***"; put "* SAS package generated by generatePackage, version 20230520 *"; put "***";'; put 'run; ' /; @@ -2491,20 +2491,25 @@ filename _SPFOUT_ clear; set &filesWithCodes.addCnt; if dir=0; + rc1=filename("_SPFIN_" , catx('/',root,dname,filename), "disk", "lrecl=1 recfm=n"); + length rc1txt $ 8192; rc1txt=sysmsg(); rc2=filename("_SPFOUT_", "%sysfunc(pathname(work,L))/addcnt.zip", "ZIP" ,"lrecl=1 recfm=n member='" !! catx('/',dname,filename) !! "'"); + length rc2txt $ 8192; rc2txt=sysmsg(); do _N_ = 1 to 10; rc3=fcopy("_SPFIN_","_SPFOUT_"); + length rc3txt $ 8192; rc3txt=sysmsg(); if fexist("_SPFOUT_") then leave; else sleeprc=sleep(0.25,1); end; rc4=fexist("_SPFOUT_"); + length rc4txt $ 8192; rc4txt=sysmsg(); if rc4 = 0 then @@ -2525,18 +2530,22 @@ filename _SPFOUT_ clear; %put Status of inserting "addcnt.zip" into the package file:; data _null_; rc1=filename("_SPFIN_" , "%sysfunc(pathname(work,L))/addcnt.zip", "disk", "lrecl=1 recfm=n"); + length rc1txt $ 8192; rc1txt=sysmsg(); rc2=filename("_SPFOUT_", pathname("&zipReferrence.","F"), "ZIP", "lrecl=1 recfm=n member='addcnt.zip'"); + length rc2txt $ 8192; rc2txt=sysmsg(); do _N_ = 1 to 10; rc3=fcopy("_SPFIN_","_SPFOUT_"); + length rc3txt $ 8192; rc3txt=sysmsg(); if fexist("_SPFOUT_") then leave; else sleeprc=sleep(0.25,1); end; rc4=fexist("_SPFOUT_"); + length rc4txt $ 8192; rc4txt=sysmsg(); if rc4 then diff --git a/SPF/Macros/helppackage.sas b/SPF/Macros/helppackage.sas index 5b7e295..3387b12 100644 --- a/SPF/Macros/helppackage.sas +++ b/SPF/Macros/helppackage.sas @@ -24,7 +24,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to get help about SAS package, version 20230411. Run %helpPackage() for help info.' +des = 'Macro to get help about SAS package, version 20230520. Run %helpPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -39,7 +39,7 @@ des = 'Macro to get help about SAS package, version 20230411. Run %helpPackage() %put ### This is short help information for the `helpPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get help about SAS packages, version `20230411` #; + %put # Macro to get help about SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -169,7 +169,7 @@ TODO: - add MD5(&packageName.) value hash instead "package" word in filenames [DONE] */ -/* Macros to install SAS packages, version 20230411 */ +/* Macros to install SAS packages, version 20230520 */ /* A SAS package is a zip file containing a group of files with SAS code (macros, functions, data steps generating data, etc.) wrapped up together and %INCLUDEed by diff --git a/SPF/Macros/installpackage.sas b/SPF/Macros/installpackage.sas index d764570..083f9d9 100644 --- a/SPF/Macros/installpackage.sas +++ b/SPF/Macros/installpackage.sas @@ -16,7 +16,7 @@ /secure minoperator /*** HELP END ***/ -des = 'Macro to install SAS package, version 20230411. Run %%installPackage() for help info.' +des = 'Macro to install SAS package, version 20230520. Run %%installPackage() for help info.' ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then %do; @@ -31,7 +31,7 @@ des = 'Macro to install SAS package, version 20230411. Run %%installPackage() fo %put ### This is short help information for the `installPackage` macro #; %put #--------------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to install SAS packages, version `20230411` #; + %put # Macro to install SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -483,7 +483,7 @@ des = 'Macro to install SAS package, version 20230411. Run %%installPackage() fo /* Macro to list SAS packages in packages folder. - Version 20230411 + Version 20230520 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating diff --git a/SPF/Macros/listpackages.sas b/SPF/Macros/listpackages.sas index ddec3e2..3f7a7e1 100644 --- a/SPF/Macros/listpackages.sas +++ b/SPF/Macros/listpackages.sas @@ -1,7 +1,7 @@ /*+listPackages+*/ %macro listPackages()/secure PARMBUFF -des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20230411.' +des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20230520.' ; %if %QUPCASE(&SYSPBUFF.) = %str(%(HELP%)) %then %do; @@ -16,7 +16,7 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE %put ### This is short help information for the `listPackages` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list available SAS packages, version `20230411` #; + %put # Macro to list available SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -166,7 +166,7 @@ options ls = &ls_tmp. ps = &ps_tmp. ¬es_tmp. &source_tmp.; /* Macro to generate SAS packages. - Version 20230411 + Version 20230520 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating diff --git a/SPF/Macros/loadpackage.sas b/SPF/Macros/loadpackage.sas index dc1b2ab..1d54301 100644 --- a/SPF/Macros/loadpackage.sas +++ b/SPF/Macros/loadpackage.sas @@ -33,7 +33,7 @@ default is 0 - means No, 1 means Yes */ )/secure /*** HELP END ***/ -des = 'Macro to load SAS package, version 20230411. Run %loadPackage() for help info.' +des = 'Macro to load SAS package, version 20230520. Run %loadPackage() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -49,7 +49,7 @@ minoperator %put ### This is short help information for the `loadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* SAS packages, version `20230411` #; + %put # Macro to *load* SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/loadpackageaddcnt.sas b/SPF/Macros/loadpackageaddcnt.sas index a1ee7ec..3b7c83f 100644 --- a/SPF/Macros/loadpackageaddcnt.sas +++ b/SPF/Macros/loadpackageaddcnt.sas @@ -19,7 +19,7 @@ is provided in required version */ )/secure /*** HELP END ***/ -des = 'Macro to load additional content for a SAS package, version 20230411. Run %loadPackageAddCnt() for help info.' +des = 'Macro to load additional content for a SAS package, version 20230520. Run %loadPackageAddCnt() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -35,7 +35,7 @@ minoperator %put ### This is short help information for the `loadPackageAddCnt` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* additional content for a SAS package, version `20230411` #; + %put # Macro to *load* additional content for a SAS package, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -220,14 +220,17 @@ minoperator call symputx("AdditionalContent", 0, "L"); rc1=filename("in", pathname("&_PackageFileref_."), "ZIP", "lrecl=1 recfm=n member='addcnt.zip'"); + length rc1txt $ 8192; rc1txt=sysmsg(); if fexist("in") then do; rc2=filename("out", pathname("WORK")!!"/%lowcase(&packageName.)addcnt.zip", "disk", "lrecl=1 recfm=n"); + length rc2txt $ 8192; rc2txt=sysmsg(); rc3=fcopy("in","out"); + length rc3txt $ 8192; rc3txt=sysmsg(); if rc3 then put _N_ @12 (rc:) (=); @@ -264,6 +267,7 @@ minoperator end; if did then do i=1 to dnum(did); + length file $ 8192; file = dread(did, i); output; keep file; @@ -275,6 +279,7 @@ minoperator set WORK.__&_TargetFileref_._zip___ end = EOF; wc = countw(file,"/\"); + length libText pathname_f $ 8192; libText = pathname("outData", "L"); if scan(file, wc , "/\") = "" then @@ -290,12 +295,17 @@ minoperator rc = libname("test", libText); rc = libname("test"); end; - rc1 = filename("in", pathname("f"), "zip", "member='" !! strip(file) !! "' lrecl=1 recfm=n"); + + pathname_f = pathname("f"); + rc1 = filename("in", strip(pathname_f), "zip", "member='" !! strip(file) !! "' lrecl=1 recfm=n"); + length rc1txt $ 8192; rc1msg = sysmsg(); rc2 = filename("out", catx("/", libText, scan(file, j , "/\")), "disk", "lrecl=1 recfm=n"); + length rc2txt $ 8192; rc2msg = sysmsg(); rc3 = fcopy("in", "out"); + length rc3txt $ 8192; rc3msg = sysmsg(); loadingProblem + (rc3 & 1); diff --git a/SPF/Macros/loadpackages.sas b/SPF/Macros/loadpackages.sas index ba4b63c..91d5a89 100644 --- a/SPF/Macros/loadpackages.sas +++ b/SPF/Macros/loadpackages.sas @@ -11,7 +11,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to load multiple SAS packages at one run, version 20230411. Run %loadPackages() for help info.' +des = 'Macro to load multiple SAS packages at one run, version 20230520. Run %loadPackages() for help info.' parmbuff ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then @@ -27,7 +27,7 @@ parmbuff %put ### This is short help information for the `loadPackageS` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro wrapper for the loadPackage macro, version `20230411` #; + %put # Macro wrapper for the loadPackage macro, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/previewpackage.sas b/SPF/Macros/previewpackage.sas index 397c5ee..d80847d 100644 --- a/SPF/Macros/previewpackage.sas +++ b/SPF/Macros/previewpackage.sas @@ -23,7 +23,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to preview content of a SAS package, version 20230411. Run %previewPackage() for help info.' +des = 'Macro to preview content of a SAS package, version 20230520. Run %previewPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -38,7 +38,7 @@ des = 'Macro to preview content of a SAS package, version 20230411. Run %preview %put ### This is short help information for the `previewPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get previwe of a SAS packages, version `20230411` #; + %put # Macro to get previwe of a SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/unloadpackage.sas b/SPF/Macros/unloadpackage.sas index bc789b7..028d0ff 100644 --- a/SPF/Macros/unloadpackage.sas +++ b/SPF/Macros/unloadpackage.sas @@ -20,7 +20,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to unload SAS package, version 20230411. Run %unloadPackage() for help info.' +des = 'Macro to unload SAS package, version 20230520. Run %unloadPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -35,7 +35,7 @@ des = 'Macro to unload SAS package, version 20230411. Run %unloadPackage() for h %put ### This is short help information for the `unloadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to unload SAS packages, version `20230411` #; + %put # Macro to unload SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/verifypackage.sas b/SPF/Macros/verifypackage.sas index 132f1aa..0c2e8c2 100644 --- a/SPF/Macros/verifypackage.sas +++ b/SPF/Macros/verifypackage.sas @@ -13,7 +13,7 @@ hashing_file() function, SAS 9.4M6 */ )/secure /*** HELP END ***/ -des = 'Macro to verify SAS package with the hash digest, version 20230411. Run %verifyPackage() for help info.' +des = 'Macro to verify SAS package with the hash digest, version 20230520. Run %verifyPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -28,7 +28,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20230411. Run % %put ### This is short help information for the `verifyPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to verify SAS package with it hash digest, version `20230411` #; + %put # Macro to verify SAS package with it hash digest, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/SPFinit.md b/SPF/SPFinit.md index 273c628..5a662b0 100644 --- a/SPF/SPFinit.md +++ b/SPF/SPFinit.md @@ -22,7 +22,7 @@ A **SAS package** is an automatically generated, single, stand alone *zip* file The *purpose of a package* is to be a simple, and easy to access, code sharing medium, which will allow: on the one hand, to separate the code complex dependencies created by the developer from the user experience with the final product and, on the other hand, reduce developer's and user's unnecessary frustration related to a remote deployment process. -In this repository we are presenting the **SAS Packages Framework** which allows to develop and use SAS packages. The latest version of SPF is **`20230411`**. +In this repository we are presenting the **SAS Packages Framework** which allows to develop and use SAS packages. The latest version of SPF is **`20230520`**. **To get started with SAS Packages** try this [**`Getting Started with SAS Packages`**](https://github.com/yabwon/SAS_PACKAGES/blob/main/SPF/Documentation/Getting_Started_with_SAS_Packages.pdf "Getting Started with SAS Packages") presentation (see the `./SPF/Documentation` directory). @@ -40,7 +40,7 @@ After assigning the directory do not change them when using the SPF since it may ## This is short help information for the `installPackage` macro -------------------------------------------------------------------------------------------- - Macro to install SAS packages, version `20230411` + Macro to install SAS packages, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -149,7 +149,7 @@ filename packages "C:/SAS_PACKAGES"; ## This is short help information for the `helpPackage` macro ------------------------------------------------------------------------------- - Macro to get help about SAS packages, version `20230411` + Macro to get help about SAS packages, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -220,7 +220,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `loadPackage` macro ------------------------------------------------------------------------------- - Macro to *load* SAS packages, version `20230411` + Macro to *load* SAS packages, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -368,7 +368,7 @@ If created, those macros are automatically deleted when the `%unloadPackage()` m ## This is short help information for the `loadPackageS` macro ------------------------------------------------------------------------------- - Macro wrapper for the loadPackage macro, version `20230411` + Macro wrapper for the loadPackage macro, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -417,7 +417,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `unloadPackage` macro ------------------------------------------------------------------------------- - Macro to unload SAS packages, version `20230411` + Macro to unload SAS packages, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -482,7 +482,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `listPackages` macro ----------------------------------------------------------------------------------------- - Macro to list available SAS packages, version `20230411` + Macro to list available SAS packages, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -523,7 +523,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `verifyPackage` macro ------------------------------------------------------------------------------- - Macro to verify SAS package with it hash digest, version `20230411` + Macro to verify SAS package with it hash digest, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -577,7 +577,7 @@ filename packages "C:/SAS_PACKAGES"; %* set-up a directory for packages; ## This is short help information for the `previewPackage` macro ------------------------------------------------------------------------------- - Macro to get previwe of a SAS packages, version `20230411` + Macro to get previwe of a SAS packages, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -644,7 +644,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `generatePackage` macro ------------------------------------------------------------------------------- - Macro to generate SAS packages, version `20230411` + Macro to generate SAS packages, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -837,7 +837,7 @@ All files have to have `.sas` extension. Other files are ignored. ## This is short help information for the `extendPackagesFileref` macro ----------------------------------------------------------------------------------------- - Macro to list directories pointed by 'packages' fileref, version `20230411` + Macro to list directories pointed by 'packages' fileref, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -877,7 +877,7 @@ filename packages ("D:/NEW_DIR" %extendPackagesFileref()); %* add new directory; ## This is short help information for the `loadPackageAddCnt` macro ------------------------------------------------------------------------------- - Macro to load *additional content* for a SAS package, version `20230411` + Macro to load *additional content* for a SAS package, version `20230520` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating diff --git a/SPF/SPFinit.sas b/SPF/SPFinit.sas index e37322d..4302580 100644 --- a/SPF/SPFinit.sas +++ b/SPF/SPFinit.sas @@ -42,7 +42,7 @@ - to unload, or - to generate SAS packages. - Version 20230411. + Version 20230520. See examples below. A SAS package is a zip file containing a group of files @@ -88,7 +88,7 @@ default is 0 - means No, 1 means Yes */ )/secure /*** HELP END ***/ -des = 'Macro to load SAS package, version 20230411. Run %loadPackage() for help info.' +des = 'Macro to load SAS package, version 20230520. Run %loadPackage() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -104,7 +104,7 @@ minoperator %put ### This is short help information for the `loadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* SAS packages, version `20230411` #; + %put # Macro to *load* SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -350,7 +350,7 @@ minoperator */ )/secure /*** HELP END ***/ -des = 'Macro to unload SAS package, version 20230411. Run %unloadPackage() for help info.' +des = 'Macro to unload SAS package, version 20230520. Run %unloadPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -365,7 +365,7 @@ des = 'Macro to unload SAS package, version 20230411. Run %unloadPackage() for h %put ### This is short help information for the `unloadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to unload SAS packages, version `20230411` #; + %put # Macro to unload SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -510,7 +510,7 @@ des = 'Macro to unload SAS package, version 20230411. Run %unloadPackage() for h */ )/secure /*** HELP END ***/ -des = 'Macro to get help about SAS package, version 20230411. Run %helpPackage() for help info.' +des = 'Macro to get help about SAS package, version 20230520. Run %helpPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -525,7 +525,7 @@ des = 'Macro to get help about SAS package, version 20230411. Run %helpPackage() %put ### This is short help information for the `helpPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get help about SAS packages, version `20230411` #; + %put # Macro to get help about SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -655,7 +655,7 @@ TODO: - add MD5(&packageName.) value hash instead "package" word in filenames [DONE] */ -/* Macros to install SAS packages, version 20230411 */ +/* Macros to install SAS packages, version 20230520 */ /* A SAS package is a zip file containing a group of files with SAS code (macros, functions, data steps generating data, etc.) wrapped up together and %INCLUDEed by @@ -680,7 +680,7 @@ TODO: /secure minoperator /*** HELP END ***/ -des = 'Macro to install SAS package, version 20230411. Run %%installPackage() for help info.' +des = 'Macro to install SAS package, version 20230520. Run %%installPackage() for help info.' ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then %do; @@ -695,7 +695,7 @@ des = 'Macro to install SAS package, version 20230411. Run %%installPackage() fo %put ### This is short help information for the `installPackage` macro #; %put #--------------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to install SAS packages, version `20230411` #; + %put # Macro to install SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -1147,7 +1147,7 @@ des = 'Macro to install SAS package, version 20230411. Run %%installPackage() fo /* Macro to list SAS packages in packages folder. - Version 20230411 + Version 20230520 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1168,7 +1168,7 @@ des = 'Macro to install SAS package, version 20230411. Run %%installPackage() fo /*+listPackages+*/ %macro listPackages()/secure PARMBUFF -des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20230411.' +des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20230520.' ; %if %QUPCASE(&SYSPBUFF.) = %str(%(HELP%)) %then %do; @@ -1183,7 +1183,7 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE %put ### This is short help information for the `listPackages` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list available SAS packages, version `20230411` #; + %put # Macro to list available SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -1333,7 +1333,7 @@ options ls = &ls_tmp. ps = &ps_tmp. ¬es_tmp. &source_tmp.; /* Macro to generate SAS packages. - Version 20230411 + Version 20230520 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1370,7 +1370,7 @@ options ls = &ls_tmp. ps = &ps_tmp. ¬es_tmp. &source_tmp.; default value 1 means "delete tests work" */ )/ secure minoperator /*** HELP END ***/ -des = 'Macro to generate SAS packages, version 20230411. Run %generatePackage() for help info.' +des = 'Macro to generate SAS packages, version 20230520. Run %generatePackage() for help info.' ; %if (%superq(filesLocation) = ) OR (%qupcase(&filesLocation.) = HELP) %then %do; @@ -1385,7 +1385,7 @@ des = 'Macro to generate SAS packages, version 20230411. Run %generatePackage() %put ### This is short help information for the `generatePackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to generate SAS packages, version `20230411` #; + %put # Macro to generate SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -2071,7 +2071,7 @@ run; run; data &filesWithCodes.addCnt; - length root dname $ 2048 filename $ 256 dir level 8; + length root dname $ 8192 filename $ 256 dir level 8; root = "&filesLocation./&additionalContent."; retain filename dname ' ' level 0 dir 1; label @@ -2825,7 +2825,7 @@ data _null_; %end; put +(-1) '`.;''' / ' !! '' %put The macro generated: '' !! put(dtCASLudf, E8601DT19.-L) !! ";"' / - ' !! '' %put with the SAS Packages Framework version 20230411.;''' / + ' !! '' %put with the SAS Packages Framework version 20230520.;''' / ' !! '' %put ****************************************************************************;''' / ' !! '' %GOTO theEndOfTheMacro;''' / ' !! '' %end;''' ; @@ -2998,7 +2998,7 @@ data _null_; %end; put +(-1) '`.; '' !!' / ''' %put The macro generated: ''' " !! put(dtIML, E8601DT19.-L) !! " '''; '' !!' / - ''' %put with the SAS Packages Framework version 20230411.; '' !! ' / + ''' %put with the SAS Packages Framework version 20230520.; '' !! ' / ''' %put ****************************************************************************; '' !! ' / ''' %GOTO theEndOfTheMacro; '' !! ' / ''' %end; '' !! ' / @@ -3614,7 +3614,7 @@ data _null_; put "put @3 'localization (only if additional content was deployed during the installation process).';" / "put ;"; %end; - put 'put "***"; put "* SAS package generated by generatePackage, version 20230411 *"; put "***";'; + put 'put "***"; put "* SAS package generated by generatePackage, version 20230520 *"; put "***";'; put 'run; ' /; @@ -3838,20 +3838,25 @@ filename _SPFOUT_ clear; set &filesWithCodes.addCnt; if dir=0; + rc1=filename("_SPFIN_" , catx('/',root,dname,filename), "disk", "lrecl=1 recfm=n"); + length rc1txt $ 8192; rc1txt=sysmsg(); rc2=filename("_SPFOUT_", "%sysfunc(pathname(work,L))/addcnt.zip", "ZIP" ,"lrecl=1 recfm=n member='" !! catx('/',dname,filename) !! "'"); + length rc2txt $ 8192; rc2txt=sysmsg(); do _N_ = 1 to 10; rc3=fcopy("_SPFIN_","_SPFOUT_"); + length rc3txt $ 8192; rc3txt=sysmsg(); if fexist("_SPFOUT_") then leave; else sleeprc=sleep(0.25,1); end; rc4=fexist("_SPFOUT_"); + length rc4txt $ 8192; rc4txt=sysmsg(); if rc4 = 0 then @@ -3872,18 +3877,22 @@ filename _SPFOUT_ clear; %put Status of inserting "addcnt.zip" into the package file:; data _null_; rc1=filename("_SPFIN_" , "%sysfunc(pathname(work,L))/addcnt.zip", "disk", "lrecl=1 recfm=n"); + length rc1txt $ 8192; rc1txt=sysmsg(); rc2=filename("_SPFOUT_", pathname("&zipReferrence.","F"), "ZIP", "lrecl=1 recfm=n member='addcnt.zip'"); + length rc2txt $ 8192; rc2txt=sysmsg(); do _N_ = 1 to 10; rc3=fcopy("_SPFIN_","_SPFOUT_"); + length rc3txt $ 8192; rc3txt=sysmsg(); if fexist("_SPFOUT_") then leave; else sleeprc=sleep(0.25,1); end; rc4=fexist("_SPFOUT_"); + length rc4txt $ 8192; rc4txt=sysmsg(); if rc4 then @@ -4589,7 +4598,7 @@ TODO: (in Polish) */ )/secure /*** HELP END ***/ -des = 'Macro to load multiple SAS packages at one run, version 20230411. Run %loadPackages() for help info.' +des = 'Macro to load multiple SAS packages at one run, version 20230520. Run %loadPackages() for help info.' parmbuff ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then @@ -4605,7 +4614,7 @@ parmbuff %put ### This is short help information for the `loadPackageS` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro wrapper for the loadPackage macro, version `20230411` #; + %put # Macro wrapper for the loadPackage macro, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -4702,7 +4711,7 @@ parmbuff hashing_file() function, SAS 9.4M6 */ )/secure /*** HELP END ***/ -des = 'Macro to verify SAS package with the hash digest, version 20230411. Run %verifyPackage() for help info.' +des = 'Macro to verify SAS package with the hash digest, version 20230520. Run %verifyPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -4717,7 +4726,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20230411. Run % %put ### This is short help information for the `verifyPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to verify SAS package with it hash digest, version `20230411` #; + %put # Macro to verify SAS package with it hash digest, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -4896,7 +4905,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20230411. Run % */ )/secure /*** HELP END ***/ -des = 'Macro to preview content of a SAS package, version 20230411. Run %previewPackage() for help info.' +des = 'Macro to preview content of a SAS package, version 20230520. Run %previewPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -4911,7 +4920,7 @@ des = 'Macro to preview content of a SAS package, version 20230411. Run %preview %put ### This is short help information for the `previewPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get previwe of a SAS packages, version `20230411` #; + %put # Macro to get previwe of a SAS packages, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -5038,7 +5047,7 @@ des = 'Macro to preview content of a SAS package, version 20230411. Run %preview when empty the "packages" value is used */ )/secure /*** HELP END ***/ -des = 'Macro to list directories pointed by "packages" fileref, version 20230411. Run %extendPackagesFileref(HELP) for help info.' +des = 'Macro to list directories pointed by "packages" fileref, version 20230520. Run %extendPackagesFileref(HELP) for help info.' ; %if %QUPCASE(&packages.) = HELP %then @@ -5054,7 +5063,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20230411 %put ### This is short help information for the `extendPackagesFileref` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list directories pointed by 'packages' fileref, version `20230411` #; + %put # Macro to list directories pointed by 'packages' fileref, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -5155,7 +5164,7 @@ filename packages list; is provided in required version */ )/secure /*** HELP END ***/ -des = 'Macro to load additional content for a SAS package, version 20230411. Run %loadPackageAddCnt() for help info.' +des = 'Macro to load additional content for a SAS package, version 20230520. Run %loadPackageAddCnt() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -5171,7 +5180,7 @@ minoperator %put ### This is short help information for the `loadPackageAddCnt` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* additional content for a SAS package, version `20230411` #; + %put # Macro to *load* additional content for a SAS package, version `20230520` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -5356,14 +5365,17 @@ minoperator call symputx("AdditionalContent", 0, "L"); rc1=filename("in", pathname("&_PackageFileref_."), "ZIP", "lrecl=1 recfm=n member='addcnt.zip'"); + length rc1txt $ 8192; rc1txt=sysmsg(); if fexist("in") then do; rc2=filename("out", pathname("WORK")!!"/%lowcase(&packageName.)addcnt.zip", "disk", "lrecl=1 recfm=n"); + length rc2txt $ 8192; rc2txt=sysmsg(); rc3=fcopy("in","out"); + length rc3txt $ 8192; rc3txt=sysmsg(); if rc3 then put _N_ @12 (rc:) (=); @@ -5400,6 +5412,7 @@ minoperator end; if did then do i=1 to dnum(did); + length file $ 8192; file = dread(did, i); output; keep file; @@ -5411,6 +5424,7 @@ minoperator set WORK.__&_TargetFileref_._zip___ end = EOF; wc = countw(file,"/\"); + length libText pathname_f $ 8192; libText = pathname("outData", "L"); if scan(file, wc , "/\") = "" then @@ -5426,12 +5440,17 @@ minoperator rc = libname("test", libText); rc = libname("test"); end; - rc1 = filename("in", pathname("f"), "zip", "member='" !! strip(file) !! "' lrecl=1 recfm=n"); + + pathname_f = pathname("f"); + rc1 = filename("in", strip(pathname_f), "zip", "member='" !! strip(file) !! "' lrecl=1 recfm=n"); + length rc1txt $ 8192; rc1msg = sysmsg(); rc2 = filename("out", catx("/", libText, scan(file, j , "/\")), "disk", "lrecl=1 recfm=n"); + length rc2txt $ 8192; rc2msg = sysmsg(); rc3 = fcopy("in", "out"); + length rc3txt $ 8192; rc3msg = sysmsg(); loadingProblem + (rc3 & 1); diff --git a/packages/README.md b/packages/README.md index c39d80f..6b059b1 100644 --- a/packages/README.md +++ b/packages/README.md @@ -86,7 +86,7 @@ SHA256 digest for macroArray: F*85E3BE4D163AC5223B6EC9D3C25C46564A656E3830998B45 --- -- **BasePlus**\[1.24.0\] adds a bunch of functionalities I am missing in BASE SAS, such as: +- **BasePlus**\[1.24.1\] adds a bunch of functionalities I am missing in BASE SAS, such as: ```sas call arrMissToRight(myArray); call arrFillMiss(17, myArray); @@ -110,7 +110,7 @@ format x bool.; %put %repeatTxt(#,15,s=$) HELLO SAS! %repeatTxt(#,15,s=$); ``` -SHA256 digest for BasePlus: F*B297440903337E1AE6F12A6001B80B8AB743079847D16D63DF1C649AE51AA411 +SHA256 digest for BasePlus: F*0CCAA009D64CC20ED315FA123C233E0383967E635EB8708E7A48EEE3767C6BC5 [Documentation for BasePlus](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/baseplus.md "Documentation for BasePlus") diff --git a/packages/SHA256_for_packages.txt b/packages/SHA256_for_packages.txt index fdd0e63..35fd0c1 100644 --- a/packages/SHA256_for_packages.txt +++ b/packages/SHA256_for_packages.txt @@ -1,3 +1,6 @@ +/* 20230520 */ +BasePlus: F*0CCAA009D64CC20ED315FA123C233E0383967E635EB8708E7A48EEE3767C6BC5 + /* 20230503 */ BasePlus: F*B297440903337E1AE6F12A6001B80B8AB743079847D16D63DF1C649AE51AA411 diff --git a/packages/baseplus.md b/packages/baseplus.md index 4b47153..e58b603 100644 --- a/packages/baseplus.md +++ b/packages/baseplus.md @@ -67,7 +67,7 @@ --- -# The BasePlus package [ver. 1.24.0] ############################################### +# The BasePlus package [ver. 1.24.1] ############################################### The **BasePlus** package implements useful functions and functionalities I miss in the BASE SAS. @@ -336,10 +336,10 @@ Package contains additional content, run: %loadPackageAddCnt(BasePlus) to load or look for the baseplus_AdditionalContent directory in the Packages fileref localization (only if additional content was deployed during the installation process). -* SAS package generated by generatePackage, version 20230411 * +* SAS package generated by generatePackage, version 20230520 * The SHA256 hash digest for package BasePlus: -`F*B297440903337E1AE6F12A6001B80B8AB743079847D16D63DF1C649AE51AA411` +`F*0CCAA009D64CC20ED315FA123C233E0383967E635EB8708E7A48EEE3767C6BC5` --- # Content description ############################################################################################ @@ -3118,7 +3118,9 @@ The basic syntax is the following, the `<...>` means optional parameters: <,y2axisValueAttrs=> <,xaxisValueAttrs=> <,xaxisTickstyle=> - + <,sganno=> + <,odsGraphicsOptions=> + <,sgPlotOptions=> <,VSCALE=> <,KERNEL_K=> @@ -3224,6 +3226,19 @@ The basic syntax is the following, the `<...>` means optional parameters: Allowed values are `OUTSIDE`, `INSIDE`, `ACROSS`, and `INBETWEEN`. *For SAS previous to* **9.4M5** *set to missing!* +* `sganno` - *Optional*, default value is empty. + keeps name of a data set for the `sganno=` option + of the SGPLOT procedure. + +* `sgPlotOptions` - *Optional*, default value is `noautolegend noborder`. + List of additional options values for SGPLOT procedure. + +* `odsGraphicsOptions` - *Optional*, default value is empty. + List of additional options values for `ODS Graphics` statement. + By default only the: `width=`, `height=`, and `antialiasmax=` + are modified. + + ***Stat related options***: * `VSCALE` - *Optional*, default value `Proportion`. @@ -3354,6 +3369,56 @@ The output: ![Example 2b](./baseplus_RainCloudPlot_Ex2b.png) + +**EXAMPLE 3.** Rain Cloud plot with formated groups: + and annotations. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas + + data annotation; + function="text"; + label="This graph is full(*ESC*){sup '2'} of annotations!"; + drawspace="graphpercent"; + rotate=30; + anchor="center"; + textsize=32; + x1=50; + y1=50; + textcolor="red"; + justify="center"; + textweight="bold"; + width=100; + widthunit="percent"; + run; + + proc format; + value system + 1="Windows" + 2="MacOS" + 3="Linux" + ; + run; + + data test; + do system = 1 to 3; + do i = 1 to 30; + x = rannor(123)/system; + output; + end; + end; + format system system.; + run; + + + %RainCloudPlot(test, system, x + , formated=1 + , sganno=annotation + , sgPlotOptions=noborder + , WidthPX=2000 + , HeightPX=420 + ) + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --- ## >>> `%zipLibrary()` macro: <<< ####################### diff --git a/packages/baseplus.zip b/packages/baseplus.zip index 91ba702..0629f42 100644 Binary files a/packages/baseplus.zip and b/packages/baseplus.zip differ