# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1301041627 0
# Node ID 98695dc6d94dbd36f5edf7796d64d4c6c780f069
# Parent  f75f83af19e036e624a8d8ae61d1f4e46b2e48ea
The operation that adds an artifact to an artifact collection will now return the DESCRIBE document of the artifact collection.

artifacts/trunk@1566 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r f75f83af19e0 -r 98695dc6d94d ChangeLog
--- a/ChangeLog	Thu Mar 24 18:42:43 2011 +0000
+++ b/ChangeLog	Fri Mar 25 08:27:07 2011 +0000
@@ -1,3 +1,9 @@
+2011-03-25  Ingo Weinzierl <ingo@intevation.de>
+
+	* artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java:
+	  The operation that adds an artifact to an artifact collection will
+	  return the DESCRIBE document of the artifact collection now.
+
 2011-03-24  Ingo Weinzierl <ingo@intevation.de>
 
 	* artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifactCollection.java,
diff -r f75f83af19e0 -r 98695dc6d94d artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java	Thu Mar 24 18:42:43 2011 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java	Fri Mar 25 08:27:07 2011 +0000
@@ -88,6 +88,13 @@
         "No such artifact";
 
     /**
+     * Error message issued if a requested artifact is not found
+     * in this database.
+     */
+    public static final String NO_SUCH_COLLECTION =
+        "No such collection";
+
+    /**
      * Error message issued if the creation of an artifact failed.
      */
     public static final String CREATION_FAILED =
@@ -1174,6 +1181,7 @@
 
         if (c == null) {
             logger.warn("No collection found with identifier: " + collectionId);
+            throw new ArtifactDatabaseException(NO_SUCH_COLLECTION);
         }
 
         CallContext cc = new CollectionCallContext(
@@ -1257,19 +1265,23 @@
             artifactId,
             attr);
 
-        Document result = XMLUtils.newDocument();
+        if (!success) {
+            Document result = XMLUtils.newDocument();
 
-        XMLUtils.ElementCreator ec = new XMLUtils.ElementCreator(
-            result,
-            ArtifactNamespaceContext.NAMESPACE_URI,
-            ArtifactNamespaceContext.NAMESPACE_PREFIX);
+            XMLUtils.ElementCreator ec = new XMLUtils.ElementCreator(
+                result,
+                ArtifactNamespaceContext.NAMESPACE_URI,
+                ArtifactNamespaceContext.NAMESPACE_PREFIX);
 
-        Element root = ec.create("result");
-        result.appendChild(root);
+            Element root = ec.create("result");
+            result.appendChild(root);
 
-        root.setTextContent(success ? OPERATION_SUCCESSFUL: OPERATION_FAILURE);
+            root.setTextContent(OPERATION_FAILURE);
 
-        return result;
+            return result;
+        }
+
+        return describeCollection(collectionId, callMeta);
     }
 
     public Document removeCollectionArtifact(String collectionId, String artifactId,