Template Versioning, BKU and MOA 1.1.0 (detached)

NOTE: MOA enveloping is still not fixed

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

1 files changed, 9 insertions, 5 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java
index 8a831bd..e751248 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigkz/SigKZIDHelper.java
@@ -4,7 +4,6 @@
 package at.knowcenter.wag.egov.egiz.sig.sigkz;

 

 import at.knowcenter.wag.egov.egiz.PdfASID;

-import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;

 import at.knowcenter.wag.egov.egiz.exceptions.InvalidIDException;

 import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;

@@ -47,17 +46,22 @@ public final class SigKZIDHelper
       return sig_id == null;

     }

     

-    // new signatures may or may not have the SIG_ID value 

+    // :begin

+    

     if(sig_id == null)

     	return true;

     

+    if(sig_id.equals(""))

+    	return true;

+    

+    // :end

+    

     // new signature - sig_id decides

     String [] ids = sig_id.split("@");

     String prefix = ids[0];

     

-    DetachedLocRefMOAIdFormatter moa_id_formater  = new DetachedLocRefMOAIdFormatter();

-    

-    if (prefix.equals(moa_id_formater.formatIds(null)))

+    if (prefix.equals(DetachedLocRefMOAIdFormatter.SIG_ID_PREFIX))

+    //if(!prefix.equals(""))

     {

       return true;

     }