From 847c5c07b8bb100510bbf3312d82a341af22c8ec Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Thu, 1 Dec 2011 01:58:21 +0000 Subject: [PATCH] CSPACE-4486,CSPACE-4589: Made Inscription Content (aka Textual Inscription) and Inscription Description (aka Non-Textual Inscription) fields into two repeatable groups in the Services layer; updated tests. --- .../collectionobject/AuthRefsCollObj.xml | 6 +- .../collectionobject/testCambridge.xml | 44 ++++--- .../schemas/collectionobjects_common.xsd | 59 +++++++--- .../test/CollectionObjectAuthRefsTest.java | 1 - .../resources/collectionobjects_common.xsd | 74 ++++++++---- .../tenants/tenant-bindings-proto.xml | 109 ++++++++---------- .../requests/collectionobject-request.xml | 44 ++++--- 7 files changed, 191 insertions(+), 146 deletions(-) diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/AuthRefsCollObj.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/AuthRefsCollObj.xml index 04c7259b9..b017bdc5b 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/AuthRefsCollObj.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/AuthRefsCollObj.xml @@ -26,6 +26,10 @@ A virtual object to check authRefs - urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(pmadry)'Penelope Madry' + + + urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(pmadry)'Penelope Madry' + + nonTextualInscriptionGroupList> diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml index 2fd9705b1..b20aa9b9a 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml @@ -42,29 +42,27 @@ copyNumber editionNumber
form
- inscriptionContent -inscriptionContentInscriber -inscriptionContentDate -inscriptionContentInterpretation -inscriptionContentLanguage -inscriptionContentMethod -inscriptionContentPosition -inscriptionContentScript -inscriptionContentTranslation -inscriptionContentTransliteration -inscriptionContentType inscriptionDescription - -inscriptionDescriptionInscriber - -inscriptionDescriptionDate - -inscriptionDescriptionInterpretation - -inscriptionDescriptionMethod - -inscriptionDescriptionPosition - -inscriptionDescriptionType + + inscriptionContent + inscriptionContentInscriber + inscriptionContentDate + inscriptionContentInterpretation + inscriptionContentLanguage + inscriptionContentMethod + inscriptionContentPosition + inscriptionContentScript + inscriptionContentTranslation + inscriptionContentTransliteration + inscriptionContentType inscriptionDescription + + + inscriptionDescriptionInscriber + inscriptionDescriptionDate + inscriptionDescriptionInterpretation + inscriptionDescriptionMethod + inscriptionDescriptionPosition + inscriptionDescriptionType + material materialComponent materialComponentNote diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd index feeb20232..8ccbf8422 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd @@ -150,33 +150,54 @@ + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java index 679a39bd6..475208f96 100644 --- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java +++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java @@ -458,7 +458,6 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest { "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound); // Check a sample of one or more person authority ref fields - // Assert.assertEquals(collectionObject.getInscriptionContentInscriber(), contentInscriberRefName); // Assert.assertEquals(collectionObject.getAssocPersons().getAssocPerson().get(0), assocPersonRefName); Assert.assertEquals(collectionObject.getOwners().getOwner().get(0), ownerRefName); Assert.assertEquals(collectionObject.getFieldCollectionSources().getFieldCollectionSource().get(0), fieldCollectionSourceRefName); diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd index 08d00c9fb..634883d39 100644 --- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd +++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd @@ -83,32 +83,10 @@ + - - - - - - - - - - - - - - - - - - - - - - - - + @@ -409,6 +387,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 f2baa6393..b3cef545f 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 @@ -219,6 +219,22 @@ authRef materialGroupList/*/materialSource + + authRef + textualInscriptionGroupList/*/inscriptionContentInscriber + + + authRef + textualInscriptionGroupList/*/inscriptionContentMethod + + + authRef + nonTextualInscriptionGroupList/*/inscriptionDescriptionInscriber + + + authRef + nonTextualInscriptionGroupList/*/inscriptionDescriptionMethod + authRef objectComponentGroupList/*/objectComponentName @@ -279,27 +295,7 @@ authRef referenceGroupList/*/reference - - - - + - - - - - - - - - - + + + + - - + + + diff --git a/services/imports/service/src/test/resources/requests/collectionobject-request.xml b/services/imports/service/src/test/resources/requests/collectionobject-request.xml index 6022796c6..197fde81e 100755 --- a/services/imports/service/src/test/resources/requests/collectionobject-request.xml +++ b/services/imports/service/src/test/resources/requests/collectionobject-request.xml @@ -8,7 +8,32 @@ public - + + + gothic-script + urn:cspace:org.collectionspace.demo:orgauthority:name(organization):organization:name(screenmagicinc.)'Screen+Magic+Inc.' + No, it's true, I'm not a baguette + label + I'm a vegetarian + + Non, c'est vrai! Je ne suis pas une baguette + It could mean a lot of things, but oddly no connection to ogres + arabic + base + + + + + + + decoration + bottom + urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(reginabadet)'Regina+Badet' + + No Idea + Big symbol at the base + + @@ -19,7 +44,6 @@ urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(maryannecasseta)'Mary+Anne+Cassata' - Big symbol at the base @@ -28,11 +52,9 @@ rpm - No Idea - It could mean a lot of things, but oddly no connection to ogres @@ -76,7 +98,6 @@ Or it could be a petrified tree looking slightly like an ogre Or just a rock, looking a lot like a petrified tree - arabic @@ -85,7 +106,6 @@ These object records are tedious to fill out Content of a piece of rock?! .. well there might be diamonds and petrified fish in it - urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(reginabadet)'Regina+Badet' @@ -117,8 +137,6 @@
- - Non, c'est vrai! Je ne suis pas une baguette none @@ -126,13 +144,8 @@ urn:cspace:org.collectionspace.demo:orgauthority:name(organization):organization:name(7-eleven)'7-Eleven' - label - I'm a vegetarian CompleteObject001 - bottom - No, it's true, I'm not a baguette - decoration @@ -151,7 +164,6 @@ fieldCollectionEventName - urn:cspace:org.collectionspace.demo:orgauthority:name(organization):organization:name(screenmagicinc.)'Screen+Magic+Inc.' urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(gingerrogers)'Ginger+Rogers' @@ -174,7 +186,6 @@ swahili - base Probably a horrible one, considering how uninteresting this object is @@ -202,7 +213,6 @@ - You got the basic details down - it was horrible, what else can I say @@ -238,7 +248,6 @@ - @@ -252,7 +261,6 @@ - gothic-script female -- 2.47.3