add condition to page

adube · Dec 22, 2011 · 56fd2ea · 56fd2ea
1 parent 913752c
commit 56fd2ea
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 25 deletions.
diff --git a/src/main/java/org/mapfish/print/config/layout/Block.java b/src/main/java/org/mapfish/print/config/layout/Block.java
@@ -93,9 +93,9 @@ public VerticalAlign getVertAlign() {
         return vertAlign;
     }
 
-    private static final Pattern CONDITION_REGEXP = Pattern.compile("^(!?)(.*)$");
+    public static final Pattern CONDITION_REGEXP = Pattern.compile("^(!?)(.*)$");
 
-    public boolean isVisible(RenderingContext context, PJsonObject params) {
+    public static final boolean testCondition(RenderingContext context, PJsonObject params, String condition) {
         if (condition == null) {
             return true;
         }
@@ -116,6 +116,10 @@ public boolean isVisible(RenderingContext context, PJsonObject params) {
         return result;
     }
 
+    public boolean isVisible(RenderingContext context, PJsonObject params) {
+        return testCondition(context, params, condition);
+    }
+
     public void setCondition(String condition) {
         this.condition = condition;
         if (condition != null && !CONDITION_REGEXP.matcher(condition).matches()) {

diff --git a/src/main/java/org/mapfish/print/config/layout/Page.java b/src/main/java/org/mapfish/print/config/layout/Page.java
@@ -42,31 +42,34 @@ public class Page {
     private String marginBottom = "20";
     private String backgroundPdf = null;
     private boolean landscape = false;
+    private String condition = null;
 
     public void render(PJsonObject params, RenderingContext context) throws DocumentException {
-        final Document doc = context.getDocument();
-        doc.setPageSize(getPageSizeRect(context, params));
-        doc.setMargins(getMarginLeft(context, params), getMarginRight(context, params),
-                getMarginTop(context, params) + (header != null ? header.getHeight() : 0),
-                getMarginBottom(context, params) + (footer != null ? footer.getHeight() : 0));
-
-        context.getCustomBlocks().setBackgroundPdf(PDFUtils.evalString(context, params, backgroundPdf));
-        if (doc.isOpen()) {
-            doc.newPage();
-        } else {
-            doc.open();
-        }
-        context.getCustomBlocks().setHeader(header, params);
-        context.getCustomBlocks().setFooter(footer, params);
-
-        for (int i = 0; i < items.size(); i++) {
-            Block block = items.get(i);
-            if (block.isVisible(context, params)) {
-                block.render(params, new Block.PdfElement() {
-                    public void add(Element element) throws DocumentException {
-                        doc.add(element);
-                    }
-                }, context);
+        if (isVisible(context, params)) {
+            final Document doc = context.getDocument();
+            doc.setPageSize(getPageSizeRect(context, params));
+            doc.setMargins(getMarginLeft(context, params), getMarginRight(context, params),
+                    getMarginTop(context, params) + (header != null ? header.getHeight() : 0),
+                    getMarginBottom(context, params) + (footer != null ? footer.getHeight() : 0));
+
+            context.getCustomBlocks().setBackgroundPdf(PDFUtils.evalString(context, params, backgroundPdf));
+            if (doc.isOpen()) {
+                doc.newPage();
+            } else {
+                doc.open();
+            }
+            context.getCustomBlocks().setHeader(header, params);
+            context.getCustomBlocks().setFooter(footer, params);
+
+            for (int i = 0; i < items.size(); i++) {
+                Block block = items.get(i);
+                if (block.isVisible(context, params)) {
+                    block.render(params, new Block.PdfElement() {
+                        public void add(Element element) throws DocumentException {
+                            doc.add(element);
+                        }
+                    }, context);
+                }
             }
         }
     }
@@ -80,6 +83,17 @@ public Rectangle getPageSizeRect(RenderingContext context, PJsonObject params) {
         }
     }
 
+    protected boolean isVisible(RenderingContext context, PJsonObject params) {
+        return Block.testCondition(context, params, condition);
+    }
+
+    public void setCondition(String condition) {
+        this.condition = condition;
+        if (condition != null && !Block.CONDITION_REGEXP.matcher(condition).matches()) {
+            throw new InvalidValueException("condition", condition);
+        }
+    }
+
     public List<Block> getItems() {
         return items;
     }