From 9d6b686b486e9c44f01a461789bacd590a2438ee Mon Sep 17 00:00:00 2001 From: pdanner Date: Fri, 10 Dec 2010 15:09:42 +0000 Subject: Changed defaultvalue of enable_placeholder_search config parameter to false git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@702 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- .../PDF-AS-3.2-Anwendungsbeschreibung.doc | Bin 606208 -> 605696 bytes .../PDF-AS-3.2-Anwendungsbeschreibung.pdf | Bin 1141984 -> 1057213 bytes .../at/gv/egiz/pdfas/api/sign/SignParameters.java | 2 +- .../java/at/gv/egiz/pdfas/commandline/Main.java | 14 +++++++------- .../at/gv/egiz/pdfas/impl/api/PdfAsObject.java | 8 ++++---- src/main/resources/DefaultConfiguration.zip | Bin 671973 -> 671976 bytes work/cfg/config.properties | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dok/Anwendungsbeschreibung/PDF-AS-3.2-Anwendungsbeschreibung.doc b/dok/Anwendungsbeschreibung/PDF-AS-3.2-Anwendungsbeschreibung.doc index 4d26a88..844c99a 100644 Binary files a/dok/Anwendungsbeschreibung/PDF-AS-3.2-Anwendungsbeschreibung.doc and b/dok/Anwendungsbeschreibung/PDF-AS-3.2-Anwendungsbeschreibung.doc differ diff --git a/dok/Anwendungsbeschreibung/PDF-AS-3.2-Anwendungsbeschreibung.pdf b/dok/Anwendungsbeschreibung/PDF-AS-3.2-Anwendungsbeschreibung.pdf index 4e7a17e..9e6c33e 100644 Binary files a/dok/Anwendungsbeschreibung/PDF-AS-3.2-Anwendungsbeschreibung.pdf and b/dok/Anwendungsbeschreibung/PDF-AS-3.2-Anwendungsbeschreibung.pdf differ diff --git a/src/main/java/at/gv/egiz/pdfas/api/sign/SignParameters.java b/src/main/java/at/gv/egiz/pdfas/api/sign/SignParameters.java index bb0e7ad..9a01c72 100644 --- a/src/main/java/at/gv/egiz/pdfas/api/sign/SignParameters.java +++ b/src/main/java/at/gv/egiz/pdfas/api/sign/SignParameters.java @@ -127,7 +127,7 @@ public class SignParameters /** * */ - protected boolean checkForPlaceholder; + protected boolean checkForPlaceholder = true; /** * The id of the placeholder which should be replaced. diff --git a/src/main/java/at/gv/egiz/pdfas/commandline/Main.java b/src/main/java/at/gv/egiz/pdfas/commandline/Main.java index 3595ef1..29d92b7 100644 --- a/src/main/java/at/gv/egiz/pdfas/commandline/Main.java +++ b/src/main/java/at/gv/egiz/pdfas/commandline/Main.java @@ -116,9 +116,9 @@ public abstract class Main protected static final String PARAMETER_POS = "-pos"; /** - * Command line parameter signaling to search the source document for a placeholder for the signature + * Command line parameter signaling to not search the source document for a placeholder for the signature */ - protected static final String PARAMETER_SEARCH_PLACEHOLDER = "-checkforplaceholder"; + protected static final String PARAMETER_DISABLE_PLACEHOLDER_SEARCH = "-nosearchplaceholder"; /** * Command line parameter selecting the id of the placeholder to use @@ -239,7 +239,7 @@ public abstract class Main String user_password = null; String pos_string = null; - boolean search_placeholder = false; + boolean search_placeholder = true; String placeholderId = null; int placeholderMatchMode = SignParameters.PLACEHOLDER_MATCH_MODE_MODERATE; @@ -335,9 +335,9 @@ public abstract class Main continue; } - if (cur_arg.equals(PARAMETER_SEARCH_PLACEHOLDER)) + if (cur_arg.equals(PARAMETER_DISABLE_PLACEHOLDER_SEARCH)) { - search_placeholder = true; + search_placeholder = false; continue; } @@ -1084,7 +1084,7 @@ public abstract class Main writer.println(" intvalue ... pagenumber must be > 0 if p>number of pages in document p-->handled like p:'new'"); writer.println(" f_algo floatvalue ... consider footerline must be >= 0 (only if y_algo is auto and p_algo is not 'new')"); - writer.println(" " + PARAMETER_SEARCH_PLACEHOLDER + " ... [optional] if set, the source document will be scanned for signature placeholder images"); + writer.println(" " + PARAMETER_DISABLE_PLACEHOLDER_SEARCH + " ... [optional] if set, the source document will NOT be scanned for signature placeholder images"); writer.println(" " + PARAMETER_PLACEHOLDER_ID + " ... [optional] search for signature placeholder images containing the given id"); writer.println(" " + PARAMETER_PLACEHOLDER_MATCH_MODE + " <" + VALUE_PLACEHOLDER_MATCH_MODE_LENIENT + "|" + VALUE_PLACEHOLDER_MATCH_MODE_MODERATE + "|" + VALUE_PLACEHOLDER_MATCH_MODE_STRICT + "> ... [optional] specify the behaviour if no matching placeholder could be found. Default is ."); writer.println(" " + VALUE_PLACEHOLDER_MATCH_MODE_LENIENT + " ... sign in place of the first found placeholder, regardless if it matches exactly, or at the end of the document if none is found."); @@ -1268,7 +1268,7 @@ public abstract class Main writer.println(" " + result.getManifestCheckCode().getCode() + " - " + result.getManifestCheckCode().getMessage()); } else { PdfAsException ex = result.getVerificationException(); - writer.println("\n Signaturprüfung für diese Signatur nicht möglich: " + ErrorCodeHelper.formErrorMessage(ex)); + writer.println("\n Signaturpr�fung f�r diese Signatur nicht m�glich: " + ErrorCodeHelper.formErrorMessage(ex)); } } 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 1cb158e..5d4fec5 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 @@ -673,7 +673,7 @@ public class PdfAsObject implements PdfAs SettingsReader settings = SettingsReader.getInstance(); - // check sig_obj.PROFILID.enable_placeholder_search + // check sig_obj.PROFILEID.enable_placeholder_search String profile = signParameters.getSignatureProfileId(); if (profile == null) profile = defaultProfile; @@ -685,9 +685,9 @@ public class PdfAsObject implements PdfAs enableSearchString = settings.getValueFromKey(ENABLE_PLACEHOLDER_SEARCH_KEY); } - boolean enableSearch = true; - if (enableSearchString != null && enableSearchString.trim().equalsIgnoreCase("false")) - enableSearch = false; + boolean enableSearch = false; + if (enableSearchString != null && enableSearchString.trim().equalsIgnoreCase("true")) + enableSearch = true; if (enableSearch) { diff --git a/src/main/resources/DefaultConfiguration.zip b/src/main/resources/DefaultConfiguration.zip index d665f61..892f76c 100644 Binary files a/src/main/resources/DefaultConfiguration.zip and b/src/main/resources/DefaultConfiguration.zip differ diff --git a/work/cfg/config.properties b/work/cfg/config.properties index 3a0825f..a5042da 100644 --- a/work/cfg/config.properties +++ b/work/cfg/config.properties @@ -66,7 +66,7 @@ check_document=true # Aktiviert, oder deaktiviert grundsätzlich das - potenziell sehr Zeit- und Resourcen-aufändige - # Suchen nach Platzhalter-Bildern in PDF-Dokumenten -# Die Suche ist standardmässig aktiviert, also der Defaultwert hier = true +# Die Suche ist standardmässig deaktiviert, also der Defaultwert hier = false enable_placeholder_search=true #VerificationFilterParameters -- cgit v1.2.3