Add support for authority display names (#325)

* Add display name support for Authorities in order to provide a standard name to the services layer
* Update authorities to include a display name
* Update authority vocab titles to match cspace-ui.js or the respective profile plugin

Author: mikejritter

cspi-installation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java

@@ -716,7 +716,6 @@ private void doRefnameDisplayNameField(Record record, Element ele, Namespace thi
      * @param thisns
      * @param isAuthority
      */
-
 	private void doDocHandlerParams(Record r, Element el, Namespace nsservices2, Boolean isAuthority) {
 		//<service:DocHandlerParams>
 		Element dhele = el.addElement(new QName("DocHandlerParams", nsservices2));
@@ -902,6 +901,7 @@ private void addAuthorities(Record r, Element el, String serviceBindingVersion)
 		bindingsForAuthority.addAttribute("id", r.getServicesTenantAuthPl());
 		bindingsForAuthority.addAttribute("type", RECORD_TYPE_UTILITY);
 		bindingsForAuthority.addAttribute("version", serviceBindingVersion);
+		bindingsForAuthority.addAttribute("displayName", r.getServicesTenantAuthDisplayName());
 		bindingsForAuthority.addAttribute(Record.SUPPORTS_REPLICATING, Boolean.toString(r.supportsReplicating()));
 		bindingsForAuthority.addAttribute(Record.REQUIRES_UNIQUE_SHORTID, Boolean.TRUE.toString());
 		String remoteClientConfigName = r.getRemoteClientConfigName();
@@ -952,7 +952,7 @@ private void addServiceBinding(Record r, Element el, Namespace nameSpace, Boolea
 			doDocHandlerParams(r, el, this.nsservices, isAuthority);
 
 			//<service:AuthorityInstanceList>
-			if (isAuthority == true || r.isType(RECORD_TYPE_VOCABULARY) == true) {
+			if (isAuthority || r.isType(RECORD_TYPE_VOCABULARY)) {
 				doAuthorityInstanceList(r, el, this.nsservices);
 			}
 

cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java

@@ -38,6 +38,8 @@ public class Record implements FieldParent {
 	private static final String TYPE_AUTHORITY = "Authority";
 	private static final String TYPE_AUTHORITY_LOWERCASE = TYPE_AUTHORITY.toLowerCase();
 
+	public static final String AUTH_DISPLAY_NAME = "services-tenant-auth-display-name";
+
 	public static final String ELASTICSEARCH_INDEXED = "elasticsearchIndexed";
 	public static final String SUPPORTS_LOCKING = "supportslocking";
 	public static final String SUPPORTS_REPLICATING = "supportsReplicating";
@@ -257,6 +259,7 @@ public void setLastAuthorityProxy(Record lastAuthoriyProxy) {
 		utils.initStrings(section, "services-tenant-plural", utils.getString("services-tenant-singular") + "s");
 		utils.initStrings(section, "services-tenant-auth-singular", utils.getString("services-url"));
 		utils.initStrings(section, "services-tenant-auth-plural", utils.getString("services-tenant-singular") + "s");
+		utils.initStrings(section, AUTH_DISPLAY_NAME, utils.getString("services-tenant-singular"));
 
 		utils.initStrings(section, "services-schema-location", "http://services.collectionspace.org");
 
@@ -827,6 +830,10 @@ public String getServicesTenantAuthSg() {
 		return utils.getString("services-tenant-auth-singular");
 	}
 
+	public String getServicesTenantAuthDisplayName() {
+		return utils.getString(AUTH_DISPLAY_NAME);
+	}
+
 	/*
 	 * By convention, the value from getServicesTenantSg() is the Nuxeo doctype
 	 * name. However, if the record explicitly declares a doctype using the
@@ -1442,4 +1449,5 @@ public void setSortKey(String fieldId, String sortFieldId) {
 	public String getSortKey(String fieldId) {
 		return sortKeys.get(fieldId);
 	}
+
 }

tomcat-main/src/main/resources/defaults/base-authority-chronology.xml

@@ -4,6 +4,7 @@
 
   <services-tenant-auth-plural>Chronologyauthorities</services-tenant-auth-plural>
   <services-tenant-auth-singular>Chronologyauthority</services-tenant-auth-singular>
+	<services-tenant-auth-display-name>Chronology</services-tenant-auth-display-name>
   <services-tenant-singular>Chronology</services-tenant-singular>
   <services-tenant-plural>Chronologies</services-tenant-plural>
 
@@ -31,12 +32,12 @@
     <instance id="chronology-era">
       <web-url>era</web-url>
       <title-ref>era</title-ref>
-      <title>Era Chronologies</title>
+      <title>Era</title>
     </instance>
     <instance id="chronology-event">
       <web-url>event</web-url>
       <title-ref>event</title-ref>
-      <title>Event Chronologies</title>
+      <title>Event</title>
     </instance>
   </instances>
 
@@ -91,4 +92,4 @@
     <field id="proposed" mini="list" datatype="boolean" />
     <field id="deprecated" mini="list" datatype="boolean" />
   </section>
-</record>
+</record>

tomcat-main/src/main/resources/defaults/base-authority-citation.xml

@@ -5,6 +5,7 @@
 
 	<services-tenant-auth-singular>Citationauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Citationauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Citation</services-tenant-auth-display-name>
 	<services-tenant-singular>Citation</services-tenant-singular>
 
 	<services-instances-path>citationauthorities_common:http://collectionspace.org/services/citation,abstract-common-list/list-item</services-instances-path>
@@ -30,12 +31,12 @@
 		<instance id="citation-citation">
 			<web-url>citation</web-url>
 			<title-ref>citation</title-ref>
-			<title>Local Citations</title>
+			<title>Local</title>
 		</instance>
 		<instance id="citation-worldcat">
 			<web-url>worldcat</web-url>
 			<title-ref>worldcat</title-ref>
-			<title>WorldCat Citations</title>
+			<title>WorldCat</title>
 		</instance>
 	</instances>
 

tomcat-main/src/main/resources/defaults/base-authority-concept.xml

@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Conceptauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Conceptauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Concept</services-tenant-auth-display-name>
 	<services-tenant-singular>Concept</services-tenant-singular>
 	<services-tenant-doctype>Conceptitem</services-tenant-doctype>
 
@@ -33,17 +34,17 @@
 		<instance id="concept-concept">
 			<web-url>concept</web-url>
 			<title-ref>concept</title-ref>
-			<title>Associated Concepts</title>
+			<title>Associated</title>
 		</instance>
 		<instance id="concept-material_ca">
 			<web-url>material_ca</web-url>
 			<title-ref>material_ca</title-ref>
-			<title>Material Concepts</title>
+			<title>Material</title>
 		</instance>
 		<instance id="concept-activity">
 			<web-url>activity</web-url>
 			<title-ref>activity</title-ref>
-			<title>Activity Concepts</title>
+			<title>Activity</title>
 		</instance>
 		<instance id="concept-nomenclature">
 			<web-url>nomenclature</web-url>
@@ -65,18 +66,18 @@
 		<instance id="concept-occasion">
 			<web-url>occasion</web-url>
 			<title-ref>occasion</title-ref>
-			<title>Occasion Concepts</title>
+			<title>Occasion</title>
 		</instance>
 		<!-- NAGPRA Culture fields -->
 		<instance id="concept-ethculture">
 			<web-url>ethculture</web-url>
 			<title-ref>ethculture</title-ref>
-			<title>Ethnographic Cultures</title>
+			<title>Cultural Group</title>
 		</instance>
 		<instance id="concept-archculture">
 			<web-url>archculture</web-url>
 			<title-ref>archculture</title-ref>
-			<title>Archaeological Cultures</title>
+			<title>Archaeological Culture</title>
 		</instance>
 	</instances>
 

tomcat-main/src/main/resources/defaults/base-authority-location.xml

@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Locationauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Locationauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Storage Location</services-tenant-auth-display-name>
 	<services-tenant-singular>Location</services-tenant-singular>
 	<services-tenant-doctype>Locationitem</services-tenant-doctype>
 
@@ -30,12 +31,12 @@
 		<instance id="location-location">
 			<web-url>location</web-url>
 			<title-ref>location</title-ref>
-			<title>Local Storage Locations</title>
+			<title>Local</title>
 		</instance>
 		<instance id="location-offsite_sla">
 			<web-url>offsite_sla</web-url>
 			<title-ref>offsite_sla</title-ref>
-			<title>Offsite Storage Locations</title>
+			<title>Offsite</title>
 		</instance>
 	</instances>
 

tomcat-main/src/main/resources/defaults/base-authority-material.xml

@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Materialauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Materialauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Material</services-tenant-auth-display-name>
 	<services-tenant-singular>Material</services-tenant-singular>
 	<services-tenant-doctype>Materialitem</services-tenant-doctype>
 

tomcat-main/src/main/resources/defaults/base-authority-organization.xml

@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-plural>Orgauthorities</services-tenant-auth-plural>
 	<services-tenant-auth-singular>Orgauthority</services-tenant-auth-singular>
+	<services-tenant-auth-display-name>Organization</services-tenant-auth-display-name>
 	<services-tenant-singular>Organization</services-tenant-singular>
 
 	<services-instances-path>orgauthorities_common:http://collectionspace.org/services/organization,abstract-common-list/list-item</services-instances-path>
@@ -31,12 +32,12 @@
 		<instance id="organization-organization">
 			<web-url>organization</web-url>
 			<title-ref>organization</title-ref>
-			<title>Local Organizations</title>
+			<title>Local</title>
 		</instance>
 		<instance id="organization-ulan_oa">
 			<web-url>ulan_oa</web-url>
 			<title-ref>ulan_oa</title-ref>
-			<title>ULAN Organizations</title>
+			<title>ULAN</title>
 		</instance>
 	</instances>
 

tomcat-main/src/main/resources/defaults/base-authority-person.xml

@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Personauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Personauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Person</services-tenant-auth-display-name>
 	<services-tenant-singular>Person</services-tenant-singular>
 
 	<services-instances-path>personauthorities_common:http://collectionspace.org/services/person,abstract-common-list/list-item</services-instances-path>
@@ -32,12 +33,12 @@
 		<instance id="person-person">
 			<web-url>person</web-url>
 			<title-ref>person</title-ref>
-			<title>Local Persons</title>
+			<title>Local</title>
 		</instance>
 		<instance id="person-ulan_pa">
 			<web-url>ulan_pa</web-url>
 			<title-ref>ulan_pa</title-ref>
-			<title>ULAN Persons</title>
+			<title>ULAN</title>
 		</instance>
 	</instances>
 

tomcat-main/src/main/resources/defaults/base-authority-place.xml

@@ -4,6 +4,7 @@
 
 	<services-tenant-auth-singular>Placeauthority</services-tenant-auth-singular>
 	<services-tenant-auth-plural>Placeauthorities</services-tenant-auth-plural>
+	<services-tenant-auth-display-name>Place</services-tenant-auth-display-name>
 	<services-tenant-singular>Place</services-tenant-singular>
 	<services-tenant-doctype>Placeitem</services-tenant-doctype>
 
@@ -33,17 +34,17 @@
 		<instance id="place-place">
 			<web-url>place</web-url>
 			<title-ref>place</title-ref>
-			<title>Local Places</title>
+			<title>Local</title>
 		</instance>
 		<instance id="place-tgn_place">
 			<web-url>tgn_place</web-url>
 			<title-ref>tgn_place</title-ref>
-			<title>Thesaurus of Geographic Names</title>
+			<title>TGN</title>
 		</instance>
 		<instance id="place-archaeological">
 			<web-url>archaeological</web-url>
 			<title-ref>archaeological</title-ref>
-			<title>Archaeological Site</title>
+			<title>Archaeological</title>
 		</instance>
 	</instances>