From 22eea4a168f6b3ba67f288f0572da4bffd226b72 Mon Sep 17 00:00:00 2001
From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 27 Jul 2011 21:41:05 +0000
Subject: [PATCH] CSPACE-4252 - Sample reports should not include deleted
 documents, so modified example report to exclude deleted docs.

---
 .../src/main/resources/acq_basic.jasper       | Bin 52267 -> 52392 bytes
 .../src/main/resources/acq_basic.jrxml        |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper
index ca81228b2e6e3107993f1fe3be7a82082ddf57fa..b2b633e022aaf69009c6073716b2050573ee0b60 100644
GIT binary patch
delta 2259
zcmZ{mUr1Y59LLYO*FP~y)h;G%+UiYejZ+&<th&;5YP(eJ($s%js$1u7lWWYpO|HqE
zRtCCJW?M#C-S456c7^Rp7!2VetS}hEfm<1DFdT)wY>d8*u?`ACAG&+aiQB#AHV?mh
ze!uVUobTtH9Ju%M6@K+5zg81*si^X8aaIh-VmcWZQM0LZ5`;({ehfX4Civ%^8)hQU
zavTpIMwZ<+74gA9+YDOZ%2b5uz^(;P_u$f#BjHH+#3*=&YBY%c#4p+hqS5fMaO%uJ
zRPZV9oR?E^U%+=Em5ciX5`{BS`V9C|37>FGm`X`mF&m$nrv-bgKRg^3;+d=zP^Gk(
zR#OSRNy!m!H>V=oPBmY`DryjVqc5{H<&<|)iqFSoDW{66BzTVr{)8k;s+92C^E0&1
zh9B~7A3}3~A%qcGxKUBaqZw9T8})@$R5aMz7uGBI3pVG!<^|H`huYWxZicDYaDBT~
z7ioHl5TjoZLZ#3a>(bjjX9uf~KD8a*JKMXbS)qP(nq8mP1b1Q%;K!c9A<Z*Zj^W6g
zPG}o{11I6yxay$LG)%+$qHB@mY>6a7w~s6OkH8oO`DsGhLeS^aePnl5nkEC&Zy}39
zX-N&_CgINOe^9cX=ZI-qA*Y2tP*L&lKwtkTsb%1|aj)YF8Pafxa3@%9!EF>w+(yB~
zofmXMGxsIvZLQ+Ci_kr>57y3IWt>jNNsou2-69nlRwx?FEzpdD3C$>&(DFh7+RFcE
zA3IiwKMhIZKg4nif1_aXHwq?yCTKlxRbk9FdzYBeuueD2atkw~U@|ibCNn0`|KO<c
zUaiBnxDT&``+O!3u}L6k*q{(Bw}3DTCJ3Wof?z@+#0E6R>+l9NwfZ3wzk+{;?Rd<-
zMXoi0*?@2A8(=X}QL;o*c2>WVAr1E_Cd(}_je-f&D3~zwLcztj51)Fgv{$6ABD@6)
zvIlOaJoo{urM`CjNoZ(zKxjr-Zb4%dOf*KpM3Wa37<%;}6i*L29uY4Zwuo0P%PqX9
z0Lvklz}g?N9@FY<GJHGTtDky_oYdbpX*rCSpu5BC<T>4n2JQ*`F1r#eFSN=xGQqel
zlVCL75eg3Z36vk%52q&f!qSCVM+E^OfqP5<hFER^U=&OMM!^KY1Z_I)z}1fK9{t6D
zkaNza$4WB1NUka8fa{r)o)_9eogHn5J3A+WouOb?dnv*gwSYHw04kKe%H6UysoX6o
zW7W=%!&>8<QdHQq`tJ2Th1LG64~zNBf7fa+epF+FYd7k~4syrK5XU!Q<W6QYnb~>v
ziEvs{#S^la%h~uwj2i0WWLz)CXC`v`r-Lj_1lxnb-DFO_iLKUbLs<Lq#&$7o(!Tq|
z*#f2aJeB^jO;jFp@y~zB*N<tuA2z=~P}!0%9%987?a;liuxt0iDr$x0{chO%L-oHA
CO2l*k

delta 2133
zcmZ{kZ%7nr9LJw$Mr%jZQ(QOL^meV()-2sHSMS<#yUZ&#HS^fEL^E5$+V;kC(BKXu
zvg4w#@(2B)xZ_?}Q4qoecfrN6FRVlE#f2dCT6)tzklqw!HoxZ?YsPtQVSmp2K3|{T
zXC9uNn^)x9m*w&0(ab(FL{GuGsL!a)(F*haOw=nGjT_Mmg-bLd2iH{_IccdzD7$d!
zJ9jovs^}xlvoiI={kGzg0!bq-Es^R@X}t&4e#{q8jY$41^G5gWo|OyzgbcnSgc1yt
zsVe>nKxwRfMYTpUS|d%3Mu*<v|MMw4gt1b%8rx0-@HE!u4T@42+6cS$L~;TuTYyXx
zLR>H#tEtGsrMtdq`L4O0&8+|b1?Kidj47MryJ@u!@m%^v4?YcPFxDdT|J@yd3(3{+
zcyEv<V7{XPcI>MOr*JeYy?k&lA=kF3#^)1Aad5~9pu4MJJzs%mQqBx6#VmeUShRPv
z;{!9;T9{OEf5<6~WVUT@`nDZs9)<iwN%&{HWaWgwi&KFY2h7Wwv3Z%m;dKHcRc=Wd
zfc(xe?&nJKZQx2*P>Gd`0wqobN*pjHYsRKz0*BJY&q_t`xN9JM9UWLn2pl*SIB<Xt
zK5NG2z=3{$znfD2z<=N{R&>EIP6fj_z+qomGqzzIuygUX^~~saNL1rEz<7_F>M(lX
zdsAitWmriIWH=SbaKLuonz6}n;FL+jSdWjUp`xlBUiAE;JTlY_3-SP3tG<M*2ZLEt
zXp3TLNUth`mwqMN!|sQ%$#?MyUa~SR5a(1N&H)p*W^CdnFdXc^uxa?c#I6662xZWz
z(ZiK=2G$<_JNyhqSeX%sa4Hbt07d-Pj7`J@Fdr|6lSf*@uW=MBQ-V>P3Py2&qkPtk
zZIqdbBqQ_@oJ<~~Z{c~ekq$%f=!)a`ZkE{#dd@kQ0hu`G+Cb8B9BsgAu>cnBygVe$
zL2i996m{l<oEkWugFaZKw*ntd1wK|_^RWV(j|uQNs_HQnpTT(N!<*DQud<oF|4H_s
z%V^~pUvjJ;l@!QPw|PSKp}N}o4WYWOn)Nlc!QfItDX9e7w-U~(O?iv4KBL}SqVR60
zc7r}PsAf1rr9Yj|adsz8&t}S--cRWF&MkM*GWhMZ$G>>}Y`Ik0q7X?gbD>BPjQ?1y
z$N}D~fOnU?v{H{=ev?T9dgHIzl`uT%QOe^FNp7q_UJdG`8+J{4^46H0wSUU1;<~&>
Uzcu+6&0joB8|_{OBma6o0-a@@00000

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
index 337482b54..bb5c3944e 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
@@ -35,7 +35,8 @@
 FROM
      "public"."acquisitions_common" acquisitions_common INNER JOIN "public"."hierarchy" hierarchy ON acquisitions_common."id" = hierarchy."id"
 INNER JOIN "public"."collectionspace_core" core ON acquisitions_common."id" = core."id"
-WHERE core.tenantid = $P{tenantid}
+INNER JOIN "public"."misc" misc ON misc."id" = hierarchy."id"
+WHERE core.tenantid = $P{tenantid} AND misc.lifecyclestate != 'deleted'
 $P!{where_clause}]]>
 	</queryString>
 	<field name="acquisitions_common_originalobjectpurchasepricevalue" class="java.lang.String"/>
-- 
2.47.3