improved nonObjectExtraction. Use per signature basis

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

1 files changed, 7 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 e7724bc..acf6622 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
@@ -242,7 +242,7 @@ public class VerificationFilterImpl implements VerificationFilter
       if (sao.oldSignature != null)

       {

         extractedSignatures.add(0, sao.oldSignature);

-      }

+      }      

     }

     else

     {

@@ -666,7 +666,7 @@ public class VerificationFilterImpl implements VerificationFilter
           //kz = new PdfASID("urn:pdfsigfilter:bka.gv.at:binaer:v1.1.0");

           

           Verificator verificator = VerificatorFactory.createBinaryVerificator(kz);

-          List binary_holders = verificator.parseBlock(pdf, data, fpr, prev_end);

+          List binary_holders = verificator.parseBlock(pdf, data, fpr, prev_end);      

 

           binarySignatures.addAll(binary_holders);

           if(binary_holders.size() > 0) {

@@ -753,7 +753,9 @@ public class VerificationFilterImpl implements VerificationFilter
     assert partition.isTextPartition();

 

     int endOfDocument = VerificationFilterHelper.getEndOfPartition(partition);

-    return extractSignatures(pdf, endOfDocument);

+    List extractedSigs = extractSignatures(pdf, endOfDocument);

+    TextualSignatureHolder.mulitSetUiBlockEndPos(extractedSigs, endOfDocument);

+    return extractedSigs;

   }

 

   protected SignaturesAndOld extractSignaturesFromPartitionAndOld(PdfDataSource pdf, Partition partition) throws VerificationFilterException

@@ -770,6 +772,8 @@ public class VerificationFilterImpl implements VerificationFilter
 //      log.debug("extracted text: " + extractedText);

 

       SignaturesAndOld sao = extractSignaturesAndOld(extractedText);

+      TextualSignatureHolder.trySetUiBlockEndPos(sao.oldSignature, endOfDocument);

+      TextualSignatureHolder.mulitSetUiBlockEndPos(sao.newSignatures, endOfDocument);

 

       return sao;

     }