From 1fd6fa8f449f88a5c3e15f30511e4fab8498e361 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@berkeley.edu>
Date: Tue, 4 Sep 2012 12:23:07 -0700
Subject: [PATCH] CSPACE-5492: Fixed a problem in the XML schema related to the
 definition of the refname display name field.

---
 .../vocabulary/nuxeo/AuthorityDocumentModelHandler.java   | 1 +
 .../config/services/tenants/tenant-bindings-proto.xml     | 8 +++-----
 .../nuxeo/client/java/RemoteDocumentModelHandlerImpl.java | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
index d611aa0a1..48b8b06f7 100644
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
@@ -133,6 +133,7 @@ public abstract class AuthorityDocumentModelHandler<AuthCommon>
 	                ctx.getServiceName(),
 	                shortIdentifier,
 	                displayName);
+	        refname = authority;
     	} catch (Exception e) {
     		logger.error(e.getMessage(), e);
     	}
diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index d3f151e0f..65b346ccc 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -88,11 +88,9 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                 	<service:SupportsHierarchy>false</service:SupportsHierarchy>
-                	<service:RefnameDisplayNameField>
-                        <service:ListResultField>
-                            <service:element>objectNumber</service:element>
-                            <service:xpath>objectNumber</service:xpath>
-                        </service:ListResultField>
+                	<service:RefnameDisplayNameField> <!-- The field used as the display name in an object's refname -->
+	                    <service:element>objectNumber</service:element>
+	                    <service:xpath>objectNumber</service:xpath>
                 	</service:RefnameDisplayNameField>
                     <service:ListResultsFields>
                         <service:ListResultField>
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
index ba58abf30..7ac8b2c87 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
@@ -140,7 +140,7 @@ public abstract class   RemoteDocumentModelHandlerImpl<T, TL>
     	return getRefnameDisplayName(docWrapper.getWrappedObject());
     }
 	
-	private String getRefnameDisplayName(DocumentModel docModel) {
+	private String getRefnameDisplayName(DocumentModel docModel) { // Look in the tenant bindings to see what field should be our display name for our refname value
 		String result = null;
 		
     	DocHandlerParams.Params params = null;
-- 
2.47.3