Fixing missing CSID bug in CollectionObject service

diff --git a/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd b/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd
index bf3dcfc21142e71af227fdacc5724ce8a2242cb6..221a00bbaaa4ae7649db00047f4ee578eeb9914f 100644 (file)
--- a/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd
+++ b/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd
@@ -130,6 +130,7 @@
     <xs:element name="collection-object">
         <xs:complexType>
             <xs:sequence>
+                           <xs:element name="csid" type="xs:string" />
                            <xs:element name="objectNumber" type="xs:string"/>
                            <xs:element name="otherNumber" type="xs:string"/>
                            <xs:element name="briefDescription" type="xs:string"/>

diff --git a/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/CollectionObjectResource.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/CollectionObjectResource.java
index af28915c770994dfc66f39085c0931a90cf9afa2..90255d06db96982927f49ba347be9011c04b160a 100644 (file)
--- a/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/CollectionObjectResource.java
+++ b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/CollectionObjectResource.java
@@ -131,6 +131,7 @@ public class CollectionObjectResource implements CollectionSpaceResource {
                 Element element = (Element) i.next();
                 if ("docRef".equals(element.getName())){
                     csid = (String) element.getData();
+                    co.setCsid(csid);
                 }
             }
         } catch(Exception e){
@@ -139,6 +140,7 @@ public class CollectionObjectResource implements CollectionSpaceResource {
             throw new WebApplicationException(response);
         }
 
+        
         verbose("createCollectionObject: ", co);
         UriBuilder path = UriBuilder.fromResource(PersonNuxeoResource.class);
         path.path("" + csid);

diff --git a/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/DomainIdentifierResource.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/DomainIdentifierResource.java
index 67e30515bd48ba3c056690d2f7b88c2d06480e5d..16a465c11678bfb4e7f2405c4944f36353f22256 100644 (file)
--- a/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/DomainIdentifierResource.java
+++ b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/DomainIdentifierResource.java
@@ -39,7 +39,7 @@ public class DomainIdentifierResource implements CollectionSpaceResource {
         if (newId.getDsid() == null) {
                newId.setDsid("org.collectionspace");
         }
-        newId.setDsid(newId.getDsid() + System.currentTimeMillis());
+        newId.setDsid(newId.getDsid() + "." + System.currentTimeMillis());
         idDB.put(newId.getDsid(), newId);
         
         verbose("createIdentifier: ", newId);