CSPACE-2702: Using DocumentModel.getName() instead of: NuxeoUtils.extractId(docModel...

diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
index 71ea71ed9d7140573a8a2e6543146b866b9f0290..4eba07447eee620279e2f4017e0111a2ea98a72d 100644 (file)
--- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
+++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
@@ -155,7 +155,7 @@ public class CollectionObjectDocumentModelHandler
                             CollectionObjectListItemJAXBSchema.RESPONSIBLE_DEPARTMENTS);
                    coListItem.setResponsibleDepartment(DocumentUtils.getFirstString(respDepts));
                    
-                   String id = NuxeoUtils.extractId(docModel.getPathAsString());
+                   String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
                    coListItem.setUri(getServiceContextPath() + id);
                    coListItem.setCsid(id);
             } catch (ClassCastException cce) {

diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
index 3fa013e37f3a02ee9801e6580fcb8e11b988eda5..77d0d98416134cd27c160e8ff2b31cc26a1cab8d 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
@@ -155,7 +155,7 @@ public class RefNameServiceUtils {
         while (iter.hasNext()) {\r
             DocumentModel docModel = iter.next();\r
             AuthorityRefDocList.AuthorityRefDocItem ilistItem = new AuthorityRefDocList.AuthorityRefDocItem();\r
-            String csid = NuxeoUtils.extractId(docModel.getPathAsString());\r
+            String csid = NuxeoUtils.getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());\r
             String docType = docModel.getDocumentType().getName();\r
             ServiceBindingType sb = queriedServiceBindings.get(docType);\r
             if (sb == null) {\r

diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
index 666631a6d447c5c39f371a19d95d817ec4e80eb2..f910a13a1e52ea050857c95d21bedb60e3b7397c 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
@@ -121,7 +121,7 @@ public abstract class AuthorityDocumentModelHandler<AuthCommon, AuthCommonList>
        
        // Add the CSID to the common part
        if (partMeta.getLabel().equalsIgnoreCase(authorityCommonSchemaName)) {
-               String csid = NuxeoUtils.extractId(docModel.getPathAsString());
+               String csid = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
                unQObjectProperties.put("csid", csid);
        }
        

diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
index 8a648a25fd47d693f5bca60bf841ffabc658025b..6421c54db92132d811d127766b07dce1ee41c786 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
@@ -149,7 +149,7 @@ public abstract class AuthorityItemDocumentModelHandler<AICommon, AICommonList>
        
        // Add the CSID to the common part
        if (partMeta.getLabel().equalsIgnoreCase(authorityItemCommonSchemaName)) {
-               String csid = NuxeoUtils.extractId(docModel.getPathAsString());
+               String csid = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
                unQObjectProperties.put("csid", csid);
        }
        

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
index 24e5bba3267204177489f8fc889fce84834f335e..ceea5aa8a5456499bcafb3c287b2f52adb3a76d5 100755 (executable)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
@@ -150,7 +150,7 @@ public abstract class DocHandlerBase<T, TL> extends RemoteDocumentModelHandlerIm
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();\r
         while(iter.hasNext()){\r
             DocumentModel docModel = iter.next();\r
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());\r
+            String id = NuxeoUtils.getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());\r
             Object item = createItemForCommonList(docModel, label, id);\r
             list.add(item);\r
         }\r

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
index c6475100a80ba65437c1cab1a5f93422d45a516a..977605cdc8d80cfc7cfe0af103150f99426077e9 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
@@ -32,6 +32,7 @@ import org.collectionspace.services.common.document.DocumentFilter;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.document.DocumentHandler.Action;
 import org.collectionspace.services.nuxeo.client.*;
+import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.collectionspace.services.common.profile.Profiler;
 
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -60,6 +61,13 @@ public abstract class DocumentModelHandler<T, TL>
     public final static String COLLECTIONSPACE_CORE_CREATED_AT = "createdAt";
     public final static String COLLECTIONSPACE_CORE_UPDATED_AT = "updatedAt";
 
+    /*
+     * We're using the "name" field of Nuxeo's DocumentModel to store
+     * the CSID.
+     */
+    public String getCsid(DocumentModel docModel) {
+       return NuxeoUtils.getCsid(docModel);
+    }
     /**
      * getRepositorySession returns Nuxeo Repository Session
      * @return

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
index 00f61d937c5748dacf1d73ae02ad84d08d7b5015..0ac1ca20c5643bd449dd8311a8e51341260fd23e 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
@@ -399,7 +399,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient {
         try {
             DocumentWrapper<DocumentModel> wrapDoc = findDoc(ctx, whereClause);
             DocumentModel docModel = wrapDoc.getWrappedObject();
-            csid = NuxeoUtils.extractId(docModel.getPathAsString());
+            csid = NuxeoUtils.getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
         } catch (DocumentNotFoundException dnfe) {
             throw dnfe;
         } catch (IllegalArgumentException iae) {

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
index 2d8cbd30e89c0a85bab9be6e1b405e3abd0fe2e6..bce2cb43b3f13b9ff6ad8211fff76c94edade915 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
@@ -211,12 +211,21 @@ public class NuxeoUtils {
                 "/" + id);
     }
 
+    /*
+     * We're using the "name" field of Nuxeo's DocumentModel to store
+     * the CSID.
+     */
+    public static String getCsid(DocumentModel docModel) {
+       return docModel.getName();
+    }
+    
     /**
      * extractId extracts id from given path string
      * @param pathString
      * @return
      */
-    public static String extractId(String pathString) {
+    @Deprecated
+    public static String xextractId(String pathString) {
         if (pathString == null) {
             throw new IllegalArgumentException("empty pathString");
         }

diff --git a/services/contact/service/src/main/java/org/collectionspace/services/contact/nuxeo/ContactDocumentModelHandler.java b/services/contact/service/src/main/java/org/collectionspace/services/contact/nuxeo/ContactDocumentModelHandler.java
index 65b022850bdeef24b1af9aec0ac2c48a0ad664f7..c4c5dc406320ec7d3fe364f8e4314e76db47cffa 100644 (file)
--- a/services/contact/service/src/main/java/org/collectionspace/services/contact/nuxeo/ContactDocumentModelHandler.java
+++ b/services/contact/service/src/main/java/org/collectionspace/services/contact/nuxeo/ContactDocumentModelHandler.java
@@ -194,7 +194,7 @@ public class ContactDocumentModelHandler
             // See CSPACE-1018
             clistItem.setAddressPlace((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
                     ContactJAXBSchema.ADDRESS_PLACE));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             clistItem.setUri(getServiceContextPath() + id);
             clistItem.setCsid(id);
             list.add(clistItem);

diff --git a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java
index eb6d52e8fe905af59ed89219f096bcfc3d48b2f2..abb61f38ef12997e7f46354c30f134ccff1e9258 100644 (file)
--- a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java
+++ b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java
@@ -118,7 +118,7 @@ public class DimensionDocumentModelHandler
             DimensionListItem ilistItem = new DimensionListItem();
             ilistItem.setDimension((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
                     DimensionJAXBSchema.DIMENSION));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
index 8cb9468bc4585ea9aca57e42fc14480e2f41f8de..6abd060cdcba3259c3a7219fe59f907b71248a23 100644 (file)
--- a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
+++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
@@ -134,7 +134,7 @@ public class IntakeDocumentModelHandler
                     IntakeJAXBSchema.DEPOSITOR));
             ilistItem.setCurrentOwner((String) docModel.getProperty(label,
                     IntakeJAXBSchema.CURRENT_OWNER));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

diff --git a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java
index d609c23a4ced3247fb1358d96d8faf04033a455d..fa9daec830974dcd977cf0352ac442abbfcf3e49 100644 (file)
--- a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java
+++ b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java
@@ -144,7 +144,7 @@ public class LoanoutDocumentModelHandler
                     LoanoutJAXBSchema.BORROWER));
             ilistItem.setLoanReturnDate((String) docModel.getProperty(label,
                     LoanoutJAXBSchema.LOAN_RETURN_DATE));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

diff --git a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java
index 2a92aca658ab54de1c3b31ba406971ba78a53b58..5caaf628dc1c8556da3310cdf793c20e4af5af45 100644 (file)
--- a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java
+++ b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java
@@ -84,7 +84,7 @@ public class LocationAuthorityDocumentModelHandler
                        AuthorityJAXBSchema.SHORT_IDENTIFIER));
             ilistItem.setVocabType((String) docModel.getProperty(label,
                        AuthorityJAXBSchema.VOCAB_TYPE));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

diff --git a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java
index 72c7f2085f39870ab8d7485dcba068906e6704ba..d8d00d943c2135b96ef70d3dbe9fc54fdb135a4b 100644 (file)
--- a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java
+++ b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java
@@ -161,7 +161,7 @@ public class LocationDocumentModelHandler
                                        AuthorityItemJAXBSchema.SHORT_IDENTIFIER));
                        ilistItem.setRefName((String) docModel.getProperty(commonPartLabel,
                                        AuthorityItemJAXBSchema.REF_NAME));
-                       String id = NuxeoUtils.extractId(docModel.getPathAsString());
+                       String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
                        ilistItem.setUri("/locationauthorities/" + inAuthority + "/items/"
                                        + id);
                        ilistItem.setCsid(id);

diff --git a/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java b/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java
index 07f225ee87ca5e0fd31d4ea196fa530dda3fb6b8..4bb538d31a59eed4dc163dddd936e0af8e5a6096 100644 (file)
--- a/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java
+++ b/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java
@@ -149,7 +149,7 @@ public class MovementDocumentModelHandler
             GregorianCalendar gcal = (GregorianCalendar) docModel.getProperty(label,
                     MovementJAXBSchema.LOCATION_DATE);
             ilistItem.setLocationDate(DateTimeFormatUtils.formatAsISO8601Timestamp(gcal));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

diff --git a/services/note/service/src/main/java/org/collectionspace/services/note/nuxeo/NoteDocumentModelHandler.java b/services/note/service/src/main/java/org/collectionspace/services/note/nuxeo/NoteDocumentModelHandler.java
index 53043b598a722ab606120567a8ae1e11d05c1ed3..df5dd994ee378d93cc34bb183a5e9b117dd2bd95 100644 (file)
--- a/services/note/service/src/main/java/org/collectionspace/services/note/nuxeo/NoteDocumentModelHandler.java
+++ b/services/note/service/src/main/java/org/collectionspace/services/note/nuxeo/NoteDocumentModelHandler.java
@@ -146,7 +146,7 @@ public class NoteDocumentModelHandler
             NoteListItem clistItem = new NoteListItem();\r
             clistItem.setContent((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),\r
                     NoteJAXBSchema.CONTENT));\r
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());\r
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());\r
             clistItem.setUri(getServiceContextPath() + id);\r
             clistItem.setCsid(id);\r
             list.add(clistItem);\r

diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java
index 1867894e0e5ffec39eaf16259b200f4eacb89b65..849ccd916793ca2902fb1eb9a59e6e06d93cc442 100644 (file)
--- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java
+++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java
@@ -80,7 +80,7 @@ public class OrgAuthorityDocumentModelHandler
                     AuthorityJAXBSchema.SHORT_IDENTIFIER));
             ilistItem.setVocabType((String) docModel.getProperty(label,
                     AuthorityJAXBSchema.VOCAB_TYPE));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

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 5b660abff2a22915967ff1c2cc4af8007028f454..12af615c6884ac4194b7d38434e96f7eadd9e428 100644 (file)
--- 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
@@ -168,7 +168,7 @@ public class OrganizationDocumentModelHandler
                                        OrganizationJAXBSchema.SHORT_IDENTIFIER));
                        ilistItem.setRefName((String) 
                                        docModel.getProperty(commonPartLabel, OrganizationJAXBSchema.REF_NAME));
-                       String id = NuxeoUtils.extractId(docModel.getPathAsString());
+                       String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri("/orgauthorities/" + this.inAuthority + "/items/" + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java
index 24821da185eb0cfd3bbcd64fd9bda5d6ae6c5bd7..be7e699281d749e00c4cb661b53fed80f1efe246 100644 (file)
--- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java
+++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java
@@ -81,7 +81,7 @@ public class PersonAuthorityDocumentModelHandler
                        AuthorityJAXBSchema.SHORT_IDENTIFIER));
             ilistItem.setVocabType((String) docModel.getProperty(label,
                        AuthorityJAXBSchema.VOCAB_TYPE));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

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 a9914df603ae99809533a59a9e2a635ff88b066e..71c08872ff6ee26368fea1b65f4408ccc69e4127 100644 (file)
--- 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
@@ -196,7 +196,7 @@ public class PersonDocumentModelHandler
        
        // Add the CSID to the common part
        if (partMeta.getLabel().equalsIgnoreCase(COMMON_PART_LABEL)) {
-               String csid = NuxeoUtils.extractId(docModel.getPathAsString());
+               String csid = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
                unQObjectProperties.put("csid", csid);
        }
        
@@ -225,7 +225,7 @@ public class PersonDocumentModelHandler
                                        PersonJAXBSchema.SHORT_IDENTIFIER));
                        ilistItem.setRefName((String) docModel.getProperty(commonPartLabel,
                                        PersonJAXBSchema.REF_NAME));
-                       String id = NuxeoUtils.extractId(docModel.getPathAsString());
+                       String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
                        ilistItem.setUri("/personauthorities/" + inAuthority + "/items/"
                                        + id);
                        ilistItem.setCsid(id);

diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
index b9ebb4e6c0beeb4b152bde08f8486deae349e1b0..ff86a50ccdc4110d6fc07fb5f82cba3b6cea54e2 100644 (file)
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
@@ -161,7 +161,7 @@ public class RelationDocumentModelHandler
                DocumentModel docModel,
             String serviceContextPath) throws Exception {
         RelationListItem relationListItem = new RelationListItem();
-        String id = NuxeoUtils.extractId(docModel.getPathAsString());
+        String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
         relationListItem.setCsid(id);
         //
         // Subject

diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
index 9077fc0ba36f21fe8e1b832fbf938cab49e21218..1518bc8a892872923eb5ffb8dbb7df76f209687a 100644 (file)
--- a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
+++ b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
@@ -136,7 +136,7 @@ public class ReportDocumentModelHandler
                     ReportJAXBSchema.FOR_SINGLE_DOC));
             ilistItem.setForDocType((String) docModel.getProperty(label,
                     ReportJAXBSchema.FOR_DOC_TYPE));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
index cbb6af7b0365308e894cd63e9dc9b55b75297f01..b5609dc0247b9f01998e4306cece6c8f28620b22 100644 (file)
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
@@ -81,7 +81,7 @@ public class VocabularyDocumentModelHandler
                        AuthorityJAXBSchema.SHORT_IDENTIFIER));
             ilistItem.setVocabType((String) docModel.getProperty(label,
                        AuthorityJAXBSchema.VOCAB_TYPE));
-            String id = NuxeoUtils.extractId(docModel.getPathAsString());
+            String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);
             list.add(ilistItem);

diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
index e54078efbc08573e13ae072fc6dcb934b019b325..eb8828dbe188239b7218b0259ae53067ff98f1ae 100644 (file)
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
@@ -76,7 +76,7 @@ public class VocabularyItemDocumentModelHandler
                                        AuthorityItemJAXBSchema.SHORT_IDENTIFIER));
                        ilistItem.setRefName((String) docModel.getProperty(commonPartLabel, 
                                        AuthorityItemJAXBSchema.REF_NAME));
-                       String id = NuxeoUtils.extractId(docModel.getPathAsString());
+                       String id = getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
                        ilistItem.setUri("/vocabularies/" + inAuthority + "/items/" + id);
                        ilistItem.setCsid(id);
                        list.add(ilistItem);