Changeset 3826

Timestamp:

06/29/11 07:17:42 (11 months ago)

Author:

theuer

Message:

p=theuer, r=theuer (closes #639)

Also, added some code to debug #638

Location:

print/trunk

Files:

• .gitignore (modified) (1 diff)
• build.gradle (modified) (1 diff)
• src/main/java/org/mapfish/print/PDFUtils.java (modified) (3 diffs)
• src/main/java/org/mapfish/print/config/Config.java (modified) (1 diff)
• src/main/java/org/mapfish/print/config/layout/ColumnsBlock.java (modified) (6 diffs)
• src/main/java/org/mapfish/print/config/layout/LegendsBlock.java (modified) (5 diffs)
• src/main/java/org/mapfish/print/config/layout/MapBlock.java (modified) (2 diffs)
• src/main/java/org/mapfish/print/map/readers/WMSServerInfo.java (modified) (1 diff)
• src/main/java/org/mapfish/print/map/renderers/SVGTileRenderer.java (modified) (3 diffs)
• src/main/java/org/mapfish/print/servlet/BaseMapServlet.java (modified) (6 diffs)
• src/main/webapp/WEB-INF/web.xml (modified) (1 diff)
• src/main/webapp/config.yaml (modified) (1 diff)

print/trunk/.gitignore

@@ -1 @@
-.gradle
+.gradle/
 build/
 .DS_Store
 .classpath
-.project
+.project/
 .settings/
+depfile.txt
+docs
+lib/
+print-lib/
+print-servlet/
+print-standalone/
+samples/
+todo
+.svn/
+src/main/webapp/.smap.yaml.swp
+src/main/webapp/Copy of configVector.yaml
+src/main/webapp/portal.yaml~
+src/main/webapp/smap.yaml~
+build.sbt

print/trunk/build.gradle

@@ -57 +57 @@
 }
 
-task standalone (dependsOn: test, type: Jar) {
+task standalone (type: Jar) {
   baseName = "print-standalone"
 

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

@@ -36 +36 @@
 import org.apache.batik.gvt.GraphicsNode;
 import org.apache.batik.util.XMLResourceDescriptor;
-import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.cookie.CookiePolicy;
@@ -51 +50 @@
 import java.net.URI;
 import java.net.URL;
-import java.net.URLConnection;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -484 +482 @@
                 }
                 return myOffset;
+        }
+        
+        public static Chunk createImageChunkFromSVG(RenderingContext context, String iconItem, double maxIconWidth, double maxIconHeight) throws IOException {
+                return new Chunk(PDFUtils.createImageFromSVG(context, iconItem, maxIconWidth, maxIconHeight), 0f, 0f, true);            
         }
 

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

@@ -75 +75 @@
     private int globalParallelFetches = 5;
     private int perHostParallelFetches = 5;
-    private int socketTimeout = 3*60*1000;
-    private int connectionTimeout = 30*1000;
+    private int socketTimeout = 40*60*1000; // 40 minutes //3*60*1000;
+    private int connectionTimeout = 40*60*1000; // 40 minutes //30*1000;
 
     private boolean tilecacheMerging = false;

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

@@ -44 +44 @@
     private int width = Integer.MIN_VALUE;
     */
-    private float absoluteX = Float.MIN_VALUE;
-    private float absoluteY = Float.MIN_VALUE;
-    private float width = Float.MIN_VALUE;
+    private double absoluteX = Double.MIN_VALUE;
+    private double absoluteY = Double.MIN_VALUE;
+    private double width = Double.MIN_VALUE;
     private int nbColumns = Integer.MIN_VALUE;
     private TableConfig config = null;
@@ -57 +57 @@
                     final PdfPTable table = PDFUtils.buildTable(items, params, context, nbColumns, config);
                     if (table != null) {
-                        table.setTotalWidth(width);
+                        table.setTotalWidth((float) width);
                         table.setLockedWidth(true);
 
@@ -64 +64 @@
                         }
 
-                        table.writeSelectedRows(0, -1, absoluteX, absoluteY, dc);
+                        table.writeSelectedRows(0, -1, (float) absoluteX, (float) absoluteY, dc);
                     }
                 }
@@ -89 +89 @@
     }
 
-    public void setAbsoluteX(float absoluteX) {
+    public void setAbsoluteX(double absoluteX) {
         this.absoluteX = absoluteX;
     }
 
-    public void setAbsoluteY(float absoluteY) {
+    public void setAbsoluteY(double absoluteY) {
         this.absoluteY = absoluteY;
     }
@@ -106 +106 @@
 
     public boolean isAbsolute() {
-        return absoluteX != Float.MIN_VALUE &&
-                absoluteY != Float.MIN_VALUE &&
-                width != Float.MIN_VALUE;
+        return absoluteX != Double.MIN_VALUE &&
+                absoluteY != Double.MIN_VALUE &&
+                width != Double.MIN_VALUE;
     }
 
@@ -130 +130 @@
         if (items.size() < 1) throw new InvalidValueException("items", "[]");
 
-        if (!((absoluteX != Float.MIN_VALUE && absoluteY != Float.MIN_VALUE && width != Float.MIN_VALUE) ||
-                (absoluteX == Float.MIN_VALUE && absoluteY == Float.MIN_VALUE && width == Float.MIN_VALUE))) {
+        if (!((absoluteX != Double.MIN_VALUE && absoluteY != Double.MIN_VALUE && width != Double.MIN_VALUE) ||
+                (absoluteX == Double.MIN_VALUE && absoluteY == Double.MIN_VALUE && width == Double.MIN_VALUE))) {
             throw new InvalidValueException("absoluteX, absoluteY or width", "all of them must be defined or none");
         }

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

@@ -23 +23 @@
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
-import com.lowagie.text.Image;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.pdf.BaseFont;
@@ -94 +93 @@
         final PJsonArray icons = node.optJSONArray("icons");
 
-        Image image = null;
-
         final Paragraph result = new Paragraph();
         result.setFont(pdfFont);
         if (icon != null) {
-            result.add(PDFUtils.createImageChunk(context, maxIconWidth, maxIconHeight, URI.create(icon), 0.0f));
-            result.add(" ");
+                try {
+                        if (icon.indexOf("image%2Fsvg%2Bxml") != -1) { // TaODO: make this cleaner
+                                result.add(PDFUtils.createImageChunkFromSVG(context, icon, maxIconWidth, maxIconHeight));
+                        } else {
+                                result.add(PDFUtils.createImageChunk(context, maxIconWidth, maxIconHeight, URI.create(icon), 0.0f));
+                        }
+                    result.add(" ");
+                } catch (IOException ioe) {
+                LOGGER.warn("Failed to load " + icon + " with " + ioe.getMessage());
+            } catch (InvalidValueException e) {
+                LOGGER.warn("Failed to create image chunk: " + e.getMessage());
+            }
         }
         if (icons != null) {
@@ -107 +114 @@
                 try {
                     if (iconItem.indexOf("image%2Fsvg%2Bxml") != -1) { // TaODO: make this cleaner
-                        image = PDFUtils.createImageFromSVG(context, iconItem, maxIconWidth, maxIconHeight);
+                        result.add(PDFUtils.createImageChunkFromSVG(context, iconItem, maxIconWidth, maxIconHeight));
                     } else {
                         result.add(PDFUtils.createImageChunk(context, maxIconWidth, maxIconHeight, URI.create(iconItem), 0.0f));
@@ -119 +126 @@
             }
         }
-        result.add(name);
 
         final PdfPCell cell = new PdfPCell(result);
@@ -125 +131 @@
         cell.setPadding(0f);
         cell.setPaddingLeft((float) indent);
-        if (image != null) {
-            cell.addElement(image);
-        }
+
+        result.add(name);
 
         if (getBackgroundColorVal(context, params) != null) {

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

@@ -186 +186 @@
 
     public void printClientConfig(JSONWriter json) throws JSONException {
+        /**
+         * Changed width and height to be double from int to accomodate double values in yaml config
+         */
         json.object();
-        int w;
+        double w; //int w;
         try {
-            w = Integer.parseInt(width);
+                w = Math.round(Double.parseDouble(width)); //w = Integer.parseInt(width);
         } catch (NumberFormatException e) {
             w = 0;
@@ -195 +198 @@
         json.key("width").value(w);
 
-        int h;
+        double h; //int h;
         try {
-            h = Integer.parseInt(height);
+                h = Math.round(Double.parseDouble(height)); //h = Integer.parseInt(height);
         } catch (NumberFormatException e) {
             h = 0;

print/trunk/src/main/java/org/mapfish/print/map/readers/WMSServerInfo.java

@@ -88 +88 @@
             } catch (Exception e) {
                 LOGGER.info("Error while getting capabilities for "+uri+". The print module will assume it's a standard WMS.");
+                String stackTrace = "";
+                for (StackTraceElement el : e.getStackTrace()) {
+                        stackTrace += el.toString() +"\n";
+                }
+                LOGGER.info(stackTrace);
                 result = new WMSServerInfo();
             }

print/trunk/src/main/java/org/mapfish/print/map/renderers/SVGTileRenderer.java

@@ -56 +56 @@
     public static final Logger LOGGER = Logger.getLogger(SVGTileRenderer.class);
 
-    private static final Document svgZoomOut;
+    private static Document svgZoomOut;
 
     static {
+        makeSvgZoomOut();
+    }
+    private static void makeSvgZoomOut() {
         DOMParser parser = new DOMParser();
         String svgZoomFileName = "svgZoomOut.xsl";
@@ -140 +143 @@
         final float zoomFactor = transformer.getSvgFactor() * context.getStyleFactor();
         if (svgZoomOut != null && zoomFactor != 1.0f) {
+                javax.xml.transform.Transformer xslt = null;
             try {
                 DOMResult transformedSvg = new DOMResult();
                 final TransformerFactory factory = TransformerFactory.newInstance();
-                javax.xml.transform.Transformer xslt = factory.newTransformer(new DOMSource(svgZoomOut));
+                if (svgZoomOut.getTextContent() == null) {
+                        makeSvgZoomOut(); // a bit of a hack
+                }
+                xslt = factory.newTransformer(new DOMSource(svgZoomOut));
 
                 //TODO: may want a different zoom factor in function of the layer and the type (symbol, line or font)
@@ -168 +175 @@
 
             } catch (Exception e) {
+                if (xslt == null) {
+                        // some more information about the error
+                        LOGGER.error("xslt = NULL, zoomFactor = "+ 
+                                        zoomFactor +", svgZoomOut = "+ svgZoomOut
+                                        +"\nsvgZoomOut.getTextContent() = "+ svgZoomOut.getTextContent()
+                                        +"\nsvgZoomOut.getChildNodes().getLength() = "+ svgZoomOut.getChildNodes().getLength());
+                }
+                
                 context.addError(e);
                 return null;

print/trunk/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java

@@ -41 +41 @@
     private Map<String, MapPrinter> printers = null;
     private long lastModified = 0L;
+    private long defaultLastModified = 0L;
     private Map<String,Long> lastModifieds = null;
 
@@ -58 +59 @@
             throw new ServletException("Missing configuration in web.xml 'web-app/servlet/init-param[param-name=config]' or 'web-app/context-param[param-name=config]'");
         }
+        //String debugPath = "";
 
         File configFile = null;
@@ -63 +65 @@
                 if (lastModifieds == null) {
                         lastModifieds = new HashMap<String, Long>();
+                        //debugPath += "new HashMap\n";
                 }
-                try {
-                        printer = printers.get(app);
-                } catch (Exception e) {
-                                printer = null;
-                        }
+                if (printers instanceof HashMap &&  printers.containsKey(app)) {
+                        printer = printers.get(app);
+                        //debugPath += "get printer from hashmap\n";
+                } else {
+                        printer = null;
+                        //debugPath += "printer = null 1\n";
+                }
                 configFile = new File(app +".yaml");
         } else {
                 configFile = new File(configPath);
+                //debugPath += "configFile = new ..., 1\n";
         }
         if (!configFile.isAbsolute()) {
                 if (app != null) {
+                        //debugPath += "config is absolute app = "+app+"\n";
                         configFile = new File(getServletContext().getRealPath(app +".yaml"));
                 } else {
                         configFile = new File(getServletContext().getRealPath(configPath));
+                        //debugPath += "config is absolute app DEFAULT\n";
                 }
         }
         if (app != null) {
-                try {
+                if (lastModifieds instanceof HashMap && lastModifieds.containsKey(app)) {
                         lastModified = lastModifieds.get(app);
-                } catch (Exception e) {
-                                lastModified = 0L;
-                        }
+                        //debugPath += "app = "+app+" lastModifieds has key and gotten: "+ lastModified +"\n";
+                } else {
+                        lastModified = 0L;
+                        //debugPath += "app = "+app+" lastModifieds has NOT key and gotten: "+ lastModified +" (0L)\n";
+                }
+        } else {
+                lastModified = defaultLastModified; // this is a fix for when configuration files have changed
+                //debugPath += "app = NULL lastModifieds from defaultLastModified: "+ lastModified +"\n";
         }
 
@@ -93 +106 @@
             try {
                 printer.stop();
+                
+                //debugPath += "printer stopped, setting NULL\n";
             } catch (NullPointerException npe) {
-                LOGGER.info("BaseMapServlet.java: printer was not stopped. This happens when a switch between applications happens.");
+                LOGGER.info("BaseMapServlet.java: printer was not stopped. This happens when a switch between applications happens.\n"+ npe);
             }
             
             printer = null;
+            if (app != null) {
+                LOGGER.info("Printer for "+ app +" stopped");
+                printers.put(app, null);
+            }
         }
 
         if (printer == null) {
             lastModified = configFile.lastModified();
+            //debugPath += "printer == null, lastModified from configFile = "+lastModified+"\n";
             try {
                 LOGGER.info("Loading configuration file: " + configFile.getAbsolutePath());
@@ -108 +128 @@
                         if (printers == null) {
                                 printers = new HashMap<String, MapPrinter>();
+                                //debugPath += "printers = new HashMap , printer == null, app = "+app+"\n";
                         }
                         printers.put(app, printer);
                         lastModifieds.put(app, lastModified);
+                        //debugPath += "putting app = "+app+" HashMaps: printer and lastModified: "+lastModified+"\n";
+                } else {
+                        defaultLastModified = lastModified; // need this for default application
+                        //debugPath += "defaultLastModified = "+defaultLastModified+" 123\n";
                 }
             } catch (FileNotFoundException e) {
@@ -116 +141 @@
             }
         }
+        
+        //LOGGER.info(debugPath);
+        /*
+        try {
+            if (app == null) {
+                throw new Exception("Just to see the stack trace");
+            }
+                throw new Exception("Just to see the stack trace");
+        } catch (Exception e) {
+                StackTraceElement stelements[] = e.getStackTrace();
+                for (StackTraceElement s : stelements) {
+                        LOGGER.warn("StackTraceElement ASD: "+ s.toString());
+                }
+                //LOGGER.warn("app == NULL:\n"+ e.getStackTrace());
+        }
+        */
         return printer;
     }

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

@@ -9 +9 @@
     <init-param>
       <param-name>config</param-name>
-      <param-value>config.yaml</param-value>
+      <param-value>configVector.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