1 files changed, 5 insertions, 5 deletions
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
index c399b72b7..7059aa3fa 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
@@ -763,7 +763,7 @@ public class ConfigurationBuilder {
    * <p>e.g.:<br>
    * input element:
    * <br>
-   * <code>&lt;pr:Firmenbuchnummer shortForm="FN"&gt;000468 i&lt;/pr:Firmenbuchnummer&gt;</code>
+   * <code>&lt;pr:Firmenbuchnummer Identifier="FN"&gt;000468 i&lt;/pr:Firmenbuchnummer&gt;</code>
    * <p>
    * return value: <code>urn:publicid:gv.at+wbpk+FN468i</code>
    * 
@@ -776,9 +776,10 @@ public class ConfigurationBuilder {
       return null;
     }
     String identificationNumber = number.getFirstChild().getNodeValue();
+    String identifier = number.getAttribute("Identifier");
     // remove all blanks
     identificationNumber = StringUtils.removeBlanks(identificationNumber);
-    if (number.getLocalName().equals("Firmenbuchnummer")) {
+    if (number.getLocalName().equals("Firmenbuchnummer") || identifier.equalsIgnoreCase("fn")) {
       // delete zeros from the beginning of the number
       identificationNumber = StringUtils.deleteLeadingZeros(identificationNumber);
       // remove hyphens
@@ -786,9 +787,8 @@ public class ConfigurationBuilder {
     }
     StringBuffer identityLinkDomainIdentifier = new StringBuffer(Constants.URN_PREFIX_WBPK);
     identityLinkDomainIdentifier.append("+");
-    String shortForm = number.getAttribute("ShortForm");
-    if (!identificationNumber.startsWith(shortForm)) {
-      identityLinkDomainIdentifier.append(shortForm);
+    if (!identificationNumber.startsWith(identifier)) {
+      identityLinkDomainIdentifier.append(identifier);
     }
     identityLinkDomainIdentifier.append("+");
     identityLinkDomainIdentifier.append(identificationNumber);