From aa457a5b66743d9fbd9f434e6137f994db85379b Mon Sep 17 00:00:00 2001 From: Patrick Schmitz Date: Tue, 24 Aug 2010 05:39:10 +0000 Subject: [PATCH] CSPACE-2670. Added support for address and accessnote in location schema. --- .../src/main/resources/schemas/locations_common.xsd | 2 ++ .../services/client/LocationAuthorityClientUtils.java | 4 ++++ .../services/client/test/LocationAuthorityServiceTest.java | 4 ++++ .../java/org/collectionspace/services/LocationJAXBSchema.java | 2 ++ services/location/jaxb/src/main/resources/location_common.xsd | 2 ++ 5 files changed, 14 insertions(+) diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locations_common.xsd b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locations_common.xsd index 54e76a1c9..ed0ffa7e8 100644 --- a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locations_common.xsd +++ b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locations_common.xsd @@ -32,6 +32,8 @@ + + diff --git a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java index ae878daa8..fac62e1d5 100644 --- a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java +++ b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java @@ -81,8 +81,12 @@ public class LocationAuthorityClientUtils { location.setConditionNoteDate(value); if((value = (String)locationInfo.get(LocationJAXBSchema.SECURITY_NOTE))!=null) location.setSecurityNote(value); + if((value = (String)locationInfo.get(LocationJAXBSchema.ACCESS_NOTE))!=null) + location.setAccessNote(value); if((value = (String)locationInfo.get(LocationJAXBSchema.LOCATION_TYPE))!=null) location.setLocationType(value); + if((value = (String)locationInfo.get(LocationJAXBSchema.ADDRESS))!=null) + location.setAddress(value); if((value = (String)locationInfo.get(LocationJAXBSchema.TERM_STATUS))!=null) location.setTermStatus(value); MultipartOutput multipart = new MultipartOutput(); diff --git a/services/location/client/src/test/java/org/collectionspace/services/client/test/LocationAuthorityServiceTest.java b/services/location/client/src/test/java/org/collectionspace/services/client/test/LocationAuthorityServiceTest.java index c9aefb2db..1d941d32b 100644 --- a/services/location/client/src/test/java/org/collectionspace/services/client/test/LocationAuthorityServiceTest.java +++ b/services/location/client/src/test/java/org/collectionspace/services/client/test/LocationAuthorityServiceTest.java @@ -81,6 +81,8 @@ public class LocationAuthorityServiceTest extends AbstractServiceTestImpl { final String TEST_CONDITION_NOTE = "Basically clean"; final String TEST_CONDITION_NOTE_DATE = "June 11, 1979"; final String TEST_SECURITY_NOTE = "Kind of safe"; + final String TEST_ACCESS_NOTE = "Only right-thinkers may see"; + final String TEST_ADDRESS = "123 Main Street, Anytown USA"; // TODO Make loc type be a controlled vocab term. final String TEST_LOCATION_TYPE = "Shelf"; // TODO Make status type be a controlled vocab term. @@ -235,6 +237,8 @@ public class LocationAuthorityServiceTest extends AbstractServiceTestImpl { shelf1Map.put(LocationJAXBSchema.CONDITION_NOTE, TEST_CONDITION_NOTE); shelf1Map.put(LocationJAXBSchema.CONDITION_NOTE_DATE, TEST_CONDITION_NOTE_DATE); shelf1Map.put(LocationJAXBSchema.SECURITY_NOTE, TEST_SECURITY_NOTE); + shelf1Map.put(LocationJAXBSchema.ACCESS_NOTE, TEST_ACCESS_NOTE); + shelf1Map.put(LocationJAXBSchema.ADDRESS, TEST_ADDRESS); shelf1Map.put(LocationJAXBSchema.LOCATION_TYPE, TEST_LOCATION_TYPE); shelf1Map.put(LocationJAXBSchema.TERM_STATUS, TEST_STATUS); diff --git a/services/location/jaxb/src/main/java/org/collectionspace/services/LocationJAXBSchema.java b/services/location/jaxb/src/main/java/org/collectionspace/services/LocationJAXBSchema.java index dbbe74acb..cc073fd62 100644 --- a/services/location/jaxb/src/main/java/org/collectionspace/services/LocationJAXBSchema.java +++ b/services/location/jaxb/src/main/java/org/collectionspace/services/LocationJAXBSchema.java @@ -15,6 +15,8 @@ public interface LocationJAXBSchema extends AuthorityJAXBSchema { final static String CONDITION_NOTE = "conditionNote"; final static String CONDITION_NOTE_DATE = "conditionNoteDate"; final static String SECURITY_NOTE = "securityNote"; + final static String ACCESS_NOTE = "accessNote"; + final static String ADDRESS = "address"; final static String LOCATION_TYPE = "locationType"; } diff --git a/services/location/jaxb/src/main/resources/location_common.xsd b/services/location/jaxb/src/main/resources/location_common.xsd index 9b02b2acf..d66668eff 100644 --- a/services/location/jaxb/src/main/resources/location_common.xsd +++ b/services/location/jaxb/src/main/resources/location_common.xsd @@ -31,6 +31,8 @@ + + -- 2.47.3