From 5e0264a94511844742b09eb4c61940e8b4e10fbd Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Thu, 23 Apr 2015 17:46:37 +0200 Subject: X14 handling MOA --- .../egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java') diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java index 3c67d54..f5b3cf5 100644 --- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java +++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java @@ -51,32 +51,40 @@ public class DetachedLocRefMOAIdFormatter implements IdFormatter */ public static final String SIG_ID_PROPERTY_KEY = "default.moa.algorithm.id"; + public static final String oldSignature = "http://uri.etsi.org/01903/v1.1.1#SignedProperties"; + /** * @see at.knowcenter.wag.egov.egiz.sig.sigid.IdFormatter#formatIds(java.lang.String[]) */ public String formatIds(String[] ids, String algorithmParams) { // read id from property file and use it - + String sigIDPrefix = SIG_ID_PREFIX; try { // dferbas // if (!BooleanUtils.toBoolean(SettingsReader.getInstance().getValueFromKey("moa.id.field.visible"))) { // return null; // } - - - SIG_ID_PREFIX = SettingsReader.getInstance().getValueFromKey(SIG_ID_PROPERTY_KEY); + + + SIG_ID_PREFIX = SettingsReader.getInstance().getValueFromKey(SIG_ID_PROPERTY_KEY); } catch (SettingsException e) { logger_.error(e.getMessage(), e); } + if(!ids[0].contains(oldSignature)) { + sigIDPrefix = SIG_ID_X14_PREFIX; + } else { + sigIDPrefix = SIG_ID_PREFIX; + } + // dferbas if (algorithmParams != null && algorithmParams.length() > 0) { - return SIG_ID_PREFIX + ":" + algorithmParams; + return sigIDPrefix + ":" + algorithmParams; } else { - return SIG_ID_PREFIX; + return sigIDPrefix; } } } -- cgit v1.2.3