From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 27 Jul 2011 21:41:05 +0000 (+0000)
Subject: CSPACE-4252 - Sample reports should not include deleted documents, so modified exampl... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=22eea4a168f6b3ba67f288f0572da4bffd226b72;p=tmp%2Fjakarta-migration.git

CSPACE-4252 - Sample reports should not include deleted documents, so modified example report to exclude deleted docs.
---

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 ca81228b2..b2b633e02 100644
Binary files a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper and b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper differ
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"/>