From b2827b8d4ccb493c343a40bf7733b98365244e58 Mon Sep 17 00:00:00 2001 From: Bart Jablonski Date: Tue, 12 May 2026 16:46:35 +0200 Subject: [PATCH 1/2] The BasePlus package, version: 3.1.5 The BasePlus package, version: 3.1.5 Error fix in `%splitdsintoblocks()` macro (missing semicolon were producing "Variable is uninitialized." note). - File SHA256: `F*2308959251D1BF9259B693EB8C60D30D24D5D7E06AED05A03639A7C7E458658F` for this version - Content SHA256: `C*9CA3E5365260C4D439592CCD16311BE30C82DE03AFC80BC2EA6B9677B3F7A8CE` for this version --- packages/README.md | 4 ++-- packages/SHA256_for_packages.txt | 3 +++ packages/baseplus.md | 14 +++++++------- packages/baseplus.zip | Bin 3492303 -> 3492304 bytes 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/README.md b/packages/README.md index 87f8db8..c9c80bc 100644 --- a/packages/README.md +++ b/packages/README.md @@ -86,7 +86,7 @@ SHA256 digest for macroArray: F*35A657517CD2B1AB86C4E7C5320B5EDDDFBA9348075AE31D --- -- **BasePlus**\[3.1.4\] adds a bunch of functionalities I am missing in BASE SAS, such as: +- **BasePlus**\[3.1.5\] adds a bunch of functionalities I am missing in BASE SAS, such as: ```sas call arrMissToRight(myArray); call arrFillMiss(17, myArray); @@ -120,7 +120,7 @@ format x bool.; %workLib(ABC) ``` -SHA256 digest for BasePlus: F*BD248E5F8CBD94B5F45467B723A73D97D646CD665BA98679F87C7A03A484E83E +SHA256 digest for BasePlus: F*2308959251D1BF9259B693EB8C60D30D24D5D7E06AED05A03639A7C7E458658F [Documentation for BasePlus](https://github.com/SASPAC/baseplus/blob/main/baseplus.md "Documentation for BasePlus") diff --git a/packages/SHA256_for_packages.txt b/packages/SHA256_for_packages.txt index ec8e490..0eda658 100644 --- a/packages/SHA256_for_packages.txt +++ b/packages/SHA256_for_packages.txt @@ -1,3 +1,6 @@ +/* 20260512 */ +BasePlus: F*2308959251D1BF9259B693EB8C60D30D24D5D7E06AED05A03639A7C7E458658F + /* 20260511 */ SQLinDS: F*A3DC9400DEF1403DC9E191611790244A8B0FB23303D3A98D29777E46A1D4E8B4 diff --git a/packages/baseplus.md b/packages/baseplus.md index 0d25b11..d2c34ff 100644 --- a/packages/baseplus.md +++ b/packages/baseplus.md @@ -9,17 +9,17 @@ ### Version information: - Package: BasePlus -- Version: 3.1.4 -- Generated: 2026-02-17T12:22:24 +- Version: 3.1.5 +- Generated: 2026-05-12T16:34:34 - Author(s): Bartosz Jablonski (yabwon@gmail.com), contributors are Quentin McMullen (qmcmullen@gmail.com) and Ryo Nakaya (nakaya.ryou@gmail.com) - Maintainer(s): Bartosz Jablonski (yabwon@gmail.com) - License: MIT -- File SHA256: `F*BD248E5F8CBD94B5F45467B723A73D97D646CD665BA98679F87C7A03A484E83E` for this version -- Content SHA256: `C*373E1A4CDC1A2462C90D6EC88E2BAA2F9902DFE5C6A4CC70356EE7281337C70A` for this version +- File SHA256: `F*2308959251D1BF9259B693EB8C60D30D24D5D7E06AED05A03639A7C7E458658F` for this version +- Content SHA256: `C*9CA3E5365260C4D439592CCD16311BE30C82DE03AFC80BC2EA6B9677B3F7A8CE` for this version --- -# The `BasePlus` package, version: `3.1.4`; +# The `BasePlus` package, version: `3.1.5`; --- @@ -407,9 +407,9 @@ localization (only if additional content was deployed during the installation pr --------------------------------------------------------------------- -*SAS package generated by SAS Package Framework, version `20260216`,* +*SAS package generated by SAS Package Framework, version `20260411`,* *under `WIN`(`X64_10PRO`) operating system,* -*using SAS release: `9.04.01M9P06042025`.* +*using SAS release: `9.04.01M9P06052025`.* --------------------------------------------------------------------- diff --git a/packages/baseplus.zip b/packages/baseplus.zip index 9eeae8a968145b9edfa40187419c2ea0b3d264d7..341739eec58ec94e6b5e225af94e7eaef263b8e9 100644 GIT binary patch delta 19709 zcmZ6xWmH^E6RyqR?(XjH?hxGF-GcbG{$ftb12i z)$Ua@Yr1;xo=IE+%zlEZBnt+P4gvxK4WblWrFUbvh!c-00wp#-Mfr^hJYI*1G|X|T z%bW90CZ6^lvO?OQ6_El?F8dI~x;?ka-J&hN5QEP6N*Z8r$sX@ZCf>PtthwBs3BwZE zYZL+~PK7sMISZkLm7h>P4H{ojp@P$cb+I0sTxVEH=u-2+hGH zBP60vl*s-Nm2piVldVql_GHjG9lei}i!lwFGsJ7e@|HQ9XU9y~U zV2N-_E=TA?cv2&j@cm4Ba;J1`yrvvW4QdxgmX|SM{#AjMUT$Em9F+=K8M^K2Up565 zToUvzYj#09RRi64O^bYXmTkfuF>X4Tlu(lAIQUChGMSPTcN2C_D!+q}Vm898SP@B? z(BcfTiiA2o!T%Pcp-Ur|833_fhVsDlvE=D#zqZ6-Qq$FmoM8|03l}{lN-r*c@%}Kr zB)j9t6=$`$?m|idW8|JKBSeX9Fh{$BAneffB$G7#-VLlR;qLpE9fCRC*L`X3i%fxg z9U05OJ>B7PY{`J{{qqT-f|#UrQM7sK~3KU*ZkUn7^Esi!# z&6wXV&HgklyV!(1eWBe8o5@@yD3nGSk~sAKZC+;0QbiFq?NTu}u}yVml>8qPr0nn9 zD*J8%O*z&ig<$Zi`6J9p*TE;v%t>_mMpPA>D3j&8MtkwN@}t8XewD}LDCCPEcKk|v z`3YyvZW?Q0>)*sV!$t~C9{oEw6#TUM3P}ie?UUgu02MGcNCx|;5U2LLICGcV!5Rln z+vTfDYyGWmiG<*oKr=v7DwwYhLX#SLWh_;TAw;FRe%LVmy?N~2K{gB@>z2})(oZTV z>EOXY9DE|IpVRelY)#*4{$Weua64`?8_u4Xc3Q6!VzJj*_81M4n2zjR&EC>2{OCIg zS_tjvgmZ;Acr?PA4C|B~I6HU{bb9$#!!fjio^Bi+2_RVG20{#An^sQVBr^nmH*xyz zJ$TPVuYvjS(-WD;pfBlp(jka|B?eJ&&;oAuty>FF;E~j#bF~#|y!jUaj%EFO{9h`5 zOoLt>U8I#>s+x~1qftm16Qg13s^PfAmf(`>U%?r}=JSqL>MOn=Dr}OFw_>Kim9Cs& zayVU)6cy8G3*Z4KXGS8oV|5Yj_+> z3BFa0sK{YngLpGMdrFi)?{R;6wHZo&bOP}`54c-6CBYq5>lGACSr{mHDKs3tj_N&I zjQv&jT)Z3bkphJ^!G9Q9lN;zZ|F%6`oVd!W3zk3&jZb}&TUcMi>>e9VqZmLcpE zK-Idxa5Y3i#GPlQWe}DlX3Hk)fvQm+4NsOV`)|(%%Yr-=Pb>b*2hUb_YXCA6ez@aI z8ADJoD82_wt_Skuf?9;g0af{#K2Jp)q^}Wn=(OPa{%?Mqu$J*yTu5HS1H3>Jl*qzl)8=D;;fBV_$t{al@ZK(D@?nd}5b8y!3FR_#jV z>4Z@9Hfz}B(a4ga6Q4`cSkDXIu--!DzaL(%w-1k<11da$gX(;D+p{)Rr1~!v8*CPH z5$!Ud-IN-}oCvKRlCvPL}{1(I5{aO>!2#R9L!+yg#~Q3=N!w;vXe~tVY|HsZLE61!6L-n-e`*#LHN{! zLTOo2$rIoba3>FOXE%fNef`|`5quw?8=kfU-^k}ui$EH8*xYRi`O;*`%p%y zo%s(+J{Eb;oLowcdpBlbgFH|fV~wG*LyUqqvRm)ljLQL2&6pJ{e3Uw0D~uX&yB1x> zRk0=}l4khSC;T}z9YCQ{C&0tjwQJRFq~A*29*jF&qMBwt9#5Uh&RddKx=BV}cqbAc zF$SADmI33p5sJ{5(*94!E!S+zJBDg2yQ;H&!zbrC-3fK-o%E7Tlo~jgLh~zHICM7j z&E^4L7+@NDt6|i$ecYN!<(&<&j-ED~L2S>VLios^3w1}VGNz0`P*nY$!I!hOLU+TA(_P0VQobu3dG4lK%X}iIGRhC0o7-VXUsCxqUAqi-Wf5Dg});2lz!Sz6|@I68D`f^cOQurHXL3kC~NkutY zhC|4!FN51S5-*Dm{BI1F3jt)XJuR)jF7$dk%TlemL@tH=A~uC*=!G;>Wkz zItf*N<+EB@a*qRRdKKtUm6T+10qn^Y5mT7IP*P-z)*S2Hod-C1W)O%9<~YI2WE(vO zX>N3AGy_L#8ufsAOg8}|3tCpRMSosJ54<_lN5|f|U=0n#G>B$W#j5W}eySi&HG;`; zgw|w*2AK7XMjl#s$DAe{|MSFG0jFc39~{hqm?$tCqiC~JE`fBXs}^#{4Bl8$OB^Ml z^;)&7axFr1cPm*aN4r|1!lWgfCoAS#5HBZai013;*ehL5;D?lhzQ8>r2- zTfBfaJcEZX+nI~cXPQ59ThN2O3Xf2ha?d^(C-0rM8-P(#vgAEptNhNwjwQO>a-(I{ zoyF6l`@Ol+O;OdFym~=%9b?kHBY{vZ-ec6-ibthwIjffLgGZ`8V#Mzth^_1{AnPWL zu#R>mqSy^M2eAyY94rD1{cwH->U~#a;89{|^@vRv`tF07k5$56I@0)q!i!tAuH}}> zUuUu!k2GwlTHRfU+wabks-|4(C*fY&0+}Ge;2K)&2}WMG_?vpTtnn3Fx~e&K4EoKP zdS5U&+r+O> z|4*aeD2C7j3jM#1|D=TZIuQn$6KD&{f*$f1@*XCuL3X@TC{vzEyK3T8v}}E%aA8&e znTVGOW&V7IM--mPiU89d<@1=81uk<3O$RGe9qQ-})~8J4nEV^+BfU=GhQNLhzu8Eh z8-Y`j%0S%_KBLc~isd!&1$kLoj4J7VUSYj9?8nKHM9hIMU~ldR=)@fA!{>hna-^^i zoCU&}))TeAj28{Q9Du{>B&!HPs>A=jpm3*kI7fXCp_=Og%AigubW=f8#rXRBu~VUP zMH1eY6)4w!HGLo#XGa4lrbt|D1I~;|ULf(mc|D>DI^;MRk4pGSr!Wjr(Gh{>WEjnn zQvplru@MTyo{xj}o}=J48c|cP5%N{dmd+rJ z&h1l|+v%NrcdR2A4vd?*5gw`C&4tPjNYyKKJ9^?jo;b4=TTwJ@b^KrE39N)EK_p z>hzhqYk0IT;3Cri+U}kRf=cw2=jx5cro4 zpBCW__vL+{ynLHoEm_MYZg+k@+=z?xN^&<*Dpf!SD}G$u;;Br_zEW%0C9VX`(x6u| zmw7%~m#q(SbxE|RCP3gX_UfEGe%JlAo&B>CX9=IMdx<&82*MmV8Js8rUae>JF`7Tg z_FKDH4~P7>)K-z@Ax*s%|L~`07wUbfa6im&sH)~>n$3U4Dk+m*FI8W3KVYe z-K2=4bVADCDVWwOIhoPNfn{q~AO9@boAR_3!Z&GPi9i;YUA84ux0|i~L2Gmd(5iOw$&fPDN!Bi}Wkx;dNQAc6ha*pd3b z9%py?j+y0l^p6MKdvHQ`#`gnSif7p|r{o$qRhG&qkZI}$WO+G5Rp z0+Dy#H_6&%QmG|vni7a<;HhMW89e*TmeMBCq=BVH= zH|WWVR;)0JPV3N?pyo-fP!$+;v;RjQofx}H)1JeyM5TU626YHKi*pjsv%stiB@dF` z4J?6!V*Hn!#(YqKV<0)=m@4^M9EdbMnIrkQ$fSBgAc!NY64kzRUltHqyq6&z*x3N$ zRu0-?24km;D;%0g2g;!(4*~mY0=b=3IcyNaSX66WyaUrn)gRx#K^WyvqMfoyF8DEP zrTGarT9aFrK!ZotQiE3(jG^H4{*1FFDP>2a1lv~nYx#xTUp@DSrMs(Y3wd*!emf1c zko>C(azW`NinBxzeIHhA9a%Pnxs0)nI6>JPhO2Nh8k9)lIJw(gS1Ol8mD<1T)2*14LuqfI5y=zbP??6b&v+Q1`n8TJ2F*%_*YA*0q% zc9FVXTRIOsM3w4ZI)|MnSNy~z9nJ8T$V?V3v${qBUX2miS)oA^=Lme1y!STzm^X^| z=c_$g%fez^0!Blee%sG#V;njU3|(1Fw4?#TF{9@FTJ=WF>m{us+gau`e*ey1n(Cz2 zsG!8g!Y!vtV2sOY$b5(MTPC9I*5dtl2D|d_i@42;lYAwWy|kwtwi&My-}io_LwL)Q zGm$-oMM2jLoMN?ycwr)0RLVEFIu;jE1?+pBgW2zS?-Cz z!W$&zmHC#*$O}rG*ESry>!@GWo}u}eAG+AdoKp=NVEop4%dpPWVf0BH#pBQlX#>x* zI5cWzO5|eJ3~6qA_Tu*Lw`zBHfi*QhQ7Yds7!yAESMzg}V}DuGC@J*H!y_Gqn{N!>Zqm-1BWFVo=rrTxN2)`qttEm(5qoqqwvHWPD^I0f&^8;eGg^xE^B#@Uu403f!*NGW|n=UWzf&3)4q@`qXMlU6FJ-^p>*?U zK&XoNagdFY3!NG=Z)#}-%_3H$JJhnIt$Njgf-*f-sNAV3=4YCYYJ#m3rp`(Neb4no zlgr`$>1WKuCh6Cv1Z`j5`)>PJ7f{M%?WA5J0->|Hdd;Y3(Lux32StOdF$xw=otQy* zsVQbQ(ow*_szRI;9oPJhMiwD@D%x-$73|zX<2nz*yhI)4_8f4 z2-xR-xIZDQRaI`2mNzGUb`UdutYdiYb%*IF;#FD%oQ35L?guon+U)BDQUo$yWbaiA zky&|RDNjLIO$3ES>frL-jTh!O9$GdnM#&&q(}=Q0R$tNx#;0sjaAa4`x*k4&178wd zi!UW^XXZKi$qHK7ROdp{fI^ps0?eepMY$*&LhGoTgoTxoh?mTWe#&5EArS{dT4-}qvIVn%- zoOw58PoHS?zEy^>BE?c3R%Bzt06|`*;|C*}FJF(lO{v6(6~eju(DFnVQWyX%+S-ty zDzp%;QZ@LKBq#}O?ua~l*@Pe+HO*%2tez7~;Nzy(yck_c)L56rAWK)>r96_a_)-tn z@m<$4>(`E1J`@+@s&$+CC`bFCnK_u_n|%{<8hm(Mkh_XQ=7?ixRA+I>KxyHVooV=5 z2aXSo(_Iva1q_Pupkyg^N3{~Ou0qnHM)O1AIt_W^%$Xm9U=ggV1vjheuOk6^P`dlI zccTJQ9Y&ph;^!fn5(bK+dd5|&7ByK$fMNSgLSq6SnHg1HAlwi%d;tC*QYD<_Vx-d` zxu~h;IUouM8hjs_qF1Fr;J2F5L{e9YQRBZqMlft@|FHZuH!+KYnlmAxoK z)va<{cMATM>x%D9rWh5?MY_mLm4L-iKV)Mgj@^Y@&xN`q)s2!DIwd!j7?fUB1O>JW zE{&g1Dz*H-swsF7=w+U*f751^F=@)6hk<93J53R{{$U@%L$7%Q+-g`gSql0gdl|*z zun&`PE$NS&kPD&ahp6-nFMRU`40wDOTbVT@jFCK7NAoAXf>jbCm+5;&&JU>N37~ka zH#2F>z=RK3A-k3?pw!L8vqK9brG`bMiT#INXGlt4T9+ z0U6Ef2(cd++C4vK&Q-PE?<#2-Kh4l;stpL+S?WQNCQj&@)4 zU}R><2g&`?;le(p{Nf%7NW?sjYD|EHA?V*iUw#gP@Wr70d!8E&C_UoEsSwSK zh0|IZA8No`4!i~3;_HozjAGKM5oHZ0hKX*r?8@wh4&CDfB_9}=VP;oo5v#GJ<-!T` zQ8hJwFp1|2B5>+9x1$sh)=*=}oMHi^LVZa2L^{z^g1Mh|WJvn3K9$>+wm$)Bf ztC`)U@b%(C_5ImJ%6NEPDW}G9{+Jj}8A0i%1pZ9a`8!rt4+fEkuBV4H{PNZq`8+66z{kwmQD9c?xNc-bT#@bTebHp(o#<~vbyW@hBf%}nyN2%Rl z%wKUnJtK65;b?xj*F#6W*VU2;^_496{?K$_!5vl;r3E$LuT?2#KBucB^AplZHk?1k zAmI)G0(wY&SJyPFXXSE^nLz4(emruxg(khxZ`4iQaIAZLm#u{5DdiF>l$By&!5g6x zOd=kGEk*{yB^8J+k7oU0obTQq>mt<%ybInFE$XhEJsAe2LkZA}W*hbRD^A8uCroKT zGxGC2h7-)?*U|PObg?Zd{*$YV(%?kL3x+iFrnY&fML|g_nb$(YP3YnFbSA};lGw?X z$m;yLhQN*~6Vy!+`OK0YzaI8_MfVc`lm1S~wn|)$vw`oxsDj%(%~U&EW>D4%Vb4=Z zXu{e*s77Q~5TTBlSi6nFwean%m7k$N$z(G=*CCDLn)83mMV6Vrbj>+2H~^*SskbPX znbpa0R(q9dlE)W1U}7zOX5|G4Px`-o(TC>9_UjSO%>SAzR+h;bJ;=pCh+t#~)Q1mJ zRC{KPM7!3-U`l9SScteak9nD`Sxz|UnT`35msn|uSWmK zY{yO$cbp9J$67=&9NR~&Wl$>6@aW^6-QN#nu>+LvK?^Y;aCFOMd`150D znr*19gixTf9DlJ5J#z9%=sXAM1U);LZ+;eBt(!6mnzGg+okTkqpL9wx{cWO()Y4YV z=4|3=2dd`yxSVwu0IY!w>^q63cCh#pa_12!3zEpe%47?s+E##Wt3Q3x< zf71eYbYvGKy2v?yQ;Ce1ju=xjU1FD1QDIjcV(xa{G-Y+}>dP1OFl&Hyoo}bC77-jb zQ@h(NUXL^+|MQ10uG?5MaEMza+%Dd)ovonaO?YbsO*D~a4x zqew9pMXjS9|MNjSFJY zYhf6dm4P5g5-0b?ysQL?asMkG-nA{Fi`*`lWFR-GFZ&$BNAGbH}n-tS(wJj+j4VbVdEkTQGnh1r5&u?u*bxS^IhaqtLt zBR|g5Ik4fb1kSa=Ts*pjUK!GDl*Iu*aO3o?aQnlFz+ zKVfnp#v&=W%@XN>KA~mpYymS`aGYnI&EfSHlQ4Gfb;fnX=EVfrAdzMf+L^p+=@t5= zFF$IatP8)fezWe^GW#x#MJ&64TB$4}r&}R7Pw;**4Rk*W0WR-HKgDzKLa!1Xyd#7spsoilsD3WXRoBB*}N;XsA6akM9bdUK*$L zsWqg^-u*Bn=b;$pqM1>>ocgmsq8Nr;1M&svpK&s>D^60OU8`AAn~mR!+!QRKX)44U zMDcpxZ#HVHy?$CMUa#S9$W%hN6zu!xVr0TU@`5P{#kz89GQ(5tjosZi!|{JeMMG*5 zAbBs^AHlmqv!FLriL-OO^4&lhHxK>jE_1J|?$NZZd^o150Fi(-*ly`T1NndJ)A_TP zBQcw%7O>GMPumRr-;=J0`(hrdL^w8j;CF`&PULs{zK;OpjCDkn2?fIz%F((S`7onO zU3x%^Ln!@RJ+4fW1Z{oL+tb#yghPwnT6X5TJCz`kp-Yhm|CE@dDO17z#z-sCwqdMf zaEPdZ8{ar%A0lH8IeFV!lv02GA^jE*Ad6+k0FuOx zo$Y!&J-}o8;=;-FY;G>4DJUwAMU0|mFup+gV#!ECc^o9D>0a~2Sf5Jc>c!p8{p-{$ zY^@zWa^G{us@?80?7j<=WAs?Z3X1YVcplF~eEJhoAN=7$SJu`6s6xPeIC;1jFm$g# z+M0$bOkie7Ru;W-hFG*^nK9`F0u?C~$)nYBBLG+Hu>cBh;W197NeYg(YGPM`5uCUk z?Nil|b=dh8hKh|j3&2+3jiKNxm^_E*q&mb^B};1YVMzT8H9rfn z{ZE0B_+dCRT+3+rsGgR$zHE}+Ea>!5X~QbAW94marIc5Z6-9o8tY0AO!1F#K$9)gF ztT_Kf`VeAxai=Khuw+W@aBuR1F`*JJP^kKCx(3l zyg<00p4ueb;{e#eLd$xR*~A^INPA26XKP$fzj6IIJ%*_Saye>7Z%G$#DxG5_uMH9a zLIb!vMNc3GtuUOq5Px}pA}jwI5|(-!^}vwdQw6MH@@}PtM;a^>Vp5}3U;=h!CU3d_dT(=8TQgCut-8YgyVz2xF4gztMy&4nkCbG#LcsbxoUl zT=rXu$D$tLx*b49JQ(#sIE{-gUw9&bn9C%ULsLt`$9SzDC*@$y5Obh+lk0uLGR-iS zFw?eZ3EAdA((ZJ(CB{;uzpW<#1I|(H&Vn#QNpU=Rw+{CYuzE8bgPEBXd56(wxa}kF zo6!KQ9$pJ)Rz&JJf{b|;E3GQqE-x%~r=`y!i@XLav9k1c@-dS(5`$AFbg>!$f2zBw zHn(iIi+*3sFIMd4_#!=D<$paDbnogvYP)}{+d36@<5jjb5+`Qb~tdi7&dplKu*-ekLhBeXN%< z)+#-A5p?a^D-tduSjEh7{+w=H_I0_1t*LZi(15H6l|X+M1UQO_Zv zmmdxn>A@6oIku$7B@$(?_|YO33c<=gT1Rl>9q?)&x4l8K2a1EY|L)hH2x6)(QoM$# zvviJeV}L1AIC~U5;x!2SdHKUTrEMHFRZA{*n5;1zFygVVyRpY-3%XCXIa$xN%NiY?T*CmgEcQHqNt)y(GMU@b8EwCiz3P1}*9X6=aJFn+bq zLx){)JX({T<++tU9^TGRj%D8}-}Eg2fC&k8-0z&Jirrewoof5If2z9BUXmbrP|bqC z%2ASsc70+jkp<=SPy|)c{Fkd}VXN10d2&6TLAdl;aB!|9*CWQeM`$5aUuGzLTpD(v z(Bxt)b9b}MVBG3^&)U3%`_t}NKK5TdZ?C<6c%Q@Hp|Ix&osr8pMOSK383H>gfSR1& z{D(RSTxFuerUZUG!=*bW9K)Z-Z5G@9Flln&-LPo1M`J3mEL9?)5}`&ttd4*R&{t$x z8}B4g7a;t$!H#Y5OK^)Y0m_z;;wjMex0ziU)qc}xh;Ii4ORlj2O6O(|?~qLbG0M=^ zxX?ZXPV987(0EH#%0*-!r{P_8IncR8@o^@LB>ZZJ$59Kt5@|r;IPw`sPWI^A)*OzW zeZ#{k%_!l&N5e!ZmTcU-V$CUuhZZLuE!j03MAwjN2A8{Lvc?>5tysCx3$wTQzcOfa zEelRpGfTZtOS6MsdW>#dXGjOuaLYbU^_4MyLLd|X{Jg2bLGWpig5!l#!MT+uP6d{%+v?d(j1JB^l_FC2ty->z?P8qhOK0@hsU$J)KvqBeD+JeM2UE z4Xb1a8lo%-F%4}pJVO&f7d53Wb?=Fxck1nz;C#!Bl4smT|{@%dxAgT z(gMv$xS3(S7Bh#q4>}{Se*M_hLJ`zs%%bi8HW8AGv74{Gs;EMBH+x!fVOq#NZN>fb z_*T^TH!gsg@6`oW{brCFMu2umg|6T&N15|#UMZO^6Y-#=B5%zFfUc6tz7Zn}Io(Zb z*RoMKgz4LO03?*JUgE;LxQ5_8P^3yL>$hm6K&-)?n~VyQvNdX4L&a64n#kcWZah#a zGd?Uf>N^$;-z2j62W5elB3z$nuw}d0W&Ky4TN0&>uO48v2Cr${K%IwH zeLAuvtfS$eS%~_v5tOnbEs>P5W;_EM^z-CBPrCx}Ob0l1@wIC0Ju{m@lkeVom0Q;= zJ|DK62X3odcW$LOY1nrT8JqOWyUD1d;jd3+&zE0HilEyxH)ryGvnrm4{4w`*jl>;) z+Wn`@5`#H5XUx3I8_TlOQ4+e2yL|JP3azFnPhyaRn z9#tXM!+a6pF)5?+J+ngd|#W zzJF%BBuydf6U)ze*_r0ii0(=i{T@Jc>vGp2O|1;7s8p-556@S)oQ^&|4BkgDIyzgunNu)O{MC~qDb;LdwW)Wj4W18|Sh)XI?S{*{x|PhPhBNy~ z&PjZ)nj!91?F3ir8Sf%Z8<#LUPU_d}wD);V8UL=@RnR;2v(G|}*RN?%zb1K{u8rAM zX&);ddJy-Kd7bu_J#S|qJfc$w^^sPTtpOdWE3_0u5v5dxXwgP)eX?YY%#3gm8hsNc z`&C5^cC|2Xj&dGJCUtHw8|9&+9efmCtF%>+@V>1Iyc=oeu7OcJf`kK@1!o%n^*NI` ziWf85sT~d?rB{v8QgC;n@zR`y+=ih&F(FnES5w0udW_X;x!vp+4F=H{^4y1W$pRf~ zz8xqnO~QcIfTR*-l$PRho{ZS z5OwPaXxQ_$6&`r~rJ<}wlLd6UR(y+v|u3&p}Ydr%fB0!yww(*pE~;*iB7}-8rCd~)y!oac`?U$shbg z5doUDMFM9AamZp$NA|+x>kpjr%WP8kB?`vf+qCr0s2Wj;diC!-&^-((5CJ;Z;L>BV zgS0|vbuMnnA%V%7<=F-TM#2E`f}WFioyZ!8ZZ9322= z3P3ggg;|++sr1Tys@+7cv5yy<5Ne94m1v zRAcjz^>arGN30B9w;q=7*Od(HvCR=XiaM{KzfQQBi2smg*xW&94A zlrkGLX}1uH_aHhtiacP!=lsa2B+^3pA+Pwm@ac{tKp9bsAW@oWX)F!RdT4Enfyo^! z!#S*c9TF(N9)ND&f9nm8cLPv-T%WR`aXmx+z~Qn3Nom@Njt@j zCD>~Mz3&-`0n#lq9YGw;Lg~dieF-V@T%+W!PJgf zE;^i!iBn!Uy2Q~QSuq~+r%O&7M{%tA+DgFnqCiknRjbfHdQzFAp(sHTv$lMWqs+xM zyD}<0@tcpws8(w_6kR1W28MAysa|;?nw-yIy;18}Zzaha=m}hrA;Q0IVLz?3B;7VH1+*XeNdds;v^1b`?(C@)XO0;#>Nr!DJu~y^=#$`kk5;xj=b`&HkEN zbDD}u#GKb@T#K$+M0tjeTtyAy&S zmBhcWrCmVDtC+g-?nyYkLT)MB^1o8m#SC*}?c+Ua3`sTH(;pd*n*hE-9I8L*~BgD60r_hpUm&+bqmpT`z;dTp7I9Zv+Bn!!7u{dGMh2gF=ze*#y92 zKq)aKXNxwoS1SBUW|b#}_dwB!9QTfmhSvKHoZcBY31x^=Xuc4yY*6)+(ivSoz*o;S zl;7)Sr_$2UzijA|G<@$8!MX>X3>Us|-Xiz@pezjE3M4beh?i!E>qcysKitPCfn`+f z8Da+hC~*PS##GfGl{)QAMu1uVqWo+)nmY$%Lb+BGzKP+U|FL*;htlApdkve`&w7T* zV#mWG-xxxGDfIU72GcdAyF`HgX)fc$c8ByY=*~On-eElTh=R@Y+m2m)3+~>qU@7_o z9szW}O>1(fxo5kPf@p3zUl2~gwfC?@p>GQ?O;hzqHgkW4>DOI2q?M_R^V$o^%>w&@ zKa+hK)A!e&^}4R{Y#^WhcFs!5?}+lW6>K^GMlgH1xMDOk9nra&&*O2)$;pN~wJ;~W z6dztxp?a$-tPY8{b0Hcz$wbo0nSz%J(v4BIt@_c7WA~*Ky;lgW_6t|zGm;EeK8nyl z>zC)QxACrF>%%^6^Erc#Y}&)N0)wC&69x`vW2S0xS)t^r`;~*zvp+F|65jWk%TorG z4BdR{Buu~It{hT<4kU)U1{)qhl{y9+&d96>5CV+hIa)wTdwshs$Adsf_^ebOxR%PU zi?+XHZ-IWd?{!J3%aQ#XO->|Rt5NsB`hDpuI04{Q2Bo{AxBhyEYZD{IMqD!~ncqZ* zR#bUN-x=LWVJd2ifJbW)xn)tEZ#>p5icZ5^oU?IAh8K!A0@q&1CA;`f34>71S9#Na zTykh7NX`uj8@BD+7S-@CUQIv0?YhVpf0udLO(6EB<_mS)?`k`VyFTvC6&U{^tFuj^7rFg#fzZlB=_DR$S03E02_#LCC-%pk?D#RkfSnP$DE_ zzMY7BL5YDcN86sPc1KZuAf&QkToekFVu+1v))Th*=WVyYQy)Mzf-8vE%+J2;I9B%8 zUwPoDpd?j-qBb&e8a-K$n$}AJsCJcFc1~3v>M*!|fsEHCWVe4_m+vqT`V$_{o1y9; zzb-{lRGuj~qXvrO4Z(&Nr|Lwzu7vJaMh{qXHiS(F)Z!g<**SO}%XzQ57togcU1Rh) z#_C^n+!fyZIY!$(ZuIjy{&T2{CxVU-7^x4%K{v{Re$af4l!+#34PE1sMKa7OZkCHY zW(Vt;UVv4NIMd3XB)ZR2IM>6;Fn@5f>c&CogdQIird@SS9dfiET*!@}cSo`x5oP3Tgg}(mYduK>OdWl*>o?jQ|P+Bp(9=gct-pHG+$S zBysHu6Zlw;UZ;)>OCoCfdy+c;%mC z?^}oEodt8S*%}@-iM5WvjEm6L!jwVnN|51j?RNjZmy0XHQ(NoG##X>qHWt&){yunr z%JlqTmi%-`d}(>~?=uCiV2Y?D{@}emQ*I05RbT>=03G%jI7F#NokMX~;+}vTC{qhk zU$L8e4HkY&)m{o9rQ}EPFDWW8$YQZ6d1w|kcnAMw@K);6M7G(nTx!#8xhqcb2o)_N z(KH%CSwTe6d2N2ZV37!N^L4d~R67JXw{q;!K}roBLDPO%Kjes<6ptwg zBeo5rn*!HkBRSv(KOt^af*Cm+241V=GW_R;tx|J=d~BbmU(mRJ8_UvO>d_Z z_Y|fHg;?$`?x-^cufsdj_B`vv2HYZPf({4Uh&)h+=}abNr(!2}84{0*ddgwcJ7Yr6 zAFN}2D)~Gue+D?rGizaVhUMi%(KaaMTJK8c>!iQPHYi1Py%oI#n=qF#F?os$j7t}t z#=s^WO5ZhFWk0w|-mt$yrJl9cxlQ^8O*%)3;;}c|-kzQy%gqOL_4V^)0d{y{bqNY} zV|U{yZvKTOgL8IbZMOXRGwt~J{>QX@Y0S>LK5)l7;Ak^&|A&X8_wv$#!AmTnV{l!< zD_QIhReXieV+p*H#GRhq(IQ8(8}@FVj>HZlscS7_jBGcKxeGTqZ5M9_KX|Z_z4^7{ zN68*yD6hTB%85#`r|ehbcAzXK%)5t-%2R*k3N9yxEm`Ap`yq-F;m9jba5$Cq5vb}~ zd)la;gir1K;%Y?Vdy>AMn)Skoml>VLPQ->(ytM_OQ9Pg5dm0D>^#XCFCCVt5AZqFJ z&$$(r9X2teU#f^iL9?-KgS3UY*nPeCeKquRX- zC)k^zXPBc9`g^!4g!k@3kr>^7m+J+OiN)7U1&1(}pfn1hYMXUy zAOa;5MKIGke8oq;3M6vzR;Tt6xEe#%5PMr5>1xWCJNPqNncK;6gsZE_QQLKGHQJ?6 z5?RiHF8OOfQ%ZH?6t0#vKPHwHEwwWuc`}sCDkqcCk9%prB1zXe@TGO$nk`Wh+sjkK z$4oH>8ws!%8EuSV_$@{PS4Kyxcjytxva@iDz(#vm#<;ky56H^ftPZj=jOn3!It~WR zV13-!qGgsp)UQC7Ige$RW-@x+IG);A*@KCmrToZ=HZ*QheAm7|A72tBfd|!dH<9f_ zmfeR?Y$O)dIhnoZ+a~4mP+q|tLWx!|)L!4)b|7SI6Z&rD9_diO(fSUlK%~sCmkC^V ztSOIaRvhNl2a=Ur&@09iM%t?N<3$c-@@*9`AWR@4J23Tkh`e@%Hfo0wXYb0B!P9N9 z6yse#_*X-{Kz%T65XOD~Aj9BXsRUP?nc`fM`j?Jym?3TEc{)DMt-LHKfnjAz(1lqt zpv_1+Icy>jHslZ}W{Eqe>5`lkmEqGmjih&aLmihvL4=hiiS*AO|MY2#UKtI(sr3*fY+F#w-+A=S%(Bd>{LPbj>SWB3yhf~W_?$(}_ zUMpSFfJu?iGAQK6+@b?;MnN`LxU)K#E(siH;gNy{+=F+6g>Grtzt}I5N>mF|Jp0yR zEHV9%$n&k(hc=ijBroAt!3LM*p5t76n$gEnzwcDSEQ* zF_Xs4L+Mn!+i8s7T>}mCd;kBf_gGJz5dW>POKxFKivk9}RImh~vPo3*h)t?FIl$FqHrG0=`glB-@}MAT^L6Af%~I zpT4ax#sH`YzyG|Qg-%$Z(s=jOJ^|7Mcnh5&McM0 z>NC}b6JYmi7QHS2u&>$-c>y8;|2gZhLG^P3KtS|UXS@JJt=>KW-LHGB`2ynpPv!uC z)Eb)t`1j=&l@4hCvVF?|jD6J`tsEfu z6`@uSnEO)H9RSm>Tm0+>Jb$UEUjW0e(ep8Y)|Zl+2e5vP`Yr)xzP?GteL(QnJ(iCF zBVT@b*8qtB`nA@wXF%GQO$-c_@ypKz3RL~eHi-l(`jrm_4K(H}A|D^L^{Yy{WT3z= zzb!h@|1&=^CeZI+5sj>%d|&ylIYF1c)EFOVJT#cf=WkA59CQToKSd=AN(2V|Y14b4 z_0mdJPyprmpFJ#60rV5F)<^|#M9=>$nIqs~nIjONKz;)C3G^p0pTK?s_X+$b2%jK+ zg7gXUCn%qweuDN1`X?BlV19!23HB#ApWuFi_X++d1fLLoLi7poCnTScenR#M`6m>g zP<}%73H2v5pU{3n_X+(c44*K5!t@FACoG?^e!|w8Il_)_1zgqsO{n>Lh^>?c23npf zVnlY8D*_gmFq1MpAtyB@Gg{=y*4@2jjnXh_x86$vc`oZT9Ekh6XJy$ ztJHW=R`MfTMp08LVoc94t9i@&H~qf;x~HeRXI|}lt8W=;Yj`l{{#H%*)$YfouNyU` zgUU9gcGHG3<1E)uLvY>6-1hd=y-#wl6xAM3&b!imd-<(o|EJ+AXZ+p0ZXnvnv!b`* zRQ0Q%oJ^vaEXn_>0@g)PYJ*=~!O;jh^Ue2c@F0T5aB*-XjeGk=7F0&kP#^Yz7Jt-{CkVU$ad4MS)Y^|WK9&VJj1>?rE0T5OP{(xUPzYbr#+Cs9;I9HBjm2KexPQ~ag0 zZJZ=IO^_rH8FdWYjiS?8IfK21suYuQ;U2O>oQCoTB$&&j5A(Rx7w}khamHFgSBbmZ$ zytyUr{siTc50q$SPOc=m%Al^$tfkX9sCnXyy6@2)69V02pc1&MrGeau5iL4V2JV#l z@o^lbDw|K+B-2-IQ=p0pS8Gv9oM9)W0o>K0x=s074Bv5d)m=vY(?Q8Jc+dl0pel#{ z<*L5%6ulTmFFa+?q)y3H(5b?g#oi_$3wzE?bYb&x$+Y{pI~>wdM?M?3qt!l%__TNu z?a585plc=#;@S#DOb6SVtaDZz%8pf4A%5vE9HSSz>E|R2@&9NW+qGN%1n(l%47#bML5-IX#e*GLQn0d%7Pwo;e zkqROrbOjZKOIKBfL0>fWOyY{UCOd1yKYCnRq}t&IeZG!hlOwlGaFB9pd>Ku#0! zhis!Tuo%S(-RE%GNT)!Hk*fK;hLl(O_aSir5(mn%WHSsHDdqE6vuD-yV(gb1+!F(2 zpxQP9JMo_yAaj-_aI?_5VHX#BK-Df{2W@zd^IT3l`-2&q;5iJ2oM(K;TZM6u*nwJR z3*#_jOz#qakGqHx^hv^6MiNHc3yP9N;WgpdroM;3t{zOkUJL9JgVlmLiH7opQY9m7 zu%E!Ie&Ppa4wmKakUXPP6GE7s^;U^6deBw3sOWiHR0Ii ziy;EXhM4sfL3@e8+QFP6n$eT%_5YeNE%sq2ls6+Cgr$mRlx@G)#~Je`#LIe*EQP96 z(NAwLe75=(uAZmT8q^CX5X8N_m5N^3x+p;HqHrHmpaVDDBnb@{%+qN~q#L1KIC-+%*{q7&H)$dhR zyH1_zv-aM7`gBjnF94=KK~<6i14jn|0f7b?H&)gQW<)@YMHPVpJ28*X!$OVKVIqZc zoM`vq+)c;R-UIoay1OKj%gJRQj99(rKEBgD#}{l+6kA3E^ef!st(b^X%pGE-^sY%d zMR^~9^oL*Q0I`{bRK+2TqLc^!O+}@S$B%QW1&_*Ll27FF$g`6p35vBTfeOwKeij|Z z#WK+=Zj^(>RD0MS)LPI&gSOoJ zVZsGvE8Md%pyvWfbLTe0l*4?GRP;u@uKLKMAd_f7+V+?Fs}{=i$tIcd9qvQ40h2kW zNi*snrYW67b?AqBl%h_LVNbrCHYFzFxdsl|HsBgYb13%q#r4POtP~(}N<+2r3#+r% zs_4bP^{Nj4;jj!z+R&0*`Df9es|kTvu0-?;dH6_#OTSEAhDEJZ&PjOQfD0?Ve}Is8 z%`t!Y!rM~7N=y<8yHGUxJM|vSoXvM?&DL&3wHC1y)xMrVGLE#ED4SP}nM5(^V!*Oz z_MjNW($RT&EmA}DFI&Xu(1A;Un@z@RwV#w2fA0n@mKvBEni`zJJ}Shi{T|ND)mD(k zfzwpUveHU#lVUs}I3~~&FhA-qSOKX+8@@1vwpJCeP+2KvlJq=F`qRsz_qROPJa59@ zhzKf4jS-}jRB)clelPq*tc@U~3M3*v$2gYj^Rj(f;}8Tw{Ww-6x9K@HKB2d-nGPcN zPe)!Q509MRJvMOeJwKY;*xL>4uTYwR`#P#W6k>4(i?OF;qf~*+kt~g)^oA><%aoW) zjZ%6ay~bwWuTr35_aNj;rd~OhQRa@f#cUe^8(R?=#Nkp_We8gp*n<M%nf)QHRdR8$Um4qvM_1>(!HAtv3Yp!bf5xyQ86T zOh)|=Y0*s)Y30<$giTtYivt-mR%9_zMyX*`vc!y_EN4Z4PH?~&KW}P3m+y+c$@*zZEq$dtL^6fryQ$na)jAzn_?b(mQ`^ z%WVuydd}mUFLT0(Vle+QS0$_~yz*g(``v^&2+})mtw@cnE8jHuzv3wkD$mvZmo8foq-fLZ}+~ z9jCh#0eaqmI8{2U$%oSuVDWv8K~)d}GA*vJMSSlMl@BE>ZDQ!)t$mhk@lKZMs~M#yxMc$z5J}N1 zM61Za0Sjc8Rrxj6D=`$hjUsc5LK8w&c+=EgL+IlQyC$o)3hM^gm{z{sfp|Z7A5~yu z3(CN3AaotypAZz&I@#4|Z3V?8h{B8x+YDo=t2E`*EEU$4F59ez>+=2HhO)dvu7aw&ZnY5mp=m$c@Anj~JRjYsr z=AV=@@@X4m4D&h12n%oo;r@o~>1;j7n4&dGWBIMg`UbN$pGNDh;@)pXM@O3b8J*fd z9)la0(I@{W#*7^+oE!$?du=ebX?9xPI*qcLN_}Hr7y2lp?b+f<^asWl5guUUf!?Fc{aRQRT?hG82W_A_bmHq#oAS{ui40n z;S%8?i~aE9KHDK@|q-lE3P*k68lVdf=q8Xyx&V4=+gnC$2EMlD7tGUbF)>XiW>(-#h16}{e`o89ven<;9*1#U-_ zLN7Y`6s$2(byfz`1p0XSzm$dc3#3U#|6W&11W(eZsL-}NJpQng>rM7Gkj=v_Q3$7x z>Wg$6gWIYhX^QYbp7YG-TIP!4c$TfH_E)$wd1S-JJBv2SUPO4y+A-aqkMkA>s?3(bW)Iv|E^WO+M%pha+}vRIWCO=aaZ$jNq=M){J;H2vf9Z|4cP zZY9TZwT0^b@LmGhP_eSVt&fTA>}*czTGTgIDa&NCtYZ1!G8>S3)I!Gp=x~0w`W8K# z>NRphEg|gi@|1nD^Rji-3hW&0?5ic5^BmNXEnsAxBcxL@Vaaz<7nG9muf#c|k%XZV z@09AV7_`r`3XHJtR={{B4>KVo-G-%3vvvKe5THyb^a!W6rCegC5H1_G>_8em%o|&o z#+&n`F}$^8T=cq4E*a6&MmpF5Wo(2G7tv9Z&Xasr;Bunmae$*|0_4ym`>A8JQ`Q;8 zS|KFlvv}WOj9j#2f-f2lxOvdz&`Q$qLGST+7lN}Ay_TLu=qz+AuP|zhvd$f&G6~olXG#RV88Ncj+eV% z$>4P29COS#mi7#PMU%2Vs(?_mShx{INN~z>oso6|eG7Op!|43BeZl?FWPoE)nl;xn3CIBzpP9 zD@-=0%UQ^-hnG+k+2mRK`Fa z75;%>4l}0pNbM)fVW`{#ReXcQwX_97F3_fgtY`$RR5FBGAwP zV=7iK6j5bgZ%z+U$#`GG?yNF{AkL*F8X#}#b>#19de>a z@@>wco-R_*1|ZmQ2rGiOVJyU~57luM|At8k3?MkSA>nkNcK3MM)9~;qd$3wx+gu3& z5``Cd9PKom(fPNk)+6gHM_~MBpM%*E($k^o7*#(%0t%$_6`wqc9Meq{dPgx_u?Hw& zi_xaF3c^;gusUYH6k>tuzDbF|C?D-@)Ul8q-qVS}ak%b`Gn@r94rj#GN?X}-LiPj# ze+G*cfjHMvXy6%pr za~-oura9R_E`zk`3@>q1hZ2DCwT12y+Cm|az-Bg081)fh1 z8cLkO`j>yMuYYZpRAJO59z`FS1MgkvEhq$&eGDd+PhtnmZ#C_*&GNL36CsAiRbl=Y ze4IHKsR3m_@BOT>(0fWRXJDuiuZQbE#;NS>YtwDsM#oN7=+R#D#A)_YVdIu4uo+FP zhVGG&_XiX~2uwTNpT|kAK4iUA{^>^aw87j|nMKJ`+=d{Sm}}t7g>P&20$&N87lhx7 z)*ux$;BrbJuFN&eIA4+uCa%{p*K|FON`8|ecGuJG*IpRPkS_gi%~0-4OQ!(dewhAW zX!Mv=#bO!4_1q6`zg(CkGhPOEf$K{olO5Df@RBXzpLGn2_A#^f{p}YOG&D7r*Hzfc8J>CZzw`Q~$y5;1`kv&#@?Xgs{gLnYz zZeuQDZPi@-aZ?HbY-lR!-57p}T11$bepXPaT>O4L3L0n-Dlj+EOz?3Spvc`?+*1=B zoKZ5Zkz7(YW&yyIyM14%JOs4}~(QKq21-zzH!7poT*y5gfs!_$TAX zSf`Wpn@z-KXoW0dNSmQ-DE0baPyU_XgVH#cPnUh}&q&tkWdEd_#g;tMmi3}qA?3I^ zhcY&7mF#Z3xOS}|%=Ew#@E3=Ny=M}g3rSp^u1pp_YLW7$kQcAhd)PFrj}}~?PYEwe z`U1N#b-Q5LH`IoaXL8|W5Xh=&Xd{|aMS9JySe{GAM!J*!94GI;ouhLV^O`l!UTIAC zlIAn@)c4fOCc6^97jyM@i=j^lZNYRkllW%nQ)|t}HR9>P`o|L8fQq?l|LZclhtX>8 z({qD(6l!`RxU3Sln@ZNcO#H1(0%H=-UycuvM)sPO)6;(815lPDa+?GvML+o)zUW_- zb;WzbSDeOt3J7%CBycOiXUn)rH36D64W=w2Jm<0S8glPC96lI^Q4+0?2!SJD%`auM zvLjvG+&p}%1Wl_z=^}&AtA45Lq_pS0qIEZB@lL1Cy_HDUjO z4t~z*Cdr?*p$}xvwW2g%_PtC2Bi+x~AXlqxMkQv|x_%0X_)Yqcdpaz}4#e^G;}1_x z!u;-S37GKJ(9-#R)%kZy-Af1c`}an{9!>MliE-Xn^jv)>YN0B%vE-naE392PQ2m!2 zh_yMQ#tW+#n2WkrL|Ij69aUtKk5mz}MiOFT>qR1bLgv-!FFmnK{-Bz4vsK#$#5Iw- z{8;tdH<}%wvjFL!Lo5mNo z0RqA+Bx8Ad$KdEJ!TQ033ah*!){bPmdoAVb*$RvW3?OV+BM$ie9iDj$Z=!a7a*sK} z_tX^3p(8k$sp*DmSN*(OR7tWmV`_yO1K1*tU@Kdo9(frPrP|Ni)7D0r)Qqa1G6E9>xiS-ESgGk@M|+g4{1 ziv(!?+0&nwJFv*4_kW{HT_{rBIve~(Wu%fS@pLxxw~mm&r=gfh{MF6oV}Br357i`Z zL3-S8UfwuPqM$ZKt3uoa(M*89FtGb{O5xiSP;rn7jxeKF3AHsMGh;Sl1STR_ImEye z>6_2A-^}IFj^#8j1;;n5iH`GPxZRs7{aCI|pW^%a8f(mEUuao*LTS1@$w~?>(&ODt zp3P^rfI<(H1wFq;e$V3Kf*P?Zeq3G~UrD)+;=7n6Qu4gz=geI+s}X&bxfWP`3;S=? zKp}0-X9M;Rdb>V0Qfodo4E%n-OTo9`-#g~BMf~$Ft0is{Hv3A zSOet^ol>cVcTv;xpkHA809tmt6;$N- zL^ERI0u`mu{m~wLRFW{CqZqc$6F~Nvj$9I5e3PC+Ha}*SYL8r)^Irp4C4?=XG?V@* zf72|?5xlB=0;Hi4&D~0Vh_MX}Cq>5U6RVtYg!XaMhB_w`};~$XyiQ)3)=d^_Y8}r@ zz6*a%Ee_<@}>1>@(nO6!(=z??K_})S7PE z|4mynU|mEYh5f2MRKs;sKkP{+ir_-(HG`^KUMLyVQ-DC-C#6jL3R3 zBP+)AlX!)j5`1>;ENH2xp{4R?!a**%WZ6hu_jPZ+y-Wh-QBq2uGsPB=A%a0efV%0f z6Z=*&lNiSVyqM%kTlnAzq+kk!eCq?t^Ge7SLE&)5a^8Rg01a9Naxaz(K8}Qf`(Ur~L8f9DI zJ<`|;GgEyiKN}b>ZCzQg9%_fWRIt(ShmL-lec!cjq`59L3=rz%1Oxx5tT|AQlQwLl zFLuLm8?1dUN&{A{q-@egZMiSeV^|6Pt_`=*zWj5dcagBLA(|YtD<{nyQX&Q|Dpy!f zsLv=?n7fNZJ?rs7EZoz;*90HO0?&3$e*wU|V6{xsLs7Z<+oM$ncJfHLYn3DN)Z)N??zn{Be zu*T3jxJ7JtJAnNhG#^HEVy1-6N@Efk>%|(9@3eC$8^D z&Dt8#gD>#dHcBlG?HPgacYCbxMb=fO*qyQksH<>p47m?Dm<)*Wug11DqPDe;=mI+( z-70He65Y&fFR>x+)POT7y`h{wMZv4;AT+shQmCo~_r(Mcc&yYINS|p)E`lRBkINvB zQOWgT#ri%7$sN=2;l6$c#G!#`yEHAgi4kJk6dIr`P{hVKq!ukQ3cL;t>YH{FV=sR^ z2_dB4Bj$9E@wB>TXjmapqRuV-FVgWkky>VjvEUy;qHAr$Y@N5hXR+3)I^<@xyzIiw zc3O9+K~lDGhY+Tvr@|iJD1TV)b%hoY%&%s%b$Hn7s$1-(pSbDJhY2e*5{x+!U`eLG z2gm>=X9YLo?7vS$XUNI2%t!UdBVPH+a>E>L253u0&=E*on7HQl3q21+8D*qD-I!WG z58IY4T_c>3d_8P;XJ-eNlCPD}HHv!JO@)#Otif;6)|C{)a2GUZ zM0;-8Rs@OT85XdLdMx2$*FsRrVc2zF-CX8T|0X1fw$oxVVe-+DFaxc#u%?GDJ%*2z zAZN6i*yA@Z545YNZgu8@t1VMlBpVad_1z26$9Y!*2=_*me*|K;$Iv+-Sgokr-)0a~NM1$D5*-efCW>KzejHk#`YD4_=U z$?yJjVMWr{l87ys>pEP9QGg;ikrD<9Wz(|hHl0MLhD*D^yZ+nGHMx-VnU2|=z9RVO z`C}38q#)q!uF6yFM1!9C7q}@vG)uz^!75fO$RnN>#rl%0Eit)R zJ-@j0x934`W=7R45{^?T@EuV@6hoAVlPm34gvV*JVS?)LGtO9o4=BJ=YtGsC}oA2kn|9(wwV{k$GF#W>A(QP2te zkuXwx+#=V2(IwqK-~s;q0DVIeD1$jBE^~D1dX>y1=YUpek3cQ(aY3z<&B2|HkjO|a zGZ>&^C`pwi6(Pr<{Uq6O@>I4_^n$q}R{hSwVCLyu{m58CZS!kW0k+<69p`j?mat-7 zBxu(k^|&$=3PE)DvRH(NA|e5>6=C;pj9pv$~C-BjR^&7pIeTNy0o>k%wW$_%oqlY$9$sl&zY)h@lE@;$c z;^LY{dKYYeO^;O0Eq9^`(1C_mK8H%<*;!nBKX5;GSFX)xQRlq}Icrz;&FY6XvgTNM zEXp;3H9jFx#(DNu3-~n@cTd{~yB*tM_R%PIb1@BF_gOVfI|J>E zp!m%XeWY2*Xw%=bK{dmxag4%AjT9Pr2`P1D9s1z@`ucR}cls}9>=nW2qjC>2tuIyaPObe`LDs!1>Q4XnQp zOZ z)Ikek{K1rAM_${-wZcz_zPJ7IF60=q^#67UA!JKgqKM&pYlwp0jZl$#so5>&D>D;$ z#|p}%=QABerQ5zsq)s31Rw-cJ0i{gFim*o51IY4cXWj7QNSHXOP#?}wO8(5@h=$X~ zmQN2>b-n(xDa+hjQT@?4*f>iYP(jVJr7=L+*D>igH)TRFi2>g?;>p_ax(+%egqqi* zKGa9pu*M@sAPOH$Pluv_@bSA{M9Z#5kLi@aw(M$QwN$`6oK`qCV5zBs>HqU+0Jjr7 ze|#2A6=1dQ8*KyhfA_iW<|3Y{;}O{Cfi@0n&8TmL-5>tQX{(4TWA1eub^&_pg0m9U zx=qXA%`X$#6ucT_VYSi}?$tuR7LU_oNepdE3Kyv;Q#)c};e9jw(Ax53lAXZkgSnUV zotPm17|lOu&S|D`@|_!7?IalYaX-GTsCH+Nlt*h;N`FoVbtwgEtRHcap?e+< zA$weThF4O1V=S-w^K!u9{eU8YnXdAs?5evnzbf`$6t5P#A_EHuMt0TJ-#i|O-di<) z9%p2P$j2$kn>Ve(sjMpun0R@;x&|t_G;3SAVFNXZ$1hP%>s1M_C)-_^UGxy-7 zuj%hoMC~9>&M+5vX3PN_0XK$1uLuepqT}ii*JUi41&0tdSmwSv*6y}slqKIN2%u@7 z`zLBl@U7Z~3!N}S=5nj-gd8oTnW;nzMP|{?puOi^FzMyrjm|7GpB1~1fEVuDMBL8p z7>d89KIb@M@{V)|!)GXV(Y_przxd|bGj>@pNVq{_#ckupL}`F?O*7=?c_)EEq~|>~ z%^$U~a#y&dV?uU%hd{~xK;7J$Hvf?3hqc#zq z7070JSei!jN|+db5lJ2s0xRbl6{P*hKDJEw0N^gH^P9tLUd?c>ibev!7&w(1=bP~M zHp{KxgdI^$630m$B*12H0+rcgkG>yEiee%29hm^?L80DN#)KwMPx9Kx(dM1|&B4E^ z^b@bt-3)Gj*XN)j4&&p3N~HDWqoJ3aRLNBgZx_O6`ry@T-AXh`U_!)Bvfok6dHg2D zdd^>_?G#OnfIR$cVs39tJWv6c--X8+@S$CbWTyq|5F-n-^fCcKJGB<#O+KZ;23>6g zyKF*oj+(nPS~;NgO8@%eY58gT;@=#VgCkh=&O@t8uhnrntwW$nvTLd`B+wGzrIl6i zWE^q&LlJZjHj2~yfW_99`2jQ!;;IwhO+oNVP#|=v{NL1=%RnZ>qq?WDPEkt0LAIwR zdzB4%SqJhCZ>G)Rlt@Vvs-aM4wP7H15W!ne+R9scYj@$sFej_&qu*<>-w!(f8g_QS zdgt!wkyV5!(Qz58hOcpEKFJKhkSRtG85XomDz1AjF+lWBB!OB?#NU26|_ zNC|-AX>6}nH|)q;(sEHJ){GX*PXwI}TkMDpTd>cYQh=c*&P&G8hv12-I^O4GUwG}ohQy1AU>>a=L!FE1}m@BDtCsC)wH;wRja_G@ESg> zl`mxAN!LKiyXAap$K3%S$Onc>R0NNz8LK_}M{Z)u0;?ulx>A{E+NCIi3&%K`(jzKp zc3~y-l=^*W_-Qp=HozHL_21SIanOgmi38n-i6Cx5Mcyq#BjHSKV_sfhzJW%nL&Tfw zTBM}S6$@-LEU6x%n&tkw0aCpGsQd$Z%FNx*YUiY<-S?W5!=?rpS$jM?~_ zQMCs!0{wN3qHNUl5Nj4Y!O|ZpR~>}0G|_*sE2uE;v~b|I=;*-yS~pr_(+#|&N#E49 zTiv+C%)^;+GJ5fXdWlsBC$a8Ijxc69^ZJ@IyHRMCRgG%9o<9GBVD7n zfmq*_UDAojgq#s$jD^nqKb#}vCzk9{pyU_VuqYaF#T5qF=+!_ z3Q!PtY%b>{7ey`YERYH1^-$WG(fk(6X<;i?aCx%4o}sz)S#WT!C0D~nJBDZ>lV7GVez?}| zP@&03S!DHOn8LW%G@UiKehWysWB%BG^?ErmclOx3yGLQq6gnf9b&4$0qS_MN1jgE= zlXV;aL35Lh44u$-{zt^RLq3DE3TXMZv_EgT<<>Z1zCp=ud}N_SK;=su7gGrn++A6g zVteohO<`^AtEzf4LJ`5qjV4dZzf41in$#P22s<(?++LR;eJi3p98_$@YYx z=JfBS&I7douQ}pT^qaLzYEH^|k- zjko8*IJ%G#9TP8| z3lTwpnsmP*Mje;~+PcfB6Hb#JqkZ1nZ2wmh?-ulTO^%|>-tNs|-%{DxS{W0WGfykG z9Y_#|enz)t4h(vOhlU2_TnjRM>L8P)T}gv%$r3dVUSttMhv`pkR?9hsHMyinNal$G zX6wf9Ahua-o3cTA5i*NW%j^lF1U0XZcW)?GcYFvpom)V%sFFQO6p&4%=X@ukAzyis zT4a1|2!YcHNS z8RLk~6=z^{;o@mJ!owrzpPM2ydA09#E2vPKQI>}TBKaKEE4DCECGlocY1J#vH1o{2 zD$GW%MB5f79{L(@y$r3)hpHV+}BrV zRH=@-`Q3*EMwx+Knhz2;7*rce9m5;{QD_6E4l;y5aEndIlv(ZEb?M^y1@ zCw1}{bD8Q|+T=AkMd}iCw>WT0vI-EWvi=5~2glUc`EPRr^uJ4m>up2In6=TT!!+*q ztce-Qn#z>JJ}yMY&hklRC(f%af<=a0fz$L0Aa98vZmoj#Yg=x$M`4AV_P&%CWwY*k zY$w30()x`{c^$f@ja_Dz9ZJ4}QW(UGL&cMMk33@7hSgPtKVrdAH(uDyFeCprp5RY4fxxCXX(u@{y$y(l8LO3uys6u zlQ^5Z#kENtx8MvFms=BuL1390hbCi-IJHZ1-nJ|JFAs20KWsVo)HV&MYt8o*c4Gd; z2tKZYdfRdmooiuv57ew!!)@Fx+cwhQ;JabD+j6QWaev1>20K``r9=0X<-b2SDQu!{@mxM-$ zR~#7ly5KBxL6GQ?uCkYkyd8atz^ad@{Z_7X0?`mDk3aYg7lnX^>9IzqhJMB%&Q4g2 zrL570)F;dY{XpN=XGfma7JB^<`yU5ZZHMUK{ukjcdu0kGMiqENqCJpU!FYy<_Up;w z4^LakRX~ryCycK3m-^M0eSg7+&_9h8%I+RPD|%FaXT^3QRL?0lB=03nfso`^OAg}4 zodTOgdDJ{wKIsu4f#9t5XD zn6vUG0|nQlGXznUBv!@Wh2y=2qOrfe+5>{N^|g@lm0^Y0)+4upmFE)a_u{03tX2xS zAQm3OpxXXk@++gm?{Y*&z`8BU3f1aqkVz&xH$km3FmzbXw!5v3oj@b7-l8Qw!a4>8 zEKz;J-G_T_gm9y#r*J5pi$WZg^>sEa6bMTcZG>obPrZ<#vYisxZ)4Z49Ix8JLdiQ* z?w(R`lff2nb+vD zRiPp>Zk0h~+CGi)UPb2iI8fe%X8mY#hGs+@v37Xf8aRB&xtbW*R?OMbV^j3d$~cNr zTp82v4nWomhhhym7s#n^wp!3J@{Y?5W044$gO z2KCA`h7hibb0LK`i44n(yloSS5j??U=_zK8f%ZrzCDs92Q7kj$ZQx&O^vG38l*Tv} zN=TkkJG&`V=9W6=a5JfD45~WY@#}p1(^fpSfWAmgOy;5%MPHI1J78n&ia@Kce{^bm zxQ{|a$hv5E*fUBiDj}g&46RwZ4UR_SM89lzb7d{vCHxF}qABLf6te|!nJl5NslsB( zFu0|X+ktHbuk^#vmpgI(m3Sgo?R7El4c6+}yZy$J*8;MBbra(czUNamaA!XkL!IWL z#3>6@VhxX_-II$rk!iA$uS|%NEImlIJmH69a54iz!p-A3Pzqq+%6u!W#P#A-XDCci zGp^6%&A-4@H!dy2j4v%iyrB?Qprt_wr^p5pKghj-c@es@`g#t6WPWVhlrV4pH~@)+ zM(#qX1E|Bs>@BdX&e%bCf<=;RgnfzX`|?Ysb$2BHQC_VGmKl@4C2&yV(a~Z?iLvi*C7@g0I12C z6)7=Hl&U%w$j3v283ZNe-fWVQfhIp>u{}Dreuv9ft>Bv}Jx?Ht!>o1Vky<#^obzOw zfJstcYNM~3NfvULmgoRsBaL~{;~LrQ8lg6B+LqRmFh!jZtrD}3=kW?I2^dRoV2K1~ z&}?kkklCC+S>bcL>~?EckIaAG$iJ+P+d*jDpNWxdYu5hQ@L!mK{m5~_D)I%Tnizx_ zad#5yJto}R>|R_R^#KboNmW^ge-nEre%my9OTRhr8j;^b;nvNs7;LVYq6vPJgbJu$ zwJZ3pZNQikKW%Y3X%u4ln&~uSnZ*D+T$q2FrF^=VV;0B-tftKB{qz0x%C5k(9f5Z$ zhu2lbNnhoBw57PzbktDbVN83-0g1MK?uUnFdeR@1q;%(^^+VUp>>zp3M)cWXq-!&b z1gkM&d~N@SYfhrYft1QY;Z&RI?D_7Q9af&4^V`V{(~rK2HTL$KI%PQAEi_T!YNwz> z7i*PM8jqufc73vaQ8-U!@ltk?mfVEivK-ya>^BOVH@BygR!=gg8H2Y(x4I>3xhqBW z;fM#&*R_K!-QlIACC<(5(xjz-_(AesBGGWUREt@$x>$HrdM()iup_g{fD76xKE@a6 zuI#OLA^L-YhTLmTJ3VQxf5tz7^j@g1qEkfeg(Dkt2FZ=~1Ql{4oTe4SzqV=_7mck+ zuAgO}j|+nAkTw};MsR3s4fh9r1SQ$B@9Syh6dLp!^i6o~@FB#S#3tt;0Oz#c5$1wU z`ZCJ*|LI&dY18#}5?1UfbL*>GrO)~{lMfS){wBfaVY25n<$t~^`t~mv2vr;8JF5lG zIa-B|M~Qiu*!0^31FCXIBCwldqiFHYyX5#nWv;KFP)be#DJhMR&c?I2{3KdsfB)a3{9 zN^@{Ig=ZoPz`!&`NE>g=@)OzW!Yg4r3;(oB0EYmmH6OrM{>342a|<`D3!~PTOvjgw z{58bY2g1GsGOv>}w39^NAP{rQ586=1%c0+ODZ8F7ZaMMS*{H3XxmiFfB$a-AaOF6! zCUF|w%vb~W!6^BSWV@4DKrK3Y%_|0t8 zJ44KzI9i$M*f%>K7ArAy#aJ2IMIdPUw~LK7LOw;&WSZ{#vXu12q?4Dk9Id&3U5^uX z2-PtBdNzs!#`IVhbvK=MvR;QhgTk$4ENh zSom9YWU@6oXN!k+Yw0?}fOEqdEoABN+V9;Tus>qc6C*;8={jc7MZSy6)3AS|4+*Re zuRoT-_Euc3)w?!h!)-Lt%Ext?8qc9tmXa1i3+5cU^A?bUl6O>}#naDNNszkIWn8i~ z`yLq3FVxQKDBVF8Feh6yJu5M}5c)eE_!nxLlo-*LE>;TTTq9&UW7=;z5siT{&ZpI} zqDv_VHL#(FOMRx#0E-!_U`{~<^yxUaE-qDt$!5=M2fp+#(04mH(*-VWY^Uc!TT|2LLV&j$ zrC0VQnx9eLiyJ2w%PvJR;3b4CzBh`x_WbZz@iYK1U=pV0x_TDYc$Hjx{7>f<`}y}! zV%^MD)DIEFJ4sE=WX;fPzNbECU@|@G``?88>tM|)4olia$-{e>39@Yd-%l+&(QlKHs?VUvru>%=>!)L32RhJ6Ex{?HR-lELI%<{%U`>S2d!5EFqOyiiaXiK^#-Nnpfp>O$D1p&ek6vH^hLzVBfz6)_8eE^x9?XBi#5Ft+uSoq{`3F)uu*vV8NMkMiG0ET1FeMru~v2ksalB zt&@UK6#RM^WniV4cX^Gu(c|9KeO2SLe?7xSh?^y0t;>yY87_LlrpLNY7zb_sAVC5%K^^51cYh9>Y z(0fD;Rj}|>TbbftH-mWZhLG82h9OylF(W%t37`H5Xp%g(tnX2=avjQtz9#s z5}suamt;yTc;?X|4Ri+01Cepqcou8ORdTR3P4f* zw~FVmkAX>nf`I5lfPmm8?|cVfG!-ZS?7qSW>Ow~1CGCxsTKea?7t+Z z#Pg2_pGjIFK|o0Umjth=OcwwT_FpBf1^~=2HTNCB{G}kx0KWkLd1K81L0<~n^8X*l zVgum$inFr^NPVd$CjjJ^>UITyef4M18xRga_}^LRutD{513u3pdDQ6w-|C7oe;P|Dsg8*$`XOI~R$o@|iiG%~7|Eotl4j=>mpNdHWJbi^lrUF{NY|@#4 zk*}VkmjDF6MyS^SX1)|nE5PLI5YZig=Pwo612FvZUXB2?zLd-?fc4Ak`}t=BU+<>U zJ|O7p7)!^1p|7}{zW@lB|7t0D2Bdu1#KAxrzvA4WK-Ir&6G)(4!5ekw@C;3|I{bW1Zwv+qMj9$?e9FMzxaml z_2l+X42Eu~w>lK>cAo4gXequ{v8?OQh~y7%{4sXa`D5n}_tASbd(>GsW{x*&nja3w zWnOP8(dY(Wshm*Sms3Rqk^fr-)aw}Ir+PT2V}{2+X@k2uW)yHrI?H?Vqb#UPXG`Nz z-T%4|&ZQQd(4qJT82qAm!oTWL!R2(O5mfx87r2woqKwUp2zj-(W@pvb)ZJCP10xYH z!ptP3UQ0-bpGzVeg;YIL3o`!w7TEPHO7nt=knP)Q>YhRcEwl7yRabVGMQEMp6VY-T7o!Uo2)Lf+5iFgVVn5{KBy!|n5J+5a7(a6&L2DI7OA|8%C8;!0)O*TuO&vO_} zd+={R*5y`WpwVg-g*p|T3w_xvRM_6(wy(j%Y-|>{y|8@D+<>;LQUaUR2^J$u5=!a) zmF@~0^Q+N;e2_Vy(TL-dM|IYS!)w9r34!VvyDc<=^QDS&vMX#4{qg14j-VbaIS!Y zTowU~O)MgTyWP6}uQeuQT#1bGlFqRERd<_Mq=>lLgan6Ib2J97P7(}-UU7FI!946s zyey>ZwSLvEwNxpaE8Op)0>wu@G~1762{N;Fke|!aL~yd>hD^!1k#o<3vm5C%va!rd z`$aAW+VdjUP{U}h6uv4C(XXrg=vWmEo?^EdHG)RBQh3inW1uY$R|ZaZn!|571ROUd zk?Qikq3f6kU?TGF2ZPEib>C!0-`Z*jH{bW^Qg^*pMI z7`&XIdzT*_n?zL>jLhSt(C4J{pxh#Lej~#40_?G{C1PkjJ~W}PI9VBs;Y(EVk4J9g zgIW1ZeEb8(eB|EbqOi|J)sT`eaqs8w%|;4;HzIriVKFdYe*O96^+<2TDyU^HTAC<) z(nK|F1rkG80WxG9q_FBB)q;Hz-o#mqU6lMnZ!U@nzr%8pVrs(=Hf689M{_kp)m zD)e108z9(*J0Y);&W7>_P;Qg<746P58(MHDY@HPt@NaO$CXrr5qoB(s1@xN~^WnZt z8pL~N{@Uxt0GHy{EZ@KFMGB}b!sPPGq~yxW(61V{mr2R-!}8Feo@D&2Cs Date: Thu, 14 May 2026 13:44:58 +0200 Subject: [PATCH 2/2] SAS Packages Framework, version 20260514 # SAS Packages Framework, version `20260514` Code cleaning and fixes in user input verification. --- README.md | 2 +- SPF/Macros/bundlePackages.sas | 27 +- SPF/Macros/extendpackagesfileref.sas | 4 +- SPF/Macros/generatepackage.sas | 12 +- SPF/Macros/helppackage.sas | 4 +- SPF/Macros/installpackage.sas | 4 +- SPF/Macros/ispackagesfilerefok.sas | 4 +- SPF/Macros/listpackages.sas | 23 +- SPF/Macros/loadpackage.sas | 4 +- SPF/Macros/loadpackageaddcnt.sas | 4 +- SPF/Macros/loadpackages.sas | 4 +- SPF/Macros/previewpackage.sas | 4 +- SPF/Macros/relocatepackage.sas | 15 +- SPF/Macros/saspackagesframeworknotes.sas | 4 +- SPF/Macros/spfinit_intrnl_forcev7dsname.sas | 94 +++++++ SPF/Macros/spfint_gnpckg_arch.sas | 2 +- SPF/Macros/spfint_gnpckg_markdown.sas | 4 +- SPF/Macros/spfint_gnpckg_tests.sas | 2 +- SPF/Macros/splitcodeforpackage.sas | 4 +- SPF/Macros/unbundlePackages.sas | 37 ++- SPF/Macros/unloadpackage.sas | 4 +- SPF/Macros/verifypackage.sas | 4 +- SPF/SPFinit.md | 38 +-- SPF/SPFinit.sas | 272 ++++++++++++++------ 24 files changed, 410 insertions(+), 166 deletions(-) create mode 100644 SPF/Macros/spfinit_intrnl_forcev7dsname.sas diff --git a/README.md b/README.md index 9cdcfe7..aabf6ff 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Don't forget to give the repository a **STAR** and become [stargazer](https://gi ### Current version: -**The latest version** of the **SAS Packages Framework** is **`20260411`**. +**The latest version** of the **SAS Packages Framework** is **`20260514**. --- diff --git a/SPF/Macros/bundlePackages.sas b/SPF/Macros/bundlePackages.sas index 22a02bd..d5f34bf 100644 --- a/SPF/Macros/bundlePackages.sas +++ b/SPF/Macros/bundlePackages.sas @@ -8,7 +8,7 @@ ,packagesRef=packages ,ods= /* data set for report file */ )/ -des='Macro to create a bundle of SAS packages, version 20260411. Run %bundlePackages(HELP) for help info.' +des='Macro to create a bundle of SAS packages, version 20260514. Run %bundlePackages(HELP) for help info.' secure minoperator ; @@ -25,7 +25,7 @@ secure minoperator %put ### This is short help information for the `bundlePackages` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *create bundles* of SAS packages, version `20260411` #; + %put # Macro to *create bundles* of SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -62,7 +62,7 @@ secure minoperator %put # - `packagesRef=` *Optional.* Fileref to location of packages for the #; %put # bundle. Default value is `packages`. #; %put # #; - %put # - `ods=` *Optional.* Name of SAS data set for the report. #; + %put # - `ods=` *Optional.* V7 style name of SAS data set for report. #; %put # #; %put #-------------------------------------------------------------------------------#; %put # #; @@ -126,6 +126,13 @@ secure minoperator %let datetime = %sysfunc(datetime()); %let reportFile = WORK.tmpbundlefile%sysfunc(int(&datetime.), b8601dt15.)_; +%if NOT %sysevalf(%superq(ods)=,BOOLEAN) %then %do; + data _null_; /* verify ods= value */ + %SPFinit_intrnl_forceV7DSname(ods); + call symputX("ods",ods,"L"); + run; +%end; + data _null_ %if %superq(ods) NE %then %do; &ods. %end; %else %do; &reportFile.1 %end; ; @@ -399,8 +406,8 @@ put "INFO: The " bundleName "bundle creation ended."; ; format datetime e8601dt.; output - %if %superq(ods) NE %then %do; %scan(&ods.,1,()) %end; - %else %do; &reportFile.1 %end; + %if %superq(ods) NE %then %do; &ods. %end; + %else %do; &reportFile.1 %end; ; put " "; rc=sleep(1,1); @@ -408,13 +415,13 @@ stop; run; title2 "Summary of the bundle file";; -proc print - data= %if %superq(ods) NE %then %do; %scan(&ods.,1,()) %end; - %else %do; &reportFile.1 %end; - noObs label; +proc print noObs label + data= %if %superq(ods) NE %then %do; &ods. %end; + %else %do; &reportFile.1 %end; + ; var bundleName datetime BundleSHA256 path; run; -%if %superq(ods) NE %then %do; %put INFO: Report file: %scan(&ods.,1,()); %end; +%if %superq(ods) NE %then %do; %put INFO: Report file: &ods.; %end; %else %do; proc delete data=&reportFile.1; run; %end; diff --git a/SPF/Macros/extendpackagesfileref.sas b/SPF/Macros/extendpackagesfileref.sas index e56a5be..c3c329f 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 20260411. Run %extendPackagesFileref(HELP) for help info.' +des = 'Macro to list directories pointed by "packages" fileref, version 20260514. 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 20260411 %put ### This is short help information for the `extendPackagesFileref` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list directories pointed by 'packages' fileref, version `20260411` #; + %put # Macro to list directories pointed by 'packages' fileref, version `20260514` #; %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 5b2d15b..5de5d8c 100644 --- a/SPF/Macros/generatepackage.sas +++ b/SPF/Macros/generatepackage.sas @@ -53,7 +53,7 @@ when empty takes buildLocation */ )/ secure minoperator /*** HELP END ***/ -des = 'Macro to generate SAS packages, version 20260411. Run %generatePackage() for help info.' +des = 'Macro to generate SAS packages, version 20260514. Run %generatePackage() for help info.' ; %if (%superq(filesLocation) = ) OR (%qupcase(&filesLocation.) = HELP) %then %do; @@ -68,7 +68,7 @@ des = 'Macro to generate SAS packages, version 20260411. Run %generatePackage() %put ### This is short help information for the `generatePackage` macro #; %put #------------------------------------------------------------------------------------#; %put # #; - %put # Macro to generate SAS packages, version `20260411` #; + %put # Macro to generate SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -950,7 +950,7 @@ title6 "MD5 hashed fileref of package lowcase name: &_PackageFileref_."; title&_titleNumber_. "Package ZIP file location is: &buildLocation."; %end; -footnote1 "SAS Packages Framework, version 20260411"; +footnote1 "SAS Packages Framework, version 20260514"; proc print data = &filesWithCodes.(drop=base build folderRef fileRef rc folderid _abort_ fileId additionalContent) @@ -1775,7 +1775,7 @@ data _null_; %end; put +(-1) '`.;''' / ' !! '' %put The macro generated: '' !! put(dtCASLudf, E8601DT19.-L) !! ";"' - / ' !! '' %put with the SAS Packages Framework version 20260411.;''' + / ' !! '' %put with the SAS Packages Framework version 20260514.;''' / ' !! '' %put ****************************************************************************;''' / ' !! '' %GOTO theEndOfTheMacro;''' / ' !! '' %end;''' ; @@ -1939,7 +1939,7 @@ data _null_; %end; put +(-1) '`.; '' !!' / ''' %put The macro generated: ''' " !! put(dtIML, E8601DT19.-L) !! " '''; '' !! ' / - ''' %put with the SAS Packages Framework version 20260411.; '' !! ' / + ''' %put with the SAS Packages Framework version 20260514.; '' !! ' / ''' %put ****************************************************************************; '' !! ' / ''' %GOTO theEndOfTheMacro; '' !! ' / ''' %end; '' !! ' / @@ -2811,7 +2811,7 @@ data _null_; %end; put 'put " " / @3 "---------------------------------------------------------------------" / " ";' - / 'put @3 "*SAS package generated by SAS Package Framework, version `20260411`*";' + / 'put @3 "*SAS package generated by SAS Package Framework, version `20260514`*";' / "put @3 '*under `&sysscp.`(`&sysscpl.`) operating system,*';" / "put @3 '*using SAS release: `&sysvlong4.`.*';" / 'put " " / @3 "---------------------------------------------------------------------";'; diff --git a/SPF/Macros/helppackage.sas b/SPF/Macros/helppackage.sas index c8d523e..7c2f615 100644 --- a/SPF/Macros/helppackage.sas +++ b/SPF/Macros/helppackage.sas @@ -28,7 +28,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to get help about SAS package, version 20260411. Run %helpPackage() for help info.' +des = 'Macro to get help about SAS package, version 20260514. Run %helpPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -43,7 +43,7 @@ des = 'Macro to get help about SAS package, version 20260411. Run %helpPackage() %put ### This is short help information for the `helpPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get help about SAS packages, version `20260411` #; + %put # Macro to get help about SAS packages, version `20260514` #; %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/installpackage.sas b/SPF/Macros/installpackage.sas index 4446304..12bcc07 100644 --- a/SPF/Macros/installpackage.sas +++ b/SPF/Macros/installpackage.sas @@ -30,7 +30,7 @@ /secure minoperator /*** HELP END ***/ -des = 'Macro to install SAS package, version 20260411. Run %%installPackage() for help info.' +des = 'Macro to install SAS package, version 20260514. Run %%installPackage() for help info.' ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then %do; @@ -45,7 +45,7 @@ des = 'Macro to install SAS package, version 20260411. Run %%installPackage() fo %put ### This is short help information for the `installPackage` macro #; %put #--------------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to install SAS packages, version `20260411` #; + %put # Macro to install SAS packages, version `20260514` #; %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/ispackagesfilerefok.sas b/SPF/Macros/ispackagesfilerefok.sas index ed7c530..62d34b1 100644 --- a/SPF/Macros/ispackagesfilerefok.sas +++ b/SPF/Macros/ispackagesfilerefok.sas @@ -4,7 +4,7 @@ vERRb /* indicates if macro should be verbose and report errors */ ) / minoperator PARMBUFF -des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFilerefOK(HELP) for help, version 20260411.' +des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFilerefOK(HELP) for help, version 20260514.' ; /*** HELP END ***/ %if %QUPCASE(&SYSPBUFF.) = %str(%(HELP%)) %then @@ -20,7 +20,7 @@ des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFile %put ### This is short help information for the `isPackagesFilerefOK` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to check if the `packages` fileref is "correct", version `20260411` #; + %put # Macro to check if the `packages` fileref is "correct", version `20260514` #; %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/listpackages.sas b/SPF/Macros/listpackages.sas index acbc4b9..6b1749e 100644 --- a/SPF/Macros/listpackages.sas +++ b/SPF/Macros/listpackages.sas @@ -25,7 +25,7 @@ listDataSet /* Name of a data set to save results */ , quiet = 0 /* Indicate if results should be printed in log */ )/secure parmbuff -des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20260411.' +des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20260514.' ; %if (%QUPCASE(&listDataSet.) = HELP) %then %do; @@ -40,7 +40,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 `20260411` #; + %put # Macro to list available SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -101,14 +101,17 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE options NOnotes NOsource ls=MAX ps=MAX; -data _null_; - length listDataSet $ 41; - listDataSet = strip(scan(symget('listDataSet'),1,'( )')); - call symputX('listDataSet',listDataSet,"L"); - if not (listDataSet = " ") then - call symputX('listDataSetCheck',1,"L"); - else call symputX('quiet',0,"L"); -run; +%if %superq(listDataSet) NE %then + %do; + data _null_; /* verify listDataSet compatibility with V7 naming */ + %SPFinit_intrnl_forceV7DSname(listDataSet); + + call symputX('listDataSet',listDataSet,"L"); + if not (listDataSet = " ") then + call symputX('listDataSetCheck',1,"L"); + else call symputX('quiet',0,"L"); + run; + %end; data _null_ %if 1=&listDataSetCheck. %then diff --git a/SPF/Macros/loadpackage.sas b/SPF/Macros/loadpackage.sas index 3d56683..463c4f2 100644 --- a/SPF/Macros/loadpackage.sas +++ b/SPF/Macros/loadpackage.sas @@ -36,7 +36,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to load SAS package, version 20260411. Run %loadPackage() for help info.' +des = 'Macro to load SAS package, version 20260514. Run %loadPackage() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -52,7 +52,7 @@ minoperator %put ### This is short help information for the `loadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* SAS packages, version `20260411` #; + %put # Macro to *load* SAS packages, version `20260514` #; %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 b6bb962..f003f87 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 20260411. Run %loadPackageAddCnt() for help info.' +des = 'Macro to load additional content for a SAS package, version 20260514. 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 `20260411` #; + %put # Macro to *load* additional content for a SAS package, version `20260514` #; %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/loadpackages.sas b/SPF/Macros/loadpackages.sas index 2a79115..d123ce5 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 20260411. Run %loadPackages() for help info.' +des = 'Macro to load multiple SAS packages at one run, version 20260514. 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 `20260411` #; + %put # Macro wrapper for the loadPackage macro, version `20260514` #; %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 888cce9..2acd7b9 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 20260411. Run %previewPackage() for help info.' +des = 'Macro to preview content of a SAS package, version 20260514. 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 20260411. Run %preview %put ### This is short help information for the `previewPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get preview of a SAS packages, version `20260411` #; + %put # Macro to get preview of a SAS packages, version `20260514` #; %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/relocatepackage.sas b/SPF/Macros/relocatepackage.sas index 410d2ed..259074f 100644 --- a/SPF/Macros/relocatepackage.sas +++ b/SPF/Macros/relocatepackage.sas @@ -15,7 +15,7 @@ ,psMAX=MAX /* pageSise in case executed inside DoSubL() */ ,ods= /* a data set for results, e.g., work.relocatePackageReport */ ) -/ des = 'Utility macro that locally Copies or Moves Packages, version 20260411. Run %relocatePackage() for help info.' +/ des = 'Utility macro that locally Copies or Moves Packages, version 20260514. Run %relocatePackage() for help info.' secure minoperator ; @@ -33,7 +33,7 @@ %put ### This is short help information for the `relocatePackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *locally copy or move* (relocate) SAS packages, version `20260411` #; + %put # Macro to *locally copy or move* (relocate) SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -185,7 +185,14 @@ %put WARNING: Checksum verification impossible! Minimum SAS version required for the process is 9.4M6. ; %end; - data _null_ %if %superq(ods) NE %then %do; &ods. %end; + %if NOT %sysevalf(%superq(ods)=,BOOLEAN) %then %do; + data _null_; /* verify ods= value */ + %SPFinit_intrnl_forceV7DSname(ods); + call symputX("ods",ods,"L"); + run; + %end; + + data _null_ &ods. /* the &ods. will be used if not missing */ ; putlog 52*"*" 24*"=" 52*"*"; length packages source target $ 32767 sDevice tDevice $ 32; @@ -565,7 +572,7 @@ / "WARNING- Source is: " s_HASHING / "WARNING- Target is: " t_HASHING / "WARNING- There could be errors during copying. Check your files."; - %if %superq(ods) NE %then %do; output %scan(&ods.,1,()) ; %end; + output &ods.; /* the &ods. will be used if not missing */ end; %end; diff --git a/SPF/Macros/saspackagesframeworknotes.sas b/SPF/Macros/saspackagesframeworknotes.sas index 25d08f6..9294041 100644 --- a/SPF/Macros/saspackagesframeworknotes.sas +++ b/SPF/Macros/saspackagesframeworknotes.sas @@ -5,7 +5,7 @@ SPFmacroName /* space separated list of names */ / minoperator secure -des = 'Macro to provide help notes about SAS Packages Framework macros, version 20260411. Run %SasPackagesFrameworkNotes(HELP) for help info.' +des = 'Macro to provide help notes about SAS Packages Framework macros, version 20260514. Run %SasPackagesFrameworkNotes(HELP) for help info.' ; %local list N i element; %let list= @@ -51,7 +51,7 @@ SasPackagesFrameworkNotes %put ### This is short help information for the `SasPackagesFrameworkNotes` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro prints help notes for SAS Packages Framework macros, version `20260411` #; + %put # Macro prints help notes for SAS Packages Framework macros, version `20260514` #; %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/spfinit_intrnl_forcev7dsname.sas b/SPF/Macros/spfinit_intrnl_forcev7dsname.sas new file mode 100644 index 0000000..a511442 --- /dev/null +++ b/SPF/Macros/spfinit_intrnl_forcev7dsname.sas @@ -0,0 +1,94 @@ +/*+SPFinit_intrnl_forceV7DSname+*/ +%macro SPFinit_intrnl_forceV7DSname( +mcParam /* name of a macro parameter holding user provided data set name */ +)/secure minoperator +des='SAS Packages Framework internal macro. Executable only inside selected SPF macros. Macro generates 4GL code that forces V7 compatybility for user provided data set names. Version 20260514.'; +/* The macro can be called only inside a data step. */ +/**************************************************************************** + ### Parameters: + + `mcParam` - name of a macro parameter holding user provided data set name + + ### Behavior: + + Description: + The 4GL code SYMGETs macro variable value, SCANs only first + part of the string in case there are parenthesis "()" in it. + Then it COMPRESSes the string and keep _only_ digits, letters, + underscore, and period. All periods are TRANSLATEd to spaces. + If created string is not empty its last chunk is SCANned for + data set name, the second to last chunk is SCANned for libname + (if empty then "work" is used). First character of LIB and DS + variables is checked, if it is a digit, then underscore is added. + At the end the LIB and DS are concatenated and casted to upper + case letters. + + Examples: + + abc.xyz -> ABC.XYZ + ABC.XYZ(obs=42) -> ABC.XYZ + XYZ -> WORK.XYZ + abc. -> WORK.ABC + .XYZ -> WORK.XYZ + 123.456 -> _123._456 + A#B.x$y -> AB.XY + + Usecase: + Inside a macro for value check + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas + %macro A(ods); + data _null_; + %SPDinit_intrnl_forceV7DSname(ods); + call symputX("ods",ods,"L"); + run; + + %if %superq(ods) ne %then + %do; + data &ods.; + ... + run; + %end; + %mend; + + %A() + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +****************************************************************************/ +%local allowedSPFmacrosList; +%let allowedSPFmacrosList=LISTPACKAGES RELOCATEPACKAGE UNBUNDLEPACKAGES BUNDLEPACKAGES; +%if %sysmexecname(%sysmexecdepth-1) in (&allowedSPFmacrosList.) %then +%do; +/*=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=*/ + length &mcParam. $ 41 lib $ 8 ds $ 32; + /* force only V7 valid symbols */ + &mcParam. = symget("&mcParam."); + if NOT (&mcParam. = " ") then + do; + /* drop every illegal character */ + &mcParam. = compress(scan(&mcParam,1,'()'),'_.','kad'); + &mcParam. = cats(translate(&mcParam.," ",".")); + if NOT (&mcParam.=" ") then + do; + /* use 2 last blocks of symbols */ + lib = coalescec(scan(&mcParam.,-2),"work"); + ds = scan(&mcParam.,-1); + /* check first symbol, in case leading digit add _ */ + if ("0" <=: lib <=: "9") + then lib=cats("_",lib); + if ("0" <=: ds <=: "9") + then ds=cats("_",ds); + + &mcParam. = upcase(catx(".",lib,ds)); + end; + end; +/*=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=*/ +%end; +%else + %do; + %put INFO: SAS Packages Framework internal macro.; + %put INFO: Executable only inside &allowedSPFmacrosList. macros.; + %end; +%mend SPFinit_intrnl_forceV7DSname; + +/* end of SPFinit.sas file */ diff --git a/SPF/Macros/spfint_gnpckg_arch.sas b/SPF/Macros/spfint_gnpckg_arch.sas index 922035f..c184df9 100644 --- a/SPF/Macros/spfint_gnpckg_arch.sas +++ b/SPF/Macros/spfint_gnpckg_arch.sas @@ -1,6 +1,6 @@ /*+SPFint_gnPckg_arch+*/ %macro SPFint_gnPckg_arch()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the archive version generation part of the process. Version 20260411.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the archive version generation part of the process. Version 20260514.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; diff --git a/SPF/Macros/spfint_gnpckg_markdown.sas b/SPF/Macros/spfint_gnpckg_markdown.sas index f5507d9..b584573 100644 --- a/SPF/Macros/spfint_gnpckg_markdown.sas +++ b/SPF/Macros/spfint_gnpckg_markdown.sas @@ -1,6 +1,6 @@ /*+SPFint_gnPckg_markdown+*/ %macro SPFint_gnPckg_markdown()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the markdown documentation part of the process. Version 20260411.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the markdown documentation part of the process. Version 20260514.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; @@ -112,7 +112,7 @@ data &filesWithCodes.markdown; %end; put " " / "---------------------------------------------------------------------" / " " - / "*SAS package generated by SAS Package Framework, version `20260411`,*" + / "*SAS package generated by SAS Package Framework, version `20260514`,*" / "*under `&sysscp.`(`&sysscpl.`) operating system,*" / "*using SAS release: `&sysvlong4.`.*" / " " / "---------------------------------------------------------------------" / " "; diff --git a/SPF/Macros/spfint_gnpckg_tests.sas b/SPF/Macros/spfint_gnpckg_tests.sas index e3e552e..6c76336 100644 --- a/SPF/Macros/spfint_gnpckg_tests.sas +++ b/SPF/Macros/spfint_gnpckg_tests.sas @@ -1,6 +1,6 @@ /*+SPFint_gnPckg_tests+*/ %macro SPFint_gnPckg_tests()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the test part of the process. Version 20260411.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the test part of the process. Version 20260514.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; diff --git a/SPF/Macros/splitcodeforpackage.sas b/SPF/Macros/splitcodeforpackage.sas index adff3fe..827a6fe 100644 --- a/SPF/Macros/splitcodeforpackage.sas +++ b/SPF/Macros/splitcodeforpackage.sas @@ -8,7 +8,7 @@ ,nobs=0 /* technical parameter */ ) /*** HELP END ***/ -/ des = 'Utility macro to split "one big" code into multiple files for a SAS package, version 20260411. Run %splitCodeForPackage() for help info.' +/ des = 'Utility macro to split "one big" code into multiple files for a SAS package, version 20260514. Run %splitCodeForPackage() for help info.' ; %if (%superq(codeFile) = ) OR (%qupcase(&codeFile.) = HELP) %then %do; @@ -24,7 +24,7 @@ %put #-------------------------------------------------------------------------------#; %put # #; %put # Utility macro to *split* single file with SAS package code into multiple #; - %put # files with separate snippets, version `20260411` #; + %put # files with separate snippets, version `20260514` #; %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/unbundlePackages.sas b/SPF/Macros/unbundlePackages.sas index 9c876ef..fcfcf22 100644 --- a/SPF/Macros/unbundlePackages.sas +++ b/SPF/Macros/unbundlePackages.sas @@ -8,7 +8,7 @@ ,ods= /* data set for report file */ ,verify=0 )/ -des='Macro to extract a bundle of SAS packages, version 20260411. Run %unbundlePackages(HELP) for help info.' +des='Macro to extract a bundle of SAS packages, version 20260514. Run %unbundlePackages(HELP) for help info.' secure minoperator ; @@ -26,7 +26,7 @@ minoperator %put ### This is short help information for the `unbundlePackages` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *extract* SAS packages from a bundle, version `20260411` #; + %put # Macro to *extract* SAS packages from a bundle, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -58,7 +58,7 @@ minoperator %put # - `packagesRef=` *Optional.* Fileref to location where packages will #; %put # be extracted. Default value is `packages`. #; %put # #; - %put # - `ods=` *Optional.* Name of SAS data set for the report. #; + %put # - `ods=` *Optional.* V7 style name of SAS data set for report. #; %put # #; %put # - `verify=` *Optional.* Indicates if verification code should #; %put # be executed after bundle extraction. #; @@ -128,6 +128,13 @@ minoperator %let datetime = %sysfunc(datetime()); %let reportFile = WORK.tmpbundlefile%sysfunc(int(&datetime.), b8601dt15.)_; +%if NOT %sysevalf(%superq(ods)=,BOOLEAN) %then %do; + data _null_; /* verify ods= value */ + %SPFinit_intrnl_forceV7DSname(ods); + call symputX("ods",ods,"L"); + run; +%end; + data _null_; datetime=symgetn('datetime'); @@ -289,7 +296,12 @@ else packagesList = catx(" ", packagesList, package); end; -rc = Q.output(dataset:"&reportFile.1"); + +rc = Q.output(dataset: /* create propper tag */ + %if %superq(ods) NE %then %do; "&ods." %end; + %else %do; "&reportFile.1" %end; +); + /* code executed for unbundling */ length code1 code2 $ 32767; @@ -321,16 +333,14 @@ put " "; rc=sleep(1,1); rc = doSubL("title 'Summary of the extracted bundle file';" !! -"proc print data=" !! +"proc print label data=" !! +%if %superq(ods) NE %then %do; "&ods." %end; + %else %do; "&reportFile.1" %end; !! +"; var package pckVer pckDtm hash; run;" !! %if %superq(ods) NE %then - %do; "%scan(&ods.,1,())" %end; + %do; %put INFO: Report file: &ods.; %end; %else - %do; "&reportFile.1" %end; !! -" label; var package pckVer pckDtm hash; run;" !! -%if %superq(ods) NE %then - %do; %put INFO: Report file: %scan(&ods.,1,()); %end; -%else - %do; "proc delete data=&reportFile.1; run;" %end; !! + %do; "proc delete data=&reportFile.1; run;" !! %end; "title;"); stop; @@ -359,6 +369,7 @@ options mprint; ,path=R:\ ,packagesPath=R:\check2 ,verify=1 +,ods=WORK.bundlenametest124_reportDS ) %unbundlePackages( @@ -384,4 +395,4 @@ options mprint; */ -/* end of SPFinit.sas file */ + diff --git a/SPF/Macros/unloadpackage.sas b/SPF/Macros/unloadpackage.sas index d988b08..09aecf4 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 20260411. Run %unloadPackage() for help info.' +des = 'Macro to unload SAS package, version 20260514. 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 20260411. Run %unloadPackage() for h %put ### This is short help information for the `unloadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to unload SAS packages, version `20260411` #; + %put # Macro to unload SAS packages, version `20260514` #; %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 f392c6b..a923bef 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 20260411. Run %verifyPackage() for help info.' +des = 'Macro to verify SAS package with the hash digest, version 20260514. 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 20260411. Run % %put ### This is short help information for the `verifyPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to verify SAS package with it hash digest, version `20260411` #; + %put # Macro to verify SAS package with it hash digest, version `20260514` #; %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 9f3c0c2..394ee79 100644 --- a/SPF/SPFinit.md +++ b/SPF/SPFinit.md @@ -1,7 +1,7 @@ --- -# SAS Packages Framework, version `20260411` +# SAS Packages Framework, version `20260514` --- @@ -34,7 +34,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 **`20260411`**. +In this repository we are presenting the **SAS Packages Framework** which allows to develop and use SAS packages. The latest version of SPF is **`20260514`**. **To get started with SAS Packages** try this [**`Introduction to SAS Packages`**](https://youtube.com/playlist?list=PLeMzGEImIT5eV13IGXQIgWmTFCJt_cLZG&si=ElQm0_ifq76mvUbq "Introduction to SAS Packages video series") video series or [**`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). @@ -57,7 +57,7 @@ them using the SPF can be found [**HERE**](https://github.com/yabwon/HoW-SASPack ## This is short help information for the `installPackage` macro -------------------------------------------------------------------------------------------- - Macro to install SAS packages, version `20260411` + Macro to install SAS packages, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -210,7 +210,7 @@ filename packages "C:/SAS_PACKAGES"; ## This is short help information for the `helpPackage` macro ------------------------------------------------------------------------------- - Macro to get help about SAS packages, version `20260411` + Macro to get help about SAS packages, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -288,7 +288,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 `20260411` + Macro to *load* SAS packages, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -446,7 +446,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 `20260411` + Macro wrapper for the loadPackage macro, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -497,7 +497,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 `20260411` + Macro to unload SAS packages, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -564,7 +564,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 `20260411` + Macro to list available SAS packages, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -613,7 +613,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 `20260411` + Macro to verify SAS package with it hash digest, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -669,7 +669,7 @@ filename packages "C:/SAS_PACKAGES"; %* set-up a directory for packages; ## This is short help information for the `previewPackage` macro ------------------------------------------------------------------------------- - Macro to get preview of a SAS packages, version `20260411` + Macro to get preview of a SAS packages, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -738,7 +738,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 `20260411` + Macro to generate SAS packages, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -971,7 +971,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 `20260411` + Macro to list directories pointed by 'packages' fileref, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1013,7 +1013,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 `20260411` + Macro to load *additional content* for a SAS package, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1107,7 +1107,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ------------------------------------------------------------------------------- Utility macro to *split* single file with SAS package code into multiple - files with separate snippets, version `20260411` + files with separate snippets, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1188,7 +1188,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `relocatePackage` macro ------------------------------------------------------------------------------- - Macro to *locally copy or move* (relocate) SAS packages, version `20260411` + Macro to *locally copy or move* (relocate) SAS packages, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1300,7 +1300,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `isPackagesFilerefOK` macro ----------------------------------------------------------------------------------------- - Macro to check if the `packages` fileref is "correct", version `20260411` + Macro to check if the `packages` fileref is "correct", version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1351,7 +1351,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `SasPackagesFrameworkNotes` macro ------------------------------------------------------------------------------- - Macro prints help notes for SAS Packages Framework macros, version `20260411` + Macro prints help notes for SAS Packages Framework macros, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1401,7 +1401,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `bundlePackages` macro ------------------------------------------------------------------------------- - Macro to *create bundles* of SAS packages, version `20260411` + Macro to *create bundles* of SAS packages, version `20260514` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1470,7 +1470,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `unbundlePackages` macro ------------------------------------------------------------------------------- - Macro to *extract* SAS packages from a bundle, version `20260411` + Macro to *extract* SAS packages from a bundle, version `20260514` 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 f920405..c36fd8a 100644 --- a/SPF/SPFinit.sas +++ b/SPF/SPFinit.sas @@ -43,7 +43,7 @@ - to unload, or - to generate SAS packages. - Version 20260411. + SAS Packages Framework, version 20260514. See examples below. A SAS package is a zip file containing a group of files @@ -101,7 +101,7 @@ Contributors: */ )/secure /*** HELP END ***/ -des = 'Macro to load SAS package, version 20260411. Run %loadPackage() for help info.' +des = 'Macro to load SAS package, version 20260514. Run %loadPackage() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -117,7 +117,7 @@ minoperator %put ### This is short help information for the `loadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* SAS packages, version `20260411` #; + %put # Macro to *load* SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -398,7 +398,7 @@ minoperator */ )/secure /*** HELP END ***/ -des = 'Macro to unload SAS package, version 20260411. Run %unloadPackage() for help info.' +des = 'Macro to unload SAS package, version 20260514. Run %unloadPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -413,7 +413,7 @@ des = 'Macro to unload SAS package, version 20260411. Run %unloadPackage() for h %put ### This is short help information for the `unloadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to unload SAS packages, version `20260411` #; + %put # Macro to unload SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -568,7 +568,7 @@ des = 'Macro to unload SAS package, version 20260411. Run %unloadPackage() for h */ )/secure /*** HELP END ***/ -des = 'Macro to get help about SAS package, version 20260411. Run %helpPackage() for help info.' +des = 'Macro to get help about SAS package, version 20260514. Run %helpPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -583,7 +583,7 @@ des = 'Macro to get help about SAS package, version 20260411. Run %helpPackage() %put ### This is short help information for the `helpPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get help about SAS packages, version `20260411` #; + %put # Macro to get help about SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -728,7 +728,7 @@ TODO: */ /*+installPackage+*/ -/* Macros to install SAS packages, version 20260411 */ +/* Macros to install SAS packages, version 20260514 */ /* 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 @@ -759,7 +759,7 @@ TODO: /secure minoperator /*** HELP END ***/ -des = 'Macro to install SAS package, version 20260411. Run %%installPackage() for help info.' +des = 'Macro to install SAS package, version 20260514. Run %%installPackage() for help info.' ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then %do; @@ -774,7 +774,7 @@ des = 'Macro to install SAS package, version 20260411. Run %%installPackage() fo %put ### This is short help information for the `installPackage` macro #; %put #--------------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to install SAS packages, version `20260411` #; + %put # Macro to install SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -1644,7 +1644,7 @@ des = 'Macro to install SAS package, version 20260411. Run %%installPackage() fo Macro to list SAS packages in packages folder. - Version 20260411 + Version 20260514 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1666,7 +1666,7 @@ des = 'Macro to install SAS package, version 20260411. Run %%installPackage() fo listDataSet /* Name of a data set to save results */ , quiet = 0 /* Indicate if results should be printed in log */ )/secure parmbuff -des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20260411.' +des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20260514.' ; %if (%QUPCASE(&listDataSet.) = HELP) %then %do; @@ -1681,7 +1681,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 `20260411` #; + %put # Macro to list available SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -1742,14 +1742,17 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE options NOnotes NOsource ls=MAX ps=MAX; -data _null_; - length listDataSet $ 41; - listDataSet = strip(scan(symget('listDataSet'),1,'( )')); - call symputX('listDataSet',listDataSet,"L"); - if not (listDataSet = " ") then - call symputX('listDataSetCheck',1,"L"); - else call symputX('quiet',0,"L"); -run; +%if %superq(listDataSet) NE %then + %do; + data _null_; /* verify listDataSet compatibility with V7 naming */ + %SPFinit_intrnl_forceV7DSname(listDataSet); + + call symputX('listDataSet',listDataSet,"L"); + if not (listDataSet = " ") then + call symputX('listDataSetCheck',1,"L"); + else call symputX('quiet',0,"L"); + run; + %end; data _null_ %if 1=&listDataSetCheck. %then @@ -1907,7 +1910,7 @@ options ls = &ls_tmp. ps = &ps_tmp. ¬es_tmp. &source_tmp.; Macro to generate SAS packages. - Version 20260411 + Version 20260514 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1957,7 +1960,7 @@ options ls = &ls_tmp. ps = &ps_tmp. ¬es_tmp. &source_tmp.; when empty takes buildLocation */ )/ secure minoperator /*** HELP END ***/ -des = 'Macro to generate SAS packages, version 20260411. Run %generatePackage() for help info.' +des = 'Macro to generate SAS packages, version 20260514. Run %generatePackage() for help info.' ; %if (%superq(filesLocation) = ) OR (%qupcase(&filesLocation.) = HELP) %then %do; @@ -1972,7 +1975,7 @@ des = 'Macro to generate SAS packages, version 20260411. Run %generatePackage() %put ### This is short help information for the `generatePackage` macro #; %put #------------------------------------------------------------------------------------#; %put # #; - %put # Macro to generate SAS packages, version `20260411` #; + %put # Macro to generate SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -2854,7 +2857,7 @@ title6 "MD5 hashed fileref of package lowcase name: &_PackageFileref_."; title&_titleNumber_. "Package ZIP file location is: &buildLocation."; %end; -footnote1 "SAS Packages Framework, version 20260411"; +footnote1 "SAS Packages Framework, version 20260514"; proc print data = &filesWithCodes.(drop=base build folderRef fileRef rc folderid _abort_ fileId additionalContent) @@ -3679,7 +3682,7 @@ data _null_; %end; put +(-1) '`.;''' / ' !! '' %put The macro generated: '' !! put(dtCASLudf, E8601DT19.-L) !! ";"' - / ' !! '' %put with the SAS Packages Framework version 20260411.;''' + / ' !! '' %put with the SAS Packages Framework version 20260514.;''' / ' !! '' %put ****************************************************************************;''' / ' !! '' %GOTO theEndOfTheMacro;''' / ' !! '' %end;''' ; @@ -3843,7 +3846,7 @@ data _null_; %end; put +(-1) '`.; '' !!' / ''' %put The macro generated: ''' " !! put(dtIML, E8601DT19.-L) !! " '''; '' !! ' / - ''' %put with the SAS Packages Framework version 20260411.; '' !! ' / + ''' %put with the SAS Packages Framework version 20260514.; '' !! ' / ''' %put ****************************************************************************; '' !! ' / ''' %GOTO theEndOfTheMacro; '' !! ' / ''' %end; '' !! ' / @@ -4715,7 +4718,7 @@ data _null_; %end; put 'put " " / @3 "---------------------------------------------------------------------" / " ";' - / 'put @3 "*SAS package generated by SAS Package Framework, version `20260411`*";' + / 'put @3 "*SAS package generated by SAS Package Framework, version `20260514`*";' / "put @3 '*under `&sysscp.`(`&sysscpl.`) operating system,*';" / "put @3 '*using SAS release: `&sysvlong4.`.*';" / 'put " " / @3 "---------------------------------------------------------------------";'; @@ -5154,7 +5157,7 @@ options &qlenmax_fstimer_tmp.; /*+SPFint_gnPckg_tests+*/ %macro SPFint_gnPckg_tests()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the test part of the process. Version 20260411.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the test part of the process. Version 20260514.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; @@ -5836,7 +5839,7 @@ options "elenmax_tmp.; /*+SPFint_gnPckg_markdown+*/ %macro SPFint_gnPckg_markdown()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the markdown documentation part of the process. Version 20260411.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the markdown documentation part of the process. Version 20260514.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; @@ -5948,7 +5951,7 @@ data &filesWithCodes.markdown; %end; put " " / "---------------------------------------------------------------------" / " " - / "*SAS package generated by SAS Package Framework, version `20260411`,*" + / "*SAS package generated by SAS Package Framework, version `20260514`,*" / "*under `&sysscp.`(`&sysscpl.`) operating system,*" / "*using SAS release: `&sysvlong4.`.*" / " " / "---------------------------------------------------------------------" / " "; @@ -6089,7 +6092,7 @@ options &MarkDownOptionsTmp.; /*+SPFint_gnPckg_arch+*/ %macro SPFint_gnPckg_arch()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the archive version generation part of the process. Version 20260411.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the archive version generation part of the process. Version 20260514.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; @@ -6256,7 +6259,7 @@ TODO: (in Polish) */ )/secure /*** HELP END ***/ -des = 'Macro to load multiple SAS packages at one run, version 20260411. Run %loadPackages() for help info.' +des = 'Macro to load multiple SAS packages at one run, version 20260514. Run %loadPackages() for help info.' parmbuff ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then @@ -6272,7 +6275,7 @@ parmbuff %put ### This is short help information for the `loadPackageS` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro wrapper for the loadPackage macro, version `20260411` #; + %put # Macro wrapper for the loadPackage macro, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -6370,7 +6373,7 @@ parmbuff hashing_file() function, SAS 9.4M6 */ )/secure /*** HELP END ***/ -des = 'Macro to verify SAS package with the hash digest, version 20260411. Run %verifyPackage() for help info.' +des = 'Macro to verify SAS package with the hash digest, version 20260514. Run %verifyPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -6385,7 +6388,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20260411. Run % %put ### This is short help information for the `verifyPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to verify SAS package with it hash digest, version `20260411` #; + %put # Macro to verify SAS package with it hash digest, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -6601,7 +6604,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20260411. Run % */ )/secure /*** HELP END ***/ -des = 'Macro to preview content of a SAS package, version 20260411. Run %previewPackage() for help info.' +des = 'Macro to preview content of a SAS package, version 20260514. Run %previewPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -6616,7 +6619,7 @@ des = 'Macro to preview content of a SAS package, version 20260411. Run %preview %put ### This is short help information for the `previewPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get preview of a SAS packages, version `20260411` #; + %put # Macro to get preview of a SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -6750,7 +6753,7 @@ des = 'Macro to preview content of a SAS package, version 20260411. Run %preview when empty the "packages" value is used */ )/secure /*** HELP END ***/ -des = 'Macro to list directories pointed by "packages" fileref, version 20260411. Run %extendPackagesFileref(HELP) for help info.' +des = 'Macro to list directories pointed by "packages" fileref, version 20260514. Run %extendPackagesFileref(HELP) for help info.' ; %if %QUPCASE(&packages.) = HELP %then @@ -6766,7 +6769,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20260411 %put ### This is short help information for the `extendPackagesFileref` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list directories pointed by 'packages' fileref, version `20260411` #; + %put # Macro to list directories pointed by 'packages' fileref, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -6868,7 +6871,7 @@ filename packages list; is provided in required version */ )/secure /*** HELP END ***/ -des = 'Macro to load additional content for a SAS package, version 20260411. Run %loadPackageAddCnt() for help info.' +des = 'Macro to load additional content for a SAS package, version 20260514. Run %loadPackageAddCnt() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -6884,7 +6887,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 `20260411` #; + %put # Macro to *load* additional content for a SAS package, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -7255,7 +7258,7 @@ minoperator ,nobs=0 /* technical parameter */ ) /*** HELP END ***/ -/ des = 'Utility macro to split "one big" code into multiple files for a SAS package, version 20260411. Run %splitCodeForPackage() for help info.' +/ des = 'Utility macro to split "one big" code into multiple files for a SAS package, version 20260514. Run %splitCodeForPackage() for help info.' ; %if (%superq(codeFile) = ) OR (%qupcase(&codeFile.) = HELP) %then %do; @@ -7271,7 +7274,7 @@ minoperator %put #-------------------------------------------------------------------------------#; %put # #; %put # Utility macro to *split* single file with SAS package code into multiple #; - %put # files with separate snippets, version `20260411` #; + %put # files with separate snippets, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -7647,7 +7650,7 @@ options nomprint nosymbolgen nomlogic notes source ls=MAX ps=MAX msglevel=N ; */ if firstLine[j] then do; - put '/* File generated with help of SAS Packages Framework, version 20260411. */'; + put '/* File generated with help of SAS Packages Framework, version 20260514. */'; firstLine[j]=0; end; put _infile_; @@ -7680,7 +7683,7 @@ options &options_tmp2.; ,psMAX=MAX /* pageSise in case executed inside DoSubL() */ ,ods= /* a data set for results, e.g., work.relocatePackageReport */ ) -/ des = 'Utility macro that locally Copies or Moves Packages, version 20260411. Run %relocatePackage() for help info.' +/ des = 'Utility macro that locally Copies or Moves Packages, version 20260514. Run %relocatePackage() for help info.' secure minoperator ; @@ -7698,7 +7701,7 @@ options &options_tmp2.; %put ### This is short help information for the `relocatePackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *locally copy or move* (relocate) SAS packages, version `20260411` #; + %put # Macro to *locally copy or move* (relocate) SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -7850,7 +7853,14 @@ options &options_tmp2.; %put WARNING: Checksum verification impossible! Minimum SAS version required for the process is 9.4M6. ; %end; - data _null_ %if %superq(ods) NE %then %do; &ods. %end; + %if NOT %sysevalf(%superq(ods)=,BOOLEAN) %then %do; + data _null_; /* verify ods= value */ + %SPFinit_intrnl_forceV7DSname(ods); + call symputX("ods",ods,"L"); + run; + %end; + + data _null_ &ods. /* the &ods. will be used if not missing */ ; putlog 52*"*" 24*"=" 52*"*"; length packages source target $ 32767 sDevice tDevice $ 32; @@ -8230,7 +8240,7 @@ options &options_tmp2.; / "WARNING- Source is: " s_HASHING / "WARNING- Target is: " t_HASHING / "WARNING- There could be errors during copying. Check your files."; - %if %superq(ods) NE %then %do; output %scan(&ods.,1,()) ; %end; + output &ods.; /* the &ods. will be used if not missing */ end; %end; @@ -8356,7 +8366,7 @@ filename PACKAGES ("R:\testPackages2" "R:\testPackages1"); vERRb /* indicates if macro should be verbose and report errors */ ) / minoperator PARMBUFF -des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFilerefOK(HELP) for help, version 20260411.' +des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFilerefOK(HELP) for help, version 20260514.' ; /*** HELP END ***/ %if %QUPCASE(&SYSPBUFF.) = %str(%(HELP%)) %then @@ -8372,7 +8382,7 @@ des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFile %put ### This is short help information for the `isPackagesFilerefOK` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to check if the `packages` fileref is "correct", version `20260411` #; + %put # Macro to check if the `packages` fileref is "correct", version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -8506,7 +8516,7 @@ SPFmacroName /* space separated list of names */ / minoperator secure -des = 'Macro to provide help notes about SAS Packages Framework macros, version 20260411. Run %SasPackagesFrameworkNotes(HELP) for help info.' +des = 'Macro to provide help notes about SAS Packages Framework macros, version 20260514. Run %SasPackagesFrameworkNotes(HELP) for help info.' ; %local list N i element; %let list= @@ -8552,7 +8562,7 @@ SasPackagesFrameworkNotes %put ### This is short help information for the `SasPackagesFrameworkNotes` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro prints help notes for SAS Packages Framework macros, version `20260411` #; + %put # Macro prints help notes for SAS Packages Framework macros, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -8675,7 +8685,7 @@ options mlogic symbolgen; ,packagesRef=packages ,ods= /* data set for report file */ )/ -des='Macro to create a bundle of SAS packages, version 20260411. Run %bundlePackages(HELP) for help info.' +des='Macro to create a bundle of SAS packages, version 20260514. Run %bundlePackages(HELP) for help info.' secure minoperator ; @@ -8692,7 +8702,7 @@ secure minoperator %put ### This is short help information for the `bundlePackages` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *create bundles* of SAS packages, version `20260411` #; + %put # Macro to *create bundles* of SAS packages, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -8729,7 +8739,7 @@ secure minoperator %put # - `packagesRef=` *Optional.* Fileref to location of packages for the #; %put # bundle. Default value is `packages`. #; %put # #; - %put # - `ods=` *Optional.* Name of SAS data set for the report. #; + %put # - `ods=` *Optional.* V7 style name of SAS data set for report. #; %put # #; %put #-------------------------------------------------------------------------------#; %put # #; @@ -8793,6 +8803,13 @@ secure minoperator %let datetime = %sysfunc(datetime()); %let reportFile = WORK.tmpbundlefile%sysfunc(int(&datetime.), b8601dt15.)_; +%if NOT %sysevalf(%superq(ods)=,BOOLEAN) %then %do; + data _null_; /* verify ods= value */ + %SPFinit_intrnl_forceV7DSname(ods); + call symputX("ods",ods,"L"); + run; +%end; + data _null_ %if %superq(ods) NE %then %do; &ods. %end; %else %do; &reportFile.1 %end; ; @@ -9066,8 +9083,8 @@ put "INFO: The " bundleName "bundle creation ended."; ; format datetime e8601dt.; output - %if %superq(ods) NE %then %do; %scan(&ods.,1,()) %end; - %else %do; &reportFile.1 %end; + %if %superq(ods) NE %then %do; &ods. %end; + %else %do; &reportFile.1 %end; ; put " "; rc=sleep(1,1); @@ -9075,13 +9092,13 @@ stop; run; title2 "Summary of the bundle file";; -proc print - data= %if %superq(ods) NE %then %do; %scan(&ods.,1,()) %end; - %else %do; &reportFile.1 %end; - noObs label; +proc print noObs label + data= %if %superq(ods) NE %then %do; &ods. %end; + %else %do; &reportFile.1 %end; + ; var bundleName datetime BundleSHA256 path; run; -%if %superq(ods) NE %then %do; %put INFO: Report file: %scan(&ods.,1,()); %end; +%if %superq(ods) NE %then %do; %put INFO: Report file: &ods.; %end; %else %do; proc delete data=&reportFile.1; run; %end; @@ -9177,7 +9194,7 @@ filename p2 "R:/dontexist"; ,ods= /* data set for report file */ ,verify=0 )/ -des='Macro to extract a bundle of SAS packages, version 20260411. Run %unbundlePackages(HELP) for help info.' +des='Macro to extract a bundle of SAS packages, version 20260514. Run %unbundlePackages(HELP) for help info.' secure minoperator ; @@ -9195,7 +9212,7 @@ minoperator %put ### This is short help information for the `unbundlePackages` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *extract* SAS packages from a bundle, version `20260411` #; + %put # Macro to *extract* SAS packages from a bundle, version `20260514` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -9227,7 +9244,7 @@ minoperator %put # - `packagesRef=` *Optional.* Fileref to location where packages will #; %put # be extracted. Default value is `packages`. #; %put # #; - %put # - `ods=` *Optional.* Name of SAS data set for the report. #; + %put # - `ods=` *Optional.* V7 style name of SAS data set for report. #; %put # #; %put # - `verify=` *Optional.* Indicates if verification code should #; %put # be executed after bundle extraction. #; @@ -9297,6 +9314,13 @@ minoperator %let datetime = %sysfunc(datetime()); %let reportFile = WORK.tmpbundlefile%sysfunc(int(&datetime.), b8601dt15.)_; +%if NOT %sysevalf(%superq(ods)=,BOOLEAN) %then %do; + data _null_; /* verify ods= value */ + %SPFinit_intrnl_forceV7DSname(ods); + call symputX("ods",ods,"L"); + run; +%end; + data _null_; datetime=symgetn('datetime'); @@ -9458,7 +9482,12 @@ else packagesList = catx(" ", packagesList, package); end; -rc = Q.output(dataset:"&reportFile.1"); + +rc = Q.output(dataset: /* create propper tag */ + %if %superq(ods) NE %then %do; "&ods." %end; + %else %do; "&reportFile.1" %end; +); + /* code executed for unbundling */ length code1 code2 $ 32767; @@ -9490,16 +9519,14 @@ put " "; rc=sleep(1,1); rc = doSubL("title 'Summary of the extracted bundle file';" !! -"proc print data=" !! +"proc print label data=" !! +%if %superq(ods) NE %then %do; "&ods." %end; + %else %do; "&reportFile.1" %end; !! +"; var package pckVer pckDtm hash; run;" !! %if %superq(ods) NE %then - %do; "%scan(&ods.,1,())" %end; + %do; %put INFO: Report file: &ods.; %end; %else - %do; "&reportFile.1" %end; !! -" label; var package pckVer pckDtm hash; run;" !! -%if %superq(ods) NE %then - %do; %put INFO: Report file: %scan(&ods.,1,()); %end; -%else - %do; "proc delete data=&reportFile.1; run;" %end; !! + %do; "proc delete data=&reportFile.1; run;" !! %end; "title;"); stop; @@ -9528,6 +9555,7 @@ options mprint; ,path=R:\ ,packagesPath=R:\check2 ,verify=1 +,ods=WORK.bundlenametest124_reportDS ) %unbundlePackages( @@ -9553,4 +9581,98 @@ options mprint; */ + +/*+SPFinit_intrnl_forceV7DSname+*/ +%macro SPFinit_intrnl_forceV7DSname( +mcParam /* name of a macro parameter holding user provided data set name */ +)/secure minoperator +des='SAS Packages Framework internal macro. Executable only inside selected SPF macros. Macro generates 4GL code that forces V7 compatybility for user provided data set names. Version 20260514.'; +/* The macro can be called only inside a data step. */ +/**************************************************************************** + ### Parameters: + + `mcParam` - name of a macro parameter holding user provided data set name + + ### Behavior: + + Description: + The 4GL code SYMGETs macro variable value, SCANs only first + part of the string in case there are parenthesis "()" in it. + Then it COMPRESSes the string and keep _only_ digits, letters, + underscore, and period. All periods are TRANSLATEd to spaces. + If created string is not empty its last chunk is SCANned for + data set name, the second to last chunk is SCANned for libname + (if empty then "work" is used). First character of LIB and DS + variables is checked, if it is a digit, then underscore is added. + At the end the LIB and DS are concatenated and casted to upper + case letters. + + Examples: + + abc.xyz -> ABC.XYZ + ABC.XYZ(obs=42) -> ABC.XYZ + XYZ -> WORK.XYZ + abc. -> WORK.ABC + .XYZ -> WORK.XYZ + 123.456 -> _123._456 + A#B.x$y -> AB.XY + + Usecase: + Inside a macro for value check + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas + %macro A(ods); + data _null_; + %SPDinit_intrnl_forceV7DSname(ods); + call symputX("ods",ods,"L"); + run; + + %if %superq(ods) ne %then + %do; + data &ods.; + ... + run; + %end; + %mend; + + %A() + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +****************************************************************************/ +%local allowedSPFmacrosList; +%let allowedSPFmacrosList=LISTPACKAGES RELOCATEPACKAGE UNBUNDLEPACKAGES BUNDLEPACKAGES; +%if %sysmexecname(%sysmexecdepth-1) in (&allowedSPFmacrosList.) %then +%do; +/*=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=*/ + length &mcParam. $ 41 lib $ 8 ds $ 32; + /* force only V7 valid symbols */ + &mcParam. = symget("&mcParam."); + if NOT (&mcParam. = " ") then + do; + /* drop every illegal character */ + &mcParam. = compress(scan(&mcParam,1,'()'),'_.','kad'); + &mcParam. = cats(translate(&mcParam.," ",".")); + if NOT (&mcParam.=" ") then + do; + /* use 2 last blocks of symbols */ + lib = coalescec(scan(&mcParam.,-2),"work"); + ds = scan(&mcParam.,-1); + /* check first symbol, in case leading digit add _ */ + if ("0" <=: lib <=: "9") + then lib=cats("_",lib); + if ("0" <=: ds <=: "9") + then ds=cats("_",ds); + + &mcParam. = upcase(catx(".",lib,ds)); + end; + end; +/*=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=*/ +%end; +%else + %do; + %put INFO: SAS Packages Framework internal macro.; + %put INFO: Executable only inside &allowedSPFmacrosList. macros.; + %end; +%mend SPFinit_intrnl_forceV7DSname; + /* end of SPFinit.sas file */