fixed override properties for binsig with placeholders

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

1 files changed, 12 insertions, 4 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
index 44363d7..25e996e 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
@@ -357,7 +357,11 @@ public class SignatureObject implements Serializable
    * @return <code>true</code> if a new signature value is created,

    *         <code>false</code> otherwise

    */

-  public boolean setSigValue(String key, String value)

+  public boolean setSigValue(String key, String value) {

+     return setSigValue(key, value, false);

+  }

+  

+  public boolean setSigValue(String key, String value, boolean placeholder)

   {

     SignatureEntry sig_entry = null;

     boolean is_new = false;

@@ -377,6 +381,7 @@ public class SignatureObject implements Serializable
       value = removeAllWhiteSpaces(value);

     }

     sig_entry.setValue(value);

+    sig_entry.isPlaceholder = placeholder;

     return is_new;

   }

 

@@ -428,16 +433,19 @@ public class SignatureObject implements Serializable
   {

      

     String value = null;

+    SignatureEntry sigEntry = null;

     if (sigEntries_.containsKey(key))

     {

-      value = ((SignatureEntry) sigEntries_.get(key)).getValue();

+      sigEntry = (SignatureEntry) sigEntries_.get(key);

+      value = sigEntry.getValue();

     }

     if (value == null && SignatureTypes.SIG_NORM.equals(key))

     {

       value = normalizer_.getVersion();

     }

+

     String overrideVal = OverridePropertyHolder.getProperty(key);

-    if (overrideVal != null) {

+    if (value != null && sigEntry != null && !sigEntry.isPlaceholder &&  overrideVal != null) { // TODO this!! SignatureEntry.isPlaceholder

        value = overrideVal;

        if (logger_.isDebugEnabled()) {

           logger_.debug("Using override property for key '" + key + "' = " + value);

@@ -1742,7 +1750,7 @@ public class SignatureObject implements Serializable
 

         variable_fields.add(sfd);

 

-        setSigValue(sfd.field_name, value_string);

+        setSigValue(sfd.field_name, value_string, true);

       }

     }