Streaming Rückbau

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

1 files changed, 16 insertions, 3 deletions

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java b/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java
index 981b868..0c9e1f2 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/vfilter/VerificationFilterImpl.java
@@ -18,7 +18,7 @@ import at.gv.egiz.pdfas.framework.input.TextDataSource;
 import at.gv.egiz.pdfas.framework.verificator.Verificator;

 import at.gv.egiz.pdfas.framework.vfilter.VerificationFilter;

 import at.gv.egiz.pdfas.framework.vfilter.VerificationFilterParameters;

-import at.gv.egiz.pdfas.impl.input.DelimitedInputStream;

+import at.gv.egiz.pdfas.impl.input.DelimitedPdfDataSource;

 import at.gv.egiz.pdfas.impl.input.helper.DataSourceHelper;

 import at.gv.egiz.pdfas.impl.vfilter.helper.VerificationFilterBinaryHelper;

 import at.gv.egiz.pdfas.impl.vfilter.helper.VerificationFilterHelper;

@@ -285,8 +285,9 @@ public class VerificationFilterImpl implements VerificationFilter
 

   protected String extractText(PdfDataSource pdf, int endOfDocument) throws PresentableException

   {

-    DelimitedInputStream dis = new DelimitedInputStream(pdf.createInputStream(), endOfDocument);

-    return PdfAS.extractNormalizedTextTextual(dis);

+    DelimitedPdfDataSource dds = new DelimitedPdfDataSource(pdf, endOfDocument);

+    //DelimitedInputStream dis = new DelimitedInputStream(pdf.createInputStream(), endOfDocument);

+    return PdfAS.extractNormalizedTextTextual(dds);

   }

 

   protected List extractNewSignaturesFromText(String text) throws VerificationFilterException

@@ -453,6 +454,18 @@ public class VerificationFilterImpl implements VerificationFilter
       log.debug("Extracting signatures:");

       List extractedSignatures = extractNewSignaturesFromText(extractedText);

       log.debug("Extracting signatures finished.");

+      

+      if (log.isDebugEnabled())

+      {

+        log.debug("extracted signatures:");

+        for (int i = 0; i < extractedSignatures.size(); i++)

+        {

+          SignatureHolder sh = (SignatureHolder)extractedSignatures.get(i);

+          String dateStr = sh.getSignatureObject().getSignationDate();

+          EGIZDate ed = EGIZDate.parseFromString(dateStr);

+          log.debug("#" + i + ": dateStr = " + dateStr + ", egizDate = " + ed.toString());

+        }

+      }

 

       return extractedSignatures;

     }