From db52e4d66d60184d53a27ba4d6772461daacc03d Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Fri, 22 Mar 2013 08:57:51 +0000
Subject: Maintenance update (bugfixes, new features, cleanup...) Refer to
 /dok/RELEASE_NOTES-3.3.txt for further information.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/pdf-as/trunk@931 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../at/gv/egiz/pdfas/web/servlets/SignServlet.java | 32 ++++------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

(limited to 'pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java')

diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java
index d07b72e..cd2c38a 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java
@@ -27,14 +27,12 @@
 package at.gv.egiz.pdfas.web.servlets;
 
 import java.io.BufferedInputStream;
-import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 
@@ -51,13 +49,12 @@ import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.pdfas.api.commons.Constants;
 import at.gv.egiz.pdfas.api.exceptions.PdfAsException;
 import at.gv.egiz.pdfas.api.io.DataSource;
-import at.gv.egiz.pdfas.api.io.TextBased;
 import at.gv.egiz.pdfas.api.sign.pos.SignaturePositioning;
 import at.gv.egiz.pdfas.exceptions.ErrorCode;
 import at.gv.egiz.pdfas.exceptions.ErrorCodeHelper;
@@ -65,10 +62,8 @@ import at.gv.egiz.pdfas.exceptions.external.ExternalErrorException;
 import at.gv.egiz.pdfas.web.ExternAppInformation;
 import at.gv.egiz.pdfas.web.FormFields;
 import at.gv.egiz.pdfas.web.helper.ApiHelper;
-import at.gv.egiz.pdfas.web.helper.SessionHelper;
 import at.gv.egiz.pdfas.web.helper.SignServletHelper;
 import at.gv.egiz.pdfas.web.helper.WebSettingsReader;
-import at.gv.egiz.pdfas.web.helper.WebUtils;
 import at.gv.egiz.pdfas.web.io.ByteArrayPdfDataSource;
 import at.gv.egiz.pdfas.web.itext.IText;
 import at.gv.egiz.pdfas.web.session.SessionAttributes;
@@ -99,7 +94,6 @@ public class SignServlet extends HttpServlet
    * The log.
    */
   private static Log log = LogFactory.getLog(SignServlet.class);
-  private static Log statLog = LogFactory.getLog("statistic");
 
 
 
@@ -153,10 +147,7 @@ public class SignServlet extends HttpServlet
 
 
     // for performance measurement
-    long startTime = 0;
-    if (statLog.isInfoEnabled()) {
-    	startTime = System.currentTimeMillis();
-    }
+    long startTime = System.currentTimeMillis();
 
     // check if pdf-as has been called by external webapp
     if (request.getParameter(FormFields.FIELD_PDF_URL) != null)
@@ -197,9 +188,9 @@ public class SignServlet extends HttpServlet
       //end added
 
       session = request.getSession(true);
-      
+
       session.setAttribute(SignServlet.SUBMITFORM_FILENAME_KEY, filename);
-      
+
       // added by tknall
       if (sig_pos_y != null && sig_pos_p != null && sig_pos_x != null) {
     	 if (sig_pos_w != null) {
@@ -227,7 +218,7 @@ public class SignServlet extends HttpServlet
       }
 
 
-      // fixed by tknall: if we already have parameters "&" must be used instead of "?"
+      // if we already have parameters "&" must be used instead of "?"
       String paramSeparator = (pdf_url.indexOf("?") != -1) ? "&" : "?";
       String query = pdf_url + "/" + filename + paramSeparator + FormFields.FIELD_PDF_ID + "=" + pdf_id;
       //query = pdf_url;
@@ -345,7 +336,7 @@ public class SignServlet extends HttpServlet
 		//      ud.pdfDataSource = PdfAS.applyStrictMode(ud.pdfDataSource);
 
       session = request.getSession(true);
-        
+
       SignSessionInformation si = new SignSessionInformation(); // SessionTable.generateSessionInformationObject();
       si.connector = ud.sig_app;
 
@@ -405,17 +396,6 @@ public class SignServlet extends HttpServlet
 
       SignServletHelper.finishSign(si, request, response, getServletContext());
 
-      // afitzek: moved to DataURL to provide status information OK - ERROR
-      // for performance measurement
-      if (statLog.isInfoEnabled()) {
-      	long endTime = System.currentTimeMillis();
-//      	String toReport = "SIGN;" + si.mode + ";" + si.filename + ";"+ fileSize + ";" +
-      	String toReport = "SIGN;" + si.mode + ";" + si.connector + ";" + si.pdfDataSource.getLength() + ";" + (endTime - startTime);
-
-      	//statLog.info(toReport);
-      	// afitzek: save old statistik into log file
-      	log.info(toReport);
-      }
     }
     catch (PresentableException e)
     {
-- 
cgit v1.2.3