From 8ba10b6fa16c78ec3a8661d7b050320971495405 Mon Sep 17 00:00:00 2001
From: ferbas <ferbas@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Thu, 10 Dec 2009 14:23:21 +0000
Subject: improved nonObjectExtraction. Use per signature basis

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@506 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../at/gv/egiz/pdfas/impl/api/PdfAsObject.java     | 38 +++++++++++++++++-----
 1 file changed, 30 insertions(+), 8 deletions(-)

(limited to 'src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java')

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
index f98b0f0..824416f 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
@@ -31,6 +31,7 @@ import at.gv.egiz.pdfas.commandline.CommandlineConnectorChooser;
 import at.gv.egiz.pdfas.exceptions.ErrorCode;
 import at.gv.egiz.pdfas.framework.config.SettingsHelper;
 import at.gv.egiz.pdfas.framework.input.ExtractionStage;
+import at.gv.egiz.pdfas.framework.input.PdfDataSource;
 import at.gv.egiz.pdfas.framework.signator.SignatorInformation;
 import at.gv.egiz.pdfas.framework.vfilter.VerificationFilterParameters;
 import at.gv.egiz.pdfas.impl.api.analyze.AnalyzeResultImpl;
@@ -43,6 +44,7 @@ import at.gv.egiz.pdfas.impl.api.sign.ActualSignaturePositionAdapter;
 import at.gv.egiz.pdfas.impl.api.sign.SignResultImpl;
 import at.gv.egiz.pdfas.impl.api.verify.VerifyResultAdapter;
 import at.gv.egiz.pdfas.impl.api.verify.VerifyResultsImpl;
+import at.gv.egiz.pdfas.impl.input.DelimitedPdfDataSource;
 import at.gv.egiz.pdfas.impl.vfilter.VerificationFilterParametersImpl;
 import at.gv.egiz.pdfas.utils.ConfigUtils;
 import at.knowcenter.wag.egov.egiz.PdfAS;
@@ -52,11 +54,12 @@ import at.knowcenter.wag.egov.egiz.exceptions.PDFDocumentException;
 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
 import at.knowcenter.wag.egov.egiz.exceptions.SignatureException;
 import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;
+import at.knowcenter.wag.egov.egiz.pdf.BinarySignatureHolder;
 import at.knowcenter.wag.egov.egiz.pdf.NoSignatureHolder;
 import at.knowcenter.wag.egov.egiz.pdf.ObjectExtractor;
 import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;
 import at.knowcenter.wag.egov.egiz.pdf.TablePos;
-import at.knowcenter.wag.egov.egiz.pdf.TextualSignature;
+import at.knowcenter.wag.egov.egiz.pdf.TextualSignatureHolder;
 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;
 import at.knowcenter.wag.egov.egiz.sig.SignatureTypeDefinition;
 import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
@@ -378,17 +381,35 @@ public class PdfAsObject implements PdfAs
       
         SignatureInformation si = new SignatureInformationAdapter(sh);
         sigInfs.add(si);
+        if (analyzeParameters.isReturnNonTextualObjects()) {           
+           si.setNonTextualObjects(doExtractNonTexualObjects(sh, (PdfDataSource) inputDataSource));           
+        }        
+        
       }
     }
-    List nonTextInfos = null;
-    if (analyzeParameters.isReturnNonTextualObjects()) {
-       nonTextInfos = ObjectExtractor.extractNonTextInfo(new PdfDataSourceAdapter(analyzeParameters.getDocument()));
-    }
     
-    return new AnalyzeResultImpl(sigInfs, noSigs, nonTextInfos);
+    return new AnalyzeResultImpl(sigInfs, noSigs);
   }
 
-  /**
+  private List doExtractNonTexualObjects(SignatureHolder sh, PdfDataSource pdfDataSource) {
+     if (sh == null) return null;
+     if (sh instanceof BinarySignatureHolder) {
+        BinarySignatureHolder bsh = (BinarySignatureHolder)sh;
+        return ObjectExtractor.extractNonTextInfo(bsh.getSignedPdf());
+     } else if (sh instanceof TextualSignatureHolder) {
+        TextualSignatureHolder tsh = (TextualSignatureHolder)sh;
+        if (tsh.getUiBlockEndPos() == 0) {
+           log.warn("uiblockendpos not available. Extract objects from final pdf document");
+           return ObjectExtractor.extractNonTextInfo(pdfDataSource);
+        }
+        DelimitedPdfDataSource dpds = new DelimitedPdfDataSource(pdfDataSource, tsh.getUiBlockEndPos());
+        return ObjectExtractor.extractNonTextInfo(dpds);
+     } else {
+        return null;
+     }
+  }
+
+/**
    * @see at.gv.egiz.pdfas.api.PdfAs#verify(at.gv.egiz.pdfas.api.verify.VerifyAfterAnalysisParameters)
    */
   public VerifyResults verify(VerifyAfterAnalysisParameters verifyAfterAnalysisParameters) throws PdfAsException
@@ -424,11 +445,12 @@ public class PdfAsObject implements PdfAs
       SignatureHolder holder = (SignatureHolder) signature_holders.get(i);
 
       VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterAnalysisParameters.getVerificationTime());
+      vr.setNonTextualObjects( ((SignatureInformation) signatures.get(i)).getNonTextualObjects());
+
       vrs.add(vr);
     }
     
     VerifyResultsImpl verifyResults = new VerifyResultsImpl(vrs); 
-    verifyResults.setNonTextualObjects(verifyAfterAnalysisParameters.getAnalyzeResult().getNonTextualObjects());
     return verifyResults;
   }
 
-- 
cgit v1.2.3