From: Amy Wieliczka Date: Thu, 3 May 2012 21:04:19 +0000 (-0700) Subject: CSPACE-5128 Convert seven date fields to be structured dates X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=bb964f7b4749099f129fec306af1725156b0bb8d;p=tmp%2Fjakarta-migration.git CSPACE-5128 Convert seven date fields to be structured dates --- diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml index 046093020..c4d1cd6e8 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -10,7 +10,7 @@ - accessionDate + acquisitionAuthorizer acquisitionAuthorizerDate acquisitionDate @@ -39,7 +39,7 @@ fieldCollectionEventName - + diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd index ebba7a018..f84d61e7d 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd @@ -21,16 +21,26 @@ - + - + + + + @@ -91,5 +101,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java index a71c0297d..25c89456f 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java @@ -112,11 +112,11 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest createPersonRefs(); PoxPayloadOut multipart = createAcquisitionInstance( - "April 1, 2010", acquisitionAuthorizerRefName, acquisitionFundingSourcesRefNames, ownersRefNames, acquisitionSourcesRefNames); + // "April 1, 2010", AcquisitionClient acquisitionClient = new AcquisitionClient(); ClientResponse res = acquisitionClient.create(multipart); @@ -367,14 +367,14 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest } private PoxPayloadOut createAcquisitionInstance( - String accessionDate, String acquisitionAuthorizer, List acquisitionFundingSources, List acqOwners, List acquisitionSources) { + // String accessionDate, AcquisitionsCommon acquisition = new AcquisitionsCommon(); - acquisition.setAccessionDate(accessionDate); + // acquisition.setAccessionDate(accessionDate); acquisition.setAcquisitionAuthorizer(acquisitionAuthorizer); // AcquisitionFunding-related authrefs fields are *not* currently diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java index 06b8d6c3d..8a4cd9160 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java @@ -311,10 +311,10 @@ public class AcquisitionServiceTest extends AbstractPoxServiceTestImpl 0); Assert.assertNotNull(acqSources.get(0)); - List acqDates = - acquisitionObject.getAcquisitionDates().getAcquisitionDate(); - Assert.assertTrue(acqDates.size() > 0); - Assert.assertNotNull(acqDates.get(0)); + // List acqDates = + // acquisitionObject.getAcquisitionDates().getAcquisitionDate(); + // Assert.assertTrue(acqDates.size() > 0); + // Assert.assertNotNull(acqDates.get(0)); List owners = acquisitionObject.getOwners().getOwner(); @@ -703,11 +703,11 @@ public class AcquisitionServiceTest extends AbstractPoxServiceTestImpl acqDates = acqDatesList.getAcquisitionDate(); - acqDates.add(CURRENT_DATE_UTC); - acqDates.add(CURRENT_DATE_UTC); - acquisition.setAcquisitionDates(acqDatesList); + // AcquisitionDateList acqDatesList = new AcquisitionDateList(); + // List acqDates = acqDatesList.getAcquisitionDate(); + // acqDates.add(CURRENT_DATE_UTC); + // acqDates.add(CURRENT_DATE_UTC); + // acquisition.setAcquisitionDates(acqDatesList); OwnerList ownersList = new OwnerList(); List owners = ownersList.getOwner(); diff --git a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionJAXBSchema.java b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionJAXBSchema.java index 6e4946461..2fc54257c 100644 --- a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionJAXBSchema.java +++ b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionJAXBSchema.java @@ -8,7 +8,7 @@ package org.collectionspace.services; * */ public interface AcquisitionJAXBSchema { - final static String ACCESSIONDATE = "accessionDate"; + // final static String ACCESSIONDATE = "accessionDate"; } diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd index d65963550..1b2a30996 100644 --- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd +++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd @@ -33,7 +33,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -104,5 +104,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd index d2045e3c5..df058134b 100644 --- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd +++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd @@ -23,7 +23,7 @@ - + @@ -34,5 +34,36 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java index 92529ab89..ce8db2403 100644 --- a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java +++ b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java @@ -66,7 +66,7 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest private List personIdsCreated = new ArrayList(); private String personAuthCSID = null; private String depositorRefName = null; - private String exitDate = null; + // private String exitDate = null; private String exitNumber = null; private final static String CURRENT_DATE_UTC = GregorianCalendarDateTimeUtils.currentDateUTC(); @@ -91,14 +91,15 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest throw new UnsupportedOperationException(); //method not supported (or needed) in this test class } - private PoxPayloadOut createObjectExitInstance(String depositorRefName, String exitNumber, String exitDate) { - this.exitDate = exitDate; + private PoxPayloadOut createObjectExitInstance(String depositorRefName, String exitNumber) { + // , String exitDate + // this.exitDate = exitDate; this.exitNumber = exitNumber; this.depositorRefName = depositorRefName; ObjectexitCommon objectexit = new ObjectexitCommon(); objectexit.setDepositor(depositorRefName); objectexit.setExitNumber(exitNumber); - objectexit.setExitDate(exitDate); + // objectexit.setExitDate(exitDate); PoxPayloadOut multipart = new PoxPayloadOut(ObjectExitClient.SERVICE_PAYLOAD_NAME); PayloadOutputPart commonPart = multipart.addPart(new ObjectExitClient().getCommonPartName(), @@ -116,7 +117,8 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest // references, and will refer to Person resources by their refNames. ObjectExitClient objectexitClient = new ObjectExitClient(); PoxPayloadOut multipart = createObjectExitInstance(depositorRefName, - "exitNumber-" + identifier, CURRENT_DATE_UTC); + "exitNumber-" + identifier); + // , CURRENT_DATE_UTC ClientResponse res = objectexitClient.create(multipart); try { assertStatusCode(res, testName); diff --git a/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java b/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java index 302847321..572a574f9 100644 --- a/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java +++ b/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java @@ -6,7 +6,7 @@ package org.collectionspace.services; public interface ObjectexitJAXBSchema { final static String OBJECT_EXIT_CURRENT_OWNER = "currentOwner"; final static String OBJECT_EXIT_DEPOSITOR = "depositor"; - final static String OBJECT_EXIT_DATE = "exitDate"; + // final static String OBJECT_EXIT_DATE = "exitDate"; final static String OBJECT_EXIT_METHODS = "exitMethods"; final static String OBJECT_EXIT_METHOD = "exitMethod"; final static String OBJECT_EXIT_NOTE = "exitNote"; diff --git a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd index 0fb56d740..183d2ca31 100644 --- a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd +++ b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd @@ -34,7 +34,7 @@ - + @@ -50,5 +50,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 401746487..499c80041 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 @@ -89,8 +89,8 @@ - foundingDate - dissolutionDate + foundingPlace @@ -217,7 +217,6 @@ dataInputText ---> @@ -244,7 +243,7 @@ dataInputText - +--> 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 b02a17675..34d78752a 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 @@ -43,8 +43,10 @@ - - + + + + @@ -88,6 +90,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java index e8f8f3587..c24c781d9 100644 --- a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java +++ b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java @@ -271,10 +271,10 @@ public class OrgAuthorityClientUtils { contactNames.addAll(values); organization.setContactNames(contactsList); } - if((value = (String)orgInfo.get(OrganizationJAXBSchema.FOUNDING_DATE))!=null) - organization.setFoundingDate(value); - if((value = (String)orgInfo.get(OrganizationJAXBSchema.DISSOLUTION_DATE))!=null) - organization.setDissolutionDate(value); + // if((value = (String)orgInfo.get(OrganizationJAXBSchema.FOUNDING_DATE))!=null) + // organization.setFoundingDate(value); + // if((value = (String)orgInfo.get(OrganizationJAXBSchema.DISSOLUTION_DATE))!=null) + // organization.setDissolutionDate(value); if((value = (String)orgInfo.get(OrganizationJAXBSchema.FOUNDING_PLACE))!=null) organization.setFoundingPlace(value); if((values = (List)orgRepeatablesInfo.get(OrganizationJAXBSchema.GROUPS))!=null) { 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 fde3af062..d96a940b7 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 @@ -126,7 +126,7 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest> testOrgRepeatablesMap = new HashMap>(); 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 28e48a7c7..a5e63655a 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 @@ -17,8 +17,8 @@ public interface OrganizationJAXBSchema extends AuthorityItemJAXBSchema { final static String SHORT_NAME = "shortName"; final static String NAME_ADDITIONS = "nameAdditions"; final static String CONTACT_NAMES = "contactNames"; - final static String FOUNDING_DATE = "foundingDate"; - final static String DISSOLUTION_DATE = "dissolutionDate"; + // final static String FOUNDING_DATE = "foundingDate"; + // final static String DISSOLUTION_DATE = "dissolutionDate"; final static String FOUNDING_PLACE = "foundingPlace"; final static String GROUPS = "groups"; final static String FUNCTIONS = "functions"; diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd index 946afd0eb..37602d94d 100644 --- a/services/organization/jaxb/src/main/resources/organization_common.xsd +++ b/services/organization/jaxb/src/main/resources/organization_common.xsd @@ -33,8 +33,10 @@ - - + + + @@ -87,6 +89,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml index f5099c5f7..be59ad916 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -89,8 +89,6 @@ salutation title nameAdditions - birthDate - deathDate birthPlace deathPlace @@ -248,32 +246,6 @@ - - - - - true - - birthDate - - - dataInputText - - - - - - - - true - - deathDate - - - dataInputText - - - diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd index dbca58f84..7a51929fe 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd +++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd @@ -46,8 +46,8 @@ - - + + @@ -82,5 +82,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java index 267c8ac99..cbfa8f978 100644 --- a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java +++ b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java @@ -245,10 +245,6 @@ public class PersonAuthorityClientUtils { person.setTitle(value); if((value = (String)personInfo.get(PersonJAXBSchema.NAME_ADDITIONS))!=null) person.setNameAdditions(value); - if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_DATE))!=null) - person.setBirthDate(value); - if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_DATE))!=null) - person.setDeathDate(value); if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_PLACE))!=null) person.setBirthPlace(value); if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_PLACE))!=null) @@ -330,9 +326,7 @@ public class PersonAuthorityClientUtils { prepareDefaultDisplayName( personMap.get(PersonJAXBSchema.FORE_NAME), personMap.get(PersonJAXBSchema.MIDDLE_NAME), - personMap.get(PersonJAXBSchema.SUR_NAME), - personMap.get(PersonJAXBSchema.BIRTH_DATE), - personMap.get(PersonJAXBSchema.DEATH_DATE)); + personMap.get(PersonJAXBSchema.SUR_NAME)); personMap.put(PersonJAXBSchema.DISPLAY_NAME, displayName); } String shortDisplayName = personMap.get(PersonJAXBSchema.SHORT_DISPLAY_NAME); @@ -346,7 +340,7 @@ public class PersonAuthorityClientUtils { shortDisplayName = prepareDefaultDisplayName( personMap.get(PersonJAXBSchema.FORE_NAME), null, - personMap.get(PersonJAXBSchema.SUR_NAME),null,null); + personMap.get(PersonJAXBSchema.SUR_NAME)); personMap.put(PersonJAXBSchema.SHORT_DISPLAY_NAME, shortDisplayName); } @@ -464,13 +458,10 @@ public class PersonAuthorityClientUtils { * @param foreName * @param middleName * @param surName - * @param birthDate - * @param deathDate * @return display name */ public static String prepareDefaultDisplayName( - String foreName, String middleName, String surName, - String birthDate, String deathDate ) { + String foreName, String middleName, String surName) { StringBuilder newStr = new StringBuilder(); final String sep = " "; final String dateSep = "-"; @@ -486,25 +477,7 @@ public class PersonAuthorityClientUtils { firstAdded = true; } } - // Now we add the dates. In theory could have dates with no name, but that is their problem. - boolean foundBirth = false; - if(null != birthDate) { - if(firstAdded) { - newStr.append(sep); - } - newStr.append(birthDate); - newStr.append(dateSep); // Put this in whether there is a death date or not - foundBirth = true; - } - if(null != deathDate) { - if(!foundBirth) { - if(firstAdded) { - newStr.append(sep); - } - newStr.append(dateSep); - } - newStr.append(deathDate); - } + return newStr.toString(); } diff --git a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java index 61dcc1f28..fc83a52cc 100644 --- a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java +++ b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java @@ -90,10 +90,6 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest - - + + @@ -89,5 +89,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java b/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java index 3ff81ae99..52d16f3b1 100644 --- a/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java +++ b/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java @@ -123,8 +123,6 @@ public class Sample { String foreName = personMap.get(PersonJAXBSchema.FORE_NAME); String middleName = personMap.get(PersonJAXBSchema.MIDDLE_NAME); String surName = personMap.get(PersonJAXBSchema.SUR_NAME); - String birthDate = personMap.get(PersonJAXBSchema.BIRTH_DATE); - String deathDate = personMap.get(PersonJAXBSchema.DEATH_DATE); StringBuilder builtName = new StringBuilder(); if(foreName!=null) builtName.append(foreName); @@ -132,11 +130,6 @@ public class Sample { builtName.append(middleName); if(surName!=null) builtName.append(surName); - if(birthDate!=null) - builtName.append(birthDate); - builtName.append("-"); - if(deathDate!=null) - builtName.append(deathDate); String displaySuffix = "displayName-" + System.currentTimeMillis(); //TODO: Laramie20100728 temp fix, made-up displaySuffix. @@ -372,10 +365,6 @@ public class Sample { person.setTitle(value); if((value = (String)personInfo.get(PersonJAXBSchema.NAME_ADDITIONS))!=null) person.setNameAdditions(value); - if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_DATE))!=null) - person.setBirthDate(value); - if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_DATE))!=null) - person.setDeathDate(value); if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_PLACE))!=null) person.setBirthPlace(value); if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_PLACE))!=null) diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java index ea7f32757..b0dca98db 100644 --- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java +++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java @@ -84,20 +84,14 @@ public class PersonDocumentModelHandler String lastname = (String)docModel.getProperty(commonPartLabel, PersonJAXBSchema.SUR_NAME); if(shortDisplayNameComputed) { - String displayName = prepareDefaultDisplayName(forename, null, lastname, - null, null); + String displayName = prepareDefaultDisplayName(forename, null, lastname); docModel.setProperty(commonPartLabel, PersonJAXBSchema.SHORT_DISPLAY_NAME, displayName); } if(displayNameComputed) { String midname = (String)docModel.getProperty(commonPartLabel, PersonJAXBSchema.MIDDLE_NAME); - String birthdate = - (String)docModel.getProperty(commonPartLabel, PersonJAXBSchema.BIRTH_DATE); - String deathdate = - (String)docModel.getProperty(commonPartLabel, PersonJAXBSchema.DEATH_DATE); - String displayName = prepareDefaultDisplayName(forename, midname, lastname, - birthdate, deathdate); + String displayName = prepareDefaultDisplayName(forename, midname, lastname); docModel.setProperty(commonPartLabel, PersonJAXBSchema.DISPLAY_NAME, displayName); } @@ -113,14 +107,11 @@ public class PersonDocumentModelHandler * @param foreName * @param middleName * @param surName - * @param birthDate - * @param deathDate * @return * @throws Exception */ private static String prepareDefaultDisplayName( - String foreName, String middleName, String surName, - String birthDate, String deathDate ) throws Exception { + String foreName, String middleName, String surName) throws Exception { final String SEP = " "; final String DATE_SEP = "-"; @@ -137,25 +128,6 @@ public class PersonDocumentModelHandler firstAdded = true; } } - // Now we add the dates. In theory could have dates with no name, but that is their problem. - boolean foundBirth = false; - if (birthDate != null) { - if (firstAdded) { - newStr.append(SEP); - } - newStr.append(birthDate); - newStr.append(DATE_SEP); // Put this in whether there is a death date or not - foundBirth = true; - } - if (deathDate != null) { - if (!foundBirth) { - if (firstAdded == true) { - newStr.append(SEP); - } - newStr.append(DATE_SEP); - } - newStr.append(deathDate); - } return newStr.toString(); }