From: Richard Millet <richard.millet@berkeley.edu>
Date: Fri, 31 Aug 2012 07:23:36 +0000 (-0700)
Subject: CSPACE-5488: Added code to put a refname in the CollectionSpace_Core schema for all... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=4b6ae75b05fb5154005bf49487db9e7b5096cfaf;p=tmp%2Fjakarta-migration.git

CSPACE-5488: Added code to put a refname in the CollectionSpace_Core schema for all records/resources.
---

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd
index 3a557f64e..7c9389798 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd
@@ -17,6 +17,7 @@
 
     <xs:element name="tenantId" type="xs:string"/>
     <xs:element name="uri" type="xs:string"/>
+    <xs:element name="refname" type="xs:string"/>
     <!--<xs:element name="createdAt" type="xs:string"/>-->
     <xs:element name="createdAt" type="xs:dateTime"/>
     <xs:element name="updatedAt" type="xs:dateTime"/>
diff --git a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
index a1eb74d2e..940983708 100644
--- a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
@@ -39,6 +39,7 @@ public interface CollectionSpaceClient<CLT, REQUEST_TYPE, RESPONSE_TYPE, P exten
     public final static String COLLECTIONSPACE_CORE_SCHEMA = "collectionspace_core";
     public final static String COLLECTIONSPACE_CORE_TENANTID = "tenantId";
     public final static String COLLECTIONSPACE_CORE_URI = "uri";
+    public final static String COLLECTIONSPACE_CORE_REFNAME = "refname";
     public final static String COLLECTIONSPACE_CORE_CREATED_AT = "createdAt";
     public final static String COLLECTIONSPACE_CORE_UPDATED_AT = "updatedAt";
     public final static String COLLECTIONSPACE_CORE_CREATED_BY = "createdBy";
diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/RefName.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/RefName.java
index 5473dd35a..053d9bb4c 100644
--- a/services/common-api/src/main/java/org/collectionspace/services/common/api/RefName.java
+++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/RefName.java
@@ -97,6 +97,18 @@ public class RefName {
             String displaySuffix = (displayName != null && (!displayName.isEmpty())) ? '\'' + displayName + '\'' : "";
             return URN_PREFIX + tenantName + ':' + resource + ":" + "name" + "(" + shortIdentifier + ")" + displaySuffix;
         }
+
+        public static Authority buildAuthority(String tenantName, String serviceName, String authorityShortIdentifier, String authorityDisplayName) {
+            Authority authority = new Authority();
+            authority.tenantName = tenantName;
+            authority.resource = serviceName;
+            if (Tools.notEmpty(authority.resource)) {
+                authority.resource = authority.resource.toLowerCase();
+            }
+            authority.shortIdentifier = authorityShortIdentifier;
+            authority.displayName = authorityDisplayName;
+            return authority;
+        }
     }
 
     public static class AuthorityItem {
@@ -159,21 +171,9 @@ public class RefName {
         }
     }
 
-    public static Authority buildAuthority(String tenantName, String serviceName, String authorityShortIdentifier, String authorityDisplayName) {
-        Authority authority = new Authority();
-        authority.tenantName = tenantName;
-        authority.resource = serviceName;
-        if (Tools.notEmpty(authority.resource)) {
-            authority.resource = authority.resource.toLowerCase();
-        }
-        authority.shortIdentifier = authorityShortIdentifier;
-        authority.displayName = authorityDisplayName;
-        return authority;
-    }
-
     public static AuthorityItem buildAuthorityItem(String tenantName, String serviceName, String authorityShortIdentifier,
             String itemShortIdentifier, String itemDisplayName) {
-        Authority authority = buildAuthority(tenantName, serviceName, authorityShortIdentifier, "");
+        Authority authority = Authority.buildAuthority(tenantName, serviceName, authorityShortIdentifier, "");
         return buildAuthorityItem(authority, itemShortIdentifier, itemDisplayName);
     }
 
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 cee119ce0..b6a315468 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
@@ -72,9 +72,10 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
 
     private AbstractCommonList commonList;
     
-    protected static final int NUM_STANDARD_LIST_RESULT_FIELDS = 4;
+    protected static final int NUM_STANDARD_LIST_RESULT_FIELDS = 5;
     protected static final String STANDARD_LIST_CSID_FIELD = "csid";
     protected static final String STANDARD_LIST_URI_FIELD = CollectionSpaceClient.COLLECTIONSPACE_CORE_URI;
+    protected static final String STANDARD_LIST_REFNAME_FIELD = CollectionSpaceClient.COLLECTIONSPACE_CORE_REFNAME;
     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 = "related";
@@ -150,7 +151,13 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
         throw new UnsupportedOperationException();
     }
 
-	public static String getUpdatedAtAsString(DocumentModel docModel) throws Exception {
+	protected static String getRefname(DocumentModel docModel) throws Exception {
+		String result = (String)docModel.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA,
+				CollectionSpaceClient.COLLECTIONSPACE_CORE_REFNAME);
+		return result;
+	}
+	
+	protected static String getUpdatedAtAsString(DocumentModel docModel) throws Exception {
 			GregorianCalendar cal = (GregorianCalendar)
 								docModel.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA,
 										CollectionSpaceClient.COLLECTIONSPACE_CORE_UPDATED_AT);
@@ -160,7 +167,6 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
 
     @Override
     public AbstractCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
-        String classname = getDocHandlerParams().getAbstractCommonListClassname();
     	CommonList commonList = new CommonList();
         String markRtSbj = null;
     	RepositoryInstance repoSession = null;
@@ -194,13 +200,14 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
 	        	nFields++;
 	        	baseFields++;
 	        }
-	        String fields[] = new String[nFields];
+	        String fields[] = new String[nFields]; // REM - Why can't this just be a static array defined once at the top?  Then there'd be no need for these hardcoded "[x]" statements and no need for NUM_STANDARD_LIST_RESULT_FIELDS constant as well. 
 	        fields[0] = STANDARD_LIST_CSID_FIELD;
 	        fields[1] = STANDARD_LIST_URI_FIELD;
-	        fields[2] = STANDARD_LIST_UPDATED_AT_FIELD;
-	        fields[3] = STANDARD_LIST_WORKFLOW_FIELD;
-	        if(markRtSbj!=null) {
-	            fields[4] = STANDARD_LIST_MARK_RT_FIELD;
+	        fields[2] = STANDARD_LIST_REFNAME_FIELD;
+	        fields[3] = STANDARD_LIST_UPDATED_AT_FIELD;
+	        fields[4] = STANDARD_LIST_WORKFLOW_FIELD;
+	        if(markRtSbj != null) {
+	            fields[5] = STANDARD_LIST_MARK_RT_FIELD;
 	        }
 	        for(int i = baseFields; i < nFields; i++) {
 	        	ListResultField field = resultsFields.get(i - baseFields); 
@@ -226,6 +233,7 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
 		        }
 				String uri = getUri(docModel);
 				item.put(STANDARD_LIST_URI_FIELD, uri);
+				item.put(STANDARD_LIST_REFNAME_FIELD, getRefname(docModel));
 				item.put(STANDARD_LIST_UPDATED_AT_FIELD,
 						getUpdatedAtAsString(docModel));
 				item.put(STANDARD_LIST_WORKFLOW_FIELD,
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
index 5cdd32abe..537f234ee 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
@@ -35,6 +35,7 @@ import org.collectionspace.services.client.IRelationsManager;
 import org.collectionspace.services.client.PoxPayloadIn;
 import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.api.GregorianCalendarDateTimeUtils;
+import org.collectionspace.services.common.api.RefName;
 import org.collectionspace.services.common.authorityref.AuthorityRefList;
 import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.AbstractMultipartDocumentHandlerImpl;
@@ -317,6 +318,14 @@ public abstract class DocumentModelHandler<T, TL>
             //
             documentModel.setProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA,
             		CollectionSpaceClient.COLLECTIONSPACE_CORE_URI, getUri(documentModel));
+            //
+            // Add the resource's refname
+            //
+            String csid = documentModel.getName();
+            String refname = RefName.Authority.buildAuthority(ctx.getTenantName(), ctx.getServiceName(),
+            		csid, "" /*authorityDisplayName*/).toString();
+            documentModel.setProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA,
+            		CollectionSpaceClient.COLLECTIONSPACE_CORE_REFNAME, refname);            
         	//
         	// Add the CSID to the DublinCore title so we can see the CSID in the default
         	// Nuxeo webapp.