Performance

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@167 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 33 insertions, 25 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/framework/VerificationFilter.java b/src/main/java/at/knowcenter/wag/egov/egiz/framework/VerificationFilter.java
index da5a8dc..2631028 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/framework/VerificationFilter.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/framework/VerificationFilter.java
@@ -17,6 +17,7 @@
  */

 package at.knowcenter.wag.egov.egiz.framework;

 

+import java.io.ByteArrayInputStream;

 import java.io.File;

 import java.io.FileInputStream;

 import java.io.IOException;

@@ -24,6 +25,8 @@ import java.io.PrintStream;
 import java.util.ArrayList;

 import java.util.List;

 

+import at.gv.egiz.pdfas.exceptions.ErrorCode;

+

 import org.apache.log4j.Logger;

 

 import at.knowcenter.wag.egov.egiz.PdfAS;

@@ -43,6 +46,7 @@ import at.knowcenter.wag.egov.egiz.pdf.BinarySignature;
 import at.knowcenter.wag.egov.egiz.pdf.Placeholder;

 import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;

 import at.knowcenter.wag.egov.egiz.pdf.StringInfo;

+import at.knowcenter.wag.egov.egiz.pdf.TextualSignatureHolder;

 import at.knowcenter.wag.exactparser.ParseDocument;

 import at.knowcenter.wag.exactparser.parsing.IndirectObjectReference;

 import at.knowcenter.wag.exactparser.parsing.PDFUtils;

@@ -64,6 +68,8 @@ import at.knowcenter.wag.exactparser.parsing.results.ObjectParseResult;
  * in the document.

  * </p>

  * 

+ * @deprecated use the new at.gv.egiz.framework instead

+ * 

  * @author wprinz

  * @author amavriqi

  */

@@ -105,6 +111,7 @@ public class VerificationFilter
 	  return extractSignaturesFromPdf(pdf, false);

   }

   

+  //@deprecated

   public List extractSignaturesFromPdf(final byte[] pdf, boolean ignorePostSignModificationsRestriction) throws PresentableException

   {

     

@@ -178,7 +185,7 @@ public class VerificationFilter
       }

       else

       {

-    	  // FIXME make better

+    	  // TODO: make better - already deprecated

     	  //amavriqi: skip checking for old sigs becouse of performance issues

     	  String old_text_sigs = SettingsReader.getInstance().getSetting("check_old_textual_sigs", "false");

     	  

@@ -201,7 +208,7 @@ public class VerificationFilter
           current_block_contains_signature = true;

         }

         

-        //	FIXME make better

+        // TODO: make better - already deprecated

         //amavriqi: only if old textual signatures are checked for

         if(old_text_sigs.equalsIgnoreCase("true")){

         if (prev_end == 0)

@@ -209,7 +216,7 @@ public class VerificationFilter
           String rest_text = null;

           if (!text_holders.isEmpty())

           {

-            SignatureHolder first_holder = (SignatureHolder) text_holders.get(0);

+            TextualSignatureHolder first_holder = (TextualSignatureHolder) text_holders.get(0);

             rest_text = first_holder.getSignedText();

           }

           else

@@ -218,7 +225,7 @@ public class VerificationFilter
         	  logger_.debug("Incemental block" + prev_end + " and there are " + text_holders.size() + " text holders");

         	  logger_.debug("Checking for older textual Signatures");

         	  logger_.debug("Extracting text to " + bpr.next_index);

-            rest_text = PdfAS.extractNormalizedTextTextual(pdf, bpr.next_index); 

+            rest_text = PdfAS.extractNormalizedTextTextual(new ByteArrayInputStream(pdf), bpr.next_index); 

           }

 

           List old_holders = PdfAS.extractSignatureHoldersTextual(rest_text, true);

@@ -371,7 +378,7 @@ public class VerificationFilter
     String rest_text = normalized_text;

     if (!text_holders.isEmpty())

     {

-      SignatureHolder holder = (SignatureHolder) text_holders.get(0);

+      TextualSignatureHolder holder = (TextualSignatureHolder) text_holders.get(0);

       rest_text = holder.getSignedText();

     }

 

@@ -492,7 +499,7 @@ public class VerificationFilter
     }

     catch (IOException e1)

     {

-      throw new PDFDocumentException(201);

+      throw new PDFDocumentException(ErrorCode.DOCUMENT_CANNOT_BE_READ, e1);

     }

   }

 

@@ -530,23 +537,24 @@ public class VerificationFilter
 

   }

   

-  public static void main(String[] args) throws IOException, PresentableException

-  {

-    SettingsReader.initializeForCommandLine();

-

-    File in = new File(args[0]);

-    FileInputStream fis = new FileInputStream(in);

-    byte[] pdf = new byte[(int) in.length()];

-    fis.read(pdf);

-    fis.close();

-

-    String text = PdfAS.extractNormalizedTextTextual(pdf, pdf.length);;

-    

-    VerificationFilter vf = new VerificationFilter();

-    //List found = vf.extractSignaturesFromPdf(pdf);

-

-    List found = vf.extractSignaturesFromPlainText(text);

-

-    printFoundHolders("Final Holders", found, System.out);

-  }

+  // TODO old code - remove

+//  public static void main(String[] args) throws IOException, PresentableException

+//  {

+//    SettingsReader.initializeForCommandLine();

+//

+//    File in = new File(args[0]);

+//    FileInputStream fis = new FileInputStream(in);

+//    byte[] pdf = new byte[(int) in.length()];

+//    fis.read(pdf);

+//    fis.close();

+//

+//    String text = PdfAS.extractNormalizedTextTextual(pdf, pdf.length);;

+//    

+//    VerificationFilter vf = new VerificationFilter();

+//    //List found = vf.extractSignaturesFromPdf(pdf);

+//

+//    List found = vf.extractSignaturesFromPlainText(text);

+//

+//    printFoundHolders("Final Holders", found, System.out);

+//  }

 }