diff artifacts/src/main/java/org/dive4elements/river/collections/D4EArtifactCollection.java @ 8225:724081af301c

Pass request document to the context injectors.
author Sascha L. Teichmann <teichmann@intevation.de>
date Mon, 08 Sep 2014 16:14:43 +0200
parents 1d3d61c8f596
children 4d99606a844e
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/collections/D4EArtifactCollection.java	Mon Sep 08 16:06:50 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/collections/D4EArtifactCollection.java	Mon Sep 08 16:14:43 2014 +0200
@@ -330,13 +330,14 @@
 
         // XXX NOTE: the outGen is not able to process its generate() operation,
         // because it has no OutputStream set!
-        outGen.init(out, XMLUtils.newDocument(), null, getContext());
+        Document dummy = XMLUtils.newDocument();
+        outGen.init(out, dummy, null, getContext());
         prepareMasterArtifact(outGen);
 
         try {
             Document outAttr = getAttribute(attr, out);
             OutputHelper helper = new OutputHelper(identifier());
-            helper.doOut(outGen, out, out, outAttr, getContext());
+            helper.doOut(outGen, out, out, outAttr, getContext(), dummy);
         }
         catch (ArtifactDatabaseException adbe) {
             log.error(adbe, adbe);
@@ -422,9 +423,9 @@
             Document attr = getAttribute(cAttr, name);
             OutputHelper helper = new OutputHelper(identifier());
             if (name.equals("sq_overview")) {
-                helper.doOut(generator, name, subtype, format, context);
+                helper.doOut(generator, name, subtype, format, context, format);
             }
-            helper.doOut(generator, name, subtype, attr, context);
+            helper.doOut(generator, name, subtype, attr, context, format);
             generator.generate();
         }
         catch (ArtifactDatabaseException adbe) {

http://dive4elements.wald.intevation.org