From 7c5cc8940f91412ceccf456672d9d41860d877d2 Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Thu, 7 Oct 2010 12:06:47 +0000
Subject: Provide profile description via API call. More logging. WebApp:
 Bugfix for IE9 (download Link accessed twice) WebApp: Prevent Set-Cookie to
 be sent to BKU WebApp: Statistical logging added

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@592 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java          |  2 +-
 .../knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java |  2 --
 .../wag/egov/egiz/web/servlets/ProvidePDFServlet.java         |  4 +++-
 .../at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java | 11 +++++------
 4 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/main/java/at/knowcenter/wag')

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
index 59c6b93..431f7b2 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
@@ -100,7 +100,7 @@ public abstract class PdfAS
    * The current version of the pdf-as library. This version string is logged on every invocation
    * of the api or the web application.
    */
-  public static final String PDFAS_VERSION = "3.1.1-snapshot (20100812)";
+  public static final String PDFAS_VERSION = "3.1.1-snapshot (20101007)";
   
   /**
    * The key of the strict mode setting.
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
index 7cf762e..621ee6f 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/DataURLServlet.java
@@ -296,8 +296,6 @@ public class DataURLServlet extends HttpServlet
             String downloadURL = response.encodeRedirectURL(LocalRequestHelper.getLocalContextAddress(request, response) + "/ProvidePDF");
             log.debug("Creating download URL \"" + downloadURL + "\".");
             session.setAttribute(SessionAttributes.DOWNLOAD_URL_FOR_SIGNED_PDF_DOCUMENT, downloadURL);
-            Cookie cookie = new Cookie("JSESSIONID", session.getId());
-            response.addCookie(cookie);
             temporaryRedirect(response.encodeRedirectURL(LocalRequestHelper.getLocalContextAddress(request, response) + "/jsp/download.jsp") , response);
 
             // Not needed due to temporaryRedirect.
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java
index 0efed03..715b5be 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java
@@ -57,7 +57,9 @@ public class ProvidePDFServlet extends HttpServlet {
             return;
          } else {
             log.debug("Signed pdf found.");
-            session.removeAttribute(SessionAttributes.SIGNED_PDF_DOCUMENT);
+            // do NOT remove signed pdf document from session since IE9 loads this page/servlet twice...)
+            // Popup-Blocker, Link-Prefetching, IE 9 SmartScreen-Filter...???
+            // session.removeAttribute(SessionAttributes.SIGNED_PDF_DOCUMENT);
             log.debug("Returning signed pdf to browser.");
             SignServletHelper.returnSignResponse(si, request, response);
             log.debug("Removing free text (if any) from session.");
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java
index 4c93b73..982e872 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java
@@ -87,6 +87,7 @@ public class SignServlet extends HttpServlet
    * The log.
    */
   private static Log log = LogFactory.getLog(SignServlet.class);
+  private static Log statLog = LogFactory.getLog("statistic");
 
   protected void dispatch(HttpServletRequest request, HttpServletResponse response, String resource) throws ServletException, IOException
   {
@@ -172,8 +173,7 @@ public class SignServlet extends HttpServlet
     
     // for performance measurement
     long startTime = 0; 
-    long fileSize = 0;
-    if (log.isInfoEnabled()) {
+    if (statLog.isInfoEnabled()) {
     	startTime = System.currentTimeMillis();    	
     }
     
@@ -310,13 +310,12 @@ public class SignServlet extends HttpServlet
       SignServletHelper.finishSign(si, request, response, getServletContext());
       
       // for performance measurement
-      if (log.isInfoEnabled()) {
+      if (statLog.isInfoEnabled()) {
       	long endTime = System.currentTimeMillis();
 //      	String toReport = "SIGN;" + si.mode + ";" + si.filename + ";"+ fileSize + ";" + 
-      	String toReport = "SIGN;" + si.mode + ";XXX;"+ fileSize + ";" + 
-      	(endTime - startTime); 
+      	String toReport = "SIGN;" + si.mode + ";" + si.connector + ";" + si.pdfDataSource.getLength() + ";" + (endTime - startTime); 
       	
-      	log.info(toReport);
+      	statLog.info(toReport);
       }
     }
     catch (PresentableException e)
-- 
cgit v1.2.3