From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 6 Jan 2010 23:51:58 +0000 (+0000)
Subject: CSPACE-149. Updated to add displayName in, computed from shortName (on get). Fixed... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=73f39f029da70fac07d65e75f4657345bd25b406;p=tmp%2Fjakarta-migration.git

CSPACE-149. Updated to add displayName in, computed from shortName (on get). Fixed typos in refName generation in the Base Import. Tweaked some labels etc. in the nuxeo layout to make it easier to debug orgs.
---

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
index e0db2b20e..ca5555761 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -17,7 +17,7 @@
 
       <widget name="displayName" type="text">
         <labels>
-          <label mode="any">Name</label>
+          <label mode="any">Display Name</label>
         </labels>
         <translated>true</translated>
         <fields>
@@ -64,6 +64,7 @@
         <template mode="any">/layouts/layout_default_template.xhtml</template>
       </templates>
       <rows>
+        <row><widget>displayName</widget></row>
         <row><widget>shortName</widget></row>
         <row><widget>refName</widget></row>
         <row><widget>inAuthority</widget></row>
@@ -77,9 +78,22 @@
         <row><widget>description</widget></row>
       </rows>
 
+      <widget name="displayName" type="text">
+        <labels>
+          <label mode="any">Display Name</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="orgauthorities_common">displayName</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
       <widget name="shortName" type="text">
         <labels>
-          <label mode="any">Name</label>
+          <label mode="any">ShortName</label>
         </labels>
         <translated>true</translated>
         <fields>
diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
index 5e4bacb44..f66283d5d 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
@@ -24,6 +24,7 @@
 		<!--  inAuthority is the csid of the owning OrgAuthority -->
 		<xs:element name="inAuthority" type="xs:string" />
 		<xs:element name="refName" type="xs:string"/>
+		<xs:element name="displayName" type="xs:string"/>
 		<xs:element name="shortName" type="xs:string"/>
 		<xs:element name="longName" type="xs:string"/>
 		<xs:element name="nameAdditions" type="xs:string"/>
diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java
index 6d6f5026c..930505300 100644
--- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java
+++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java
@@ -527,7 +527,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest {
                 logger.debug("  " + testName + ": list-item[" + i + "] csid=" +
                         item.getCsid());
                 logger.debug("  " + testName + ": list-item[" + i + "] shortName=" +
-                        item.getShortName());
+                        item.getDisplayName());
                 logger.debug("  " + testName + ": list-item[" + i + "] URI=" +
                         item.getUri());
                 i++;
diff --git a/services/organization/import/src/main/java/org/collectionspace/services/organization/importer/OrgAuthorityBaseImport.java b/services/organization/import/src/main/java/org/collectionspace/services/organization/importer/OrgAuthorityBaseImport.java
index 6e513de50..af7c71409 100644
--- a/services/organization/import/src/main/java/org/collectionspace/services/organization/importer/OrgAuthorityBaseImport.java
+++ b/services/organization/import/src/main/java/org/collectionspace/services/organization/importer/OrgAuthorityBaseImport.java
@@ -69,10 +69,10 @@ public class OrgAuthorityBaseImport {
     	if(logger.isDebugEnabled()){
     		logger.debug("Import: Create orgAuthority: \"" + orgAuthorityName +"\"");
     	}
-    	String baseOrgRefName = createOrgAuthRefName(orgAuthorityName);
-    	String fullOrgRefName = baseOrgRefName+"'"+orgAuthorityName+"'";
+    	String baseOrgAuthRefName = createOrgAuthRefName(orgAuthorityName);
+    	String fullOrgAuthRefName = baseOrgAuthRefName+"'"+orgAuthorityName+"'";
     	MultipartOutput multipart = createOrgAuthorityInstance(orgAuthorityName, 
-    			fullOrgRefName);
+    			fullOrgAuthRefName);
     	ClientResponse<Response> res = client.create(multipart);
 
     	int statusCode = res.getStatus();
@@ -94,7 +94,7 @@ public class OrgAuthorityBaseImport {
     				+newOrgAuthorityId );
     	}
     	for(List<String> orgStrings : orgInfo){
-    		createItemInAuthority(newOrgAuthorityId, baseOrgRefName, orgStrings);
+    		createItemInAuthority(newOrgAuthorityId, baseOrgAuthRefName, orgStrings);
     	}
     }
     
@@ -109,7 +109,7 @@ public class OrgAuthorityBaseImport {
 	        foundingDate, dissolutionDate, foundingPlace, function, description
 		 */		
     	String shortName = orgStrings.get(0);
-    	String refName = createOrganizationRefName(orgAuthorityRefName, shortName);
+    	String refName = createOrganizationRefName(orgAuthorityRefName, shortName)+"'"+shortName+"'";
 
     	if(logger.isDebugEnabled()){
     		logger.debug("Import: Create Item: \""+shortName
@@ -231,7 +231,7 @@ public class OrgAuthorityBaseImport {
     }
     
     protected String createOrgAuthRefName(String orgAuthorityName) {
-    	return "urn:cspace:org.collectionspace.demo:personauthority:name("
+    	return "urn:cspace:org.collectionspace.demo:orgauthority:name("
     			+orgAuthorityName+")";
     }
 
diff --git a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java
index 11ff58d10..bd38eca97 100644
--- a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java
+++ b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java
@@ -10,6 +10,7 @@ package org.collectionspace.services;
 public interface OrganizationJAXBSchema {
 	final static String CSID = "csid";
 	final static String IN_AUTHORITY = "inAuthority";
+	final static String DISPLAY_NAME = "displayName";
 	final static String SHORT_NAME = "shortName";
 	final static String REF_NAME = "refName";
 	final static String LONG_NAME = "longName";
diff --git a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationListItemJAXBSchema.java b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationListItemJAXBSchema.java
index e661607a5..86653cf18 100644
--- a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationListItemJAXBSchema.java
+++ b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationListItemJAXBSchema.java
@@ -1,7 +1,7 @@
 package org.collectionspace.services;
 
 public interface OrganizationListItemJAXBSchema {
-	final static String SHORT_NAME = "shortName";
+	final static String DISPLAY_NAME = "displayName";
 	final static String REF_NAME = "refName";
 	final static String CSID = "csid";
 	final static String URI = "url";
diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 9a3232672..b12ba3622 100644
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -21,14 +21,15 @@
                 <!--  Organization Information Group -->
                 <xs:element name="inAuthority" type="xs:string" />
                 <xs:element name="refName" type="xs:string"/>
+                <xs:element name="displayName" type="xs:string"/>
                 <xs:element name="shortName" type="xs:string"/>
                 <xs:element name="longName" type="xs:string"/>
-								<xs:element name="nameAdditions" type="xs:string"/>
-								<xs:element name="contactName" type="xs:string"/>
-								<xs:element name="foundingDate" type="xs:string"/>
-								<xs:element name="dissolutionDate" type="xs:string"/>
-								<xs:element name="foundingPlace" type="xs:string"/>
-								<xs:element name="function" type="xs:string"/>
+				<xs:element name="nameAdditions" type="xs:string"/>
+				<xs:element name="contactName" type="xs:string"/>
+				<xs:element name="foundingDate" type="xs:string"/>
+				<xs:element name="dissolutionDate" type="xs:string"/>
+				<xs:element name="foundingPlace" type="xs:string"/>
+				<xs:element name="function" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
@@ -41,7 +42,7 @@
                 <xs:element name="organization_list_item" maxOccurs="unbounded">
                     <xs:complexType>
                         <xs:sequence>
-                            <xs:element name="shortName" type="xs:string"
+                            <xs:element name="displayName" type="xs:string"
                                 minOccurs="1" />
                             <!-- uri to retrieve organization details -->
                             <xs:element name="uri" type="xs:anyURI"
diff --git a/services/organization/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java b/services/organization/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java
index 33a6c8b8d..c64a25eac 100644
--- a/services/organization/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java
+++ b/services/organization/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java
@@ -374,7 +374,7 @@ public class Sample {
         OrganizationsCommonList.OrganizationListItem item) {
             StringBuffer sb = new StringBuffer();
             sb.append("csid=" + item.getCsid() + "\n");
-            sb.append("shortName=" + item.getShortName() + "\n");
+            sb.append("displayName=" + item.getDisplayName() + "\n");
             // sb.append("URI=" + item.getUri() + "\n");
         return sb.toString();
     }
@@ -520,8 +520,8 @@ public class Sample {
             // For each organization ...
             for (OrganizationsCommonList.OrganizationListItem
                 item : items.getOrganizationListItem()) {
-                // Get its short name.
-                logger.info(" " + item.getShortName());
+                // Get its display name.
+                logger.info(" " + item.getDisplayName());
             }
         }
 
diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java
index 41fbfa8d8..44f7ea65c 100644
--- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java
+++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java
@@ -77,6 +77,23 @@ public class OrganizationDocumentModelHandler
         //no specific action needed
     }
 
+    /* Override handleGet so we can deal with defaulting the displayName
+     * @see org.collectionspace.services.nuxeo.client.java.DocumentModelHandler#handleGet(org.collectionspace.services.common.document.DocumentWrapper)
+     */
+    @Override
+    public void handleGet(DocumentWrapper<DocumentModel> wrapDoc) throws Exception {
+    	DocumentModel docModel = wrapDoc.getWrappedObject();
+    	String displayName = (String) docModel.getProperty(getServiceContext().getCommonPartLabel("organizations"),
+    			OrganizationJAXBSchema.DISPLAY_NAME);
+    	if(displayName == null) {
+    		displayName = (String) docModel.getProperty(getServiceContext().getCommonPartLabel("organizations"),
+    				OrganizationJAXBSchema.SHORT_NAME);
+    		docModel.setProperty(getServiceContext().getCommonPartLabel("organizations"),
+    				OrganizationJAXBSchema.DISPLAY_NAME, displayName);
+    	}
+    	super.handleGet(wrapDoc);
+    }
+
     /**
      * getCommonPart get associated organization
      * @return
@@ -136,9 +153,13 @@ public class OrganizationDocumentModelHandler
 	        while(iter.hasNext()){
 	            DocumentModel docModel = iter.next();
 	            OrganizationListItem ilistItem = new OrganizationListItem();
-	            ilistItem.setShortName(
-									(String) docModel.getProperty(getServiceContext().getCommonPartLabel("organizations"),
-									OrganizationJAXBSchema.SHORT_NAME));
+	            // We look for a set display name, and fall back to teh short name if there is none
+	            String displayName = (String) docModel.getProperty(getServiceContext().getCommonPartLabel("organizations"),
+												OrganizationJAXBSchema.DISPLAY_NAME);
+	            if(displayName == null)
+		            displayName = (String) docModel.getProperty(getServiceContext().getCommonPartLabel("organizations"),
+							OrganizationJAXBSchema.SHORT_NAME);
+	            ilistItem.setDisplayName( displayName );
 	            ilistItem.setRefName(
 									(String) docModel.getProperty(getServiceContext().getCommonPartLabel("organizations"),
 									OrganizationJAXBSchema.REF_NAME));