From: Lam Voong <lkv@berkeley.edu>
Date: Wed, 20 Jul 2016 23:11:55 +0000 (-0700)
Subject: CSPACE-6948
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=02d2d9ce64b1c3d51b7c3e05365afc602116caf1;p=tmp%2Fjakarta-migration.git

CSPACE-6948

updated query to display message when no objects are related.
---

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml
index 46c3d5648..da03c2ec6 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml
@@ -32,31 +32,26 @@ end AS site,
 ong.objectName AS "objectname",
 case when (bd.item is not null and bd.item <> '') then
  regexp_replace(bd.item, '^.*\)''(.*)''$', '\1')
+ when co.objectnumber is null then 'No objects are related to this Object Exit.'
  else ''
 end AS description,
 case when (oppp.objectproductionpeople is not null and oppp.objectproductionpeople <> '') then
  regexp_replace(oppp.objectproductionpeople, '^.*\)''(.*)''$', '\1')
  else ''
 end as productionpeople
-
-FROM objectexit_common oec
-JOIN hierarchy h1 ON (oec.id=h1.id)
+FROM hierarchy h1
+JOIN objectexit_common oec ON (oec.id=h1.id)
 LEFT OUTER JOIN relations_common rc1 ON (h1.name=rc1.subjectcsid)
 LEFT OUTER JOIN hierarchy h2 ON (rc1.objectcsid=h2.name)
 LEFT OUTER JOIN collectionobjects_common co ON (h2.id=co.id)
-
 LEFT OUTER JOIN hierarchy h3 ON (co.id = h3.parentid AND h3.primarytype='objectNameGroup' AND h3.pos=0)
 LEFT OUTER JOIN objectnamegroup ong ON (ong.id=h3.id)
-
 LEFT OUTER JOIN collectionobjects_common_briefdescriptions bd ON (bd.id=co.id and bd.pos=0)
-
 left outer join hierarchy h4 on (co.id=h4.parentid and h4.pos=0 and h4.name='collectionobjects_common:objectProductionPeopleGroupList')
 left outer join objectproductionpeoplegroup oppp on (oppp.id=h4.id)
 left outer join hierarchy h5 on (oec.id=h5.parentid and h5.name='objectexit_common:exitDateGroup')
 left outer join structureddategroup dg on (dg.id=h5.id)
-
-WHERE rc1.subjectcsid = $P{csid}
-
+WHERE h1.name = $P{csid}
 ORDER BY objectnumber]]>
 	</queryString>
 	<field name="exitnumber" class="java.lang.String"/>