--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ArtifactOutResource.java	Sat Sep 12 10:45:28 2009 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ArtifactOutResource.java	Sun Sep 13 14:50:53 2009 +0000
@@ -18,8 +18,8 @@
 import de.intevation.artifactdatabase.XMLUtils;
 
 import de.intevation.artifacts.ArtifactNamespaceContext;
+import de.intevation.artifacts.ArtifactDatabaseException;
 import de.intevation.artifacts.ArtifactDatabase;
-import de.intevation.artifacts.Artifact;
 
 import org.w3c.dom.Document;
 
@@ -68,15 +68,6 @@
             logger.debug("looking for artifact id '" + identifier + "'");
         }
 
-        Artifact artifact = db.getArtifact(identifier);
-
-        if (artifact == null) {
-            Response response = getResponse();
-            response.setStatus(
-                Status.CLIENT_ERROR_NOT_FOUND, ArtifactResource.NO_ARTIFACT_FOUND);
-            return new EmptyRepresentation();
-        }
-
         String mimeTypeString = XMLUtils.xpathString(
             inputDocument,
             XPATH_MIME_TYPE,
@@ -93,8 +84,17 @@
             }
         }
 
-        return new OutRepresentation(
-            mimeType, artifact, inputDocument, db.getArtifactContext());
+        try {
+            return new OutRepresentation(
+                mimeType,
+                db.out(identifier, inputDocument));
+        }
+        catch (ArtifactDatabaseException adbe) {
+            Response response = getResponse();
+            response.setStatus(
+                Status.CLIENT_ERROR_NOT_FOUND, adbe.getMessage());
+            return new EmptyRepresentation();
+        }
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8: