Changeset 3827

Timestamp:

06/30/11 04:29:38 (11 months ago)

Author:

theuer

Message:

p=theuer r=theuer (closes #640) (closes #641) Changed config files back and deleted .gitignore
Implemented new feature that you can have Java Simple Date Format strings in filename as in ${now} etc.

Location:

print/trunk

Files:

• . (modified) (1 prop)
• .gitignore (deleted)
• src/main/java/org/mapfish/print/PDFUtils.java (modified) (2 diffs)
• src/main/java/org/mapfish/print/config/Config.java (modified) (2 diffs)
• src/main/java/org/mapfish/print/config/layout/Layouts.java (modified) (1 diff)
• src/main/webapp/WEB-INF/web.xml (modified) (1 diff)
• src/main/webapp/config.yaml (modified) (1 diff)

print/trunk

@@ +1 @@
+.gitignore
+.gradle
+build
 target
-build
-.gradle

@@ +1 @@
+.gitignore
+.gradle
+build
 target
-build
-.gradle

print/trunk/src/main/java/org/mapfish/print/PDFUtils.java

@@ -266 +266 @@
 
     private static final Pattern FORMAT_PATTERN = Pattern.compile("^format\\s+(%[-+# 0,(]*\\d*(\\.\\d*)?(d))\\s+(.*)$");
+    
+    public static String getValueFromString(String val) {
+        String str = val;
+        while (true) {
+            Matcher matcher = VAR_REGEXP.matcher(val);
+            if (matcher.find()) {
+                str = val.substring(0, matcher.start());
+                final String varName = matcher.group(1); // varName == key
+                str += getDateValue(varName);
+                val = val.substring(matcher.end());
+            } else {
+                break;
+            }
+        }
+        return str;
+    }
+    
+    private static String getDateValue(String key) {
+        String val = "";
+        if (key.equals("now")) {
+            val = new Date().toString();
+        } else if (key.startsWith("now ")) {
+            val = formatTime(key);
+        }
+        return val;
+    }
 
     private static String getContextValue(RenderingContext context, PJsonObject params, String key) {
@@ -332 +358 @@
             return new Date().toString();
         }
+    }
+    
+    private static String formatTime(String key) throws IllegalArgumentException {
+        SimpleDateFormat format = new SimpleDateFormat(key.substring(4));
+        return format.format(new Date());
     }
 

print/trunk/src/main/java/org/mapfish/print/config/Config.java

@@ -32 +32 @@
 import org.json.JSONWriter;
 import org.mapfish.print.InvalidValueException;
+import org.mapfish.print.PDFUtils;
 import org.mapfish.print.config.layout.Layout;
 import org.mapfish.print.config.layout.Layouts;
@@ -395 +396 @@
         String name = null;
         if(layout != null) {
-            name = layout.getOutputFilename();
-        }
-
+            name = PDFUtils.getValueFromString(layout.getOutputFilename()); // get the string if it has ${now} or ${now DATEFORMAT} in it
+        }
         return name == null ? outputFilename : name;
     }

print/trunk/src/main/java/org/mapfish/print/config/layout/Layouts.java

@@ -29 +29 @@
  */
 public class Layouts extends HashMap<String, Layout> {
-    public static class Wrapper extends DefaultMapWrapper {
+    /**
+         * 
+         */
+        private static final long serialVersionUID = 1L;
+
+        public static class Wrapper extends DefaultMapWrapper {
         public Wrapper(Class<Layout> type) {
             super(type);

print/trunk/src/main/webapp/WEB-INF/web.xml

@@ -9 +9 @@
     <init-param>
       <param-name>config</param-name>
-      <param-value>configVector.yaml</param-value>
+      <param-value>config.yaml</param-value>
     </init-param>
   </servlet>

print/trunk/src/main/webapp/config.yaml

@@ -45 +45 @@
     host: demo.mapfish.org
     port: 80
-  - !dnsMatch
-    host: basemap-web.zen.landcareresearch.co.nz
-    port: 80
 
 # the default fileName for the files downloaded from the servlet

@@ +1 @@
+.gitignore
+.gradle
+build
 target
-build
-.gradle