From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 28 Mar 2013 01:11:15 +0000 (-0700)
Subject: CSPACE-5943: Incorporate check for deleted workflow state in sample SQL query.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6dba07bf54b06c1487f0d7d3dac04b15ff3fcbfd;p=tmp%2Fjakarta-migration.git

CSPACE-5943: Incorporate check for deleted workflow state in sample SQL query.
---

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
index eda28777f..03b065480 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
@@ -923,13 +923,16 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
         // FIXME: Replace this placeholder query with an actual query resulting
         // from CSPACE-5945 work
         String sql =
-                "SELECT DISTINCT hierarchy.id as id "
+                "SELECT DISTINCT hierarchy.id as id"
                 + " FROM hierarchy "
                 + " LEFT JOIN hierarchy h1 "
-	        + "   ON h1.parentid = hierarchy.id "
+	        + "  ON h1.parentid = hierarchy.id "
                 + " LEFT JOIN " + handler.getJDBCQueryParams().get(JDBC_TABLE_NAME_PARAM) + " tg "
 	        + "   ON tg.id = h1.id "
-                + " WHERE tg.termdisplayname ILIKE ?";
+                + " LEFT JOIN misc "
+	        + "   ON misc.id = hierarchy.id "
+                + " WHERE (tg.termdisplayname ILIKE ?) "
+                + "   AND (misc.lifecyclestate <> 'deleted') ";
         
         PreparedStatementBuilder jdbcFilterBuilder = new PreparedStatementBuilder(sql){
             @Override