From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Tue, 24 Jul 2012 23:03:48 +0000 (-0700)
Subject: CSPACE-5381 Added refinements to only consider relations that are not soft deleted.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=118bd6c2bced64b95ac6e11dd1a2c790971384a2;p=tmp%2Fjakarta-migration.git

CSPACE-5381 Added refinements to only consider relations that are not soft deleted.
---

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
index c8f4efbc7..a70986917 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
@@ -79,7 +79,7 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
     protected static final String STANDARD_LIST_URI_FIELD = CollectionSpaceClient.COLLECTIONSPACE_CORE_URI;
     protected static final String STANDARD_LIST_UPDATED_AT_FIELD = CollectionSpaceClient.COLLECTIONSPACE_CORE_UPDATED_AT;
     protected static final String STANDARD_LIST_WORKFLOW_FIELD = CollectionSpaceClient.COLLECTIONSPACE_CORE_WORKFLOWSTATE;
-    protected static final String STANDARD_LIST_MARK_RT_FIELD = "relTo";
+    protected static final String STANDARD_LIST_MARK_RT_FIELD = "related";
 
     @Override
     public AbstractCommonList getCommonPartList() {
@@ -242,7 +242,9 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
 				item.put(STANDARD_LIST_CSID_FIELD, id);
 		        if(markRtSbj!=null) {
 		            String relationClause = RelationsUtils.buildWhereClause(markRtSbj, null, null, id, null);
-		            QueryContext queryContext = new QueryContext(sc, relationClause);
+		            String whereClause = relationClause + IQueryManager.SEARCH_QUALIFIER_AND + 
+		            						NuxeoUtils.buildWorkflowNotDeletedWhereClause();
+		            QueryContext queryContext = new QueryContext(sc, whereClause);
 		            queryContext.setDocType(IRelationsManager.DOC_TYPE);
 		            String query = NuxeoUtils.buildNXQLQuery(sc, queryContext);
 		            // Search for 1 relation that matches. 1 is enough to fail the filter
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
index b18bdf78a..a3ed9fb36 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
@@ -400,6 +400,10 @@ public class NuxeoUtils {
         return query.toString();
     }
     
+    static public final String buildWorkflowNotDeletedWhereClause() {
+    	return "ecm:currentLifeCycleState <> 'deleted'";
+    }
+    
     
     /**
      * Builds an NXQL SELECT query across multiple document types.