storkid derivation pro country

2 files changed, 7 insertions, 8 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
index 495444db1..c9f5fdde9 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
@@ -120,7 +120,8 @@ public class OAGeneralConfig {
 		 identificationTypeList = Arrays.asList(
 				 Constants.IDENIFICATIONTYPE_FN,
 				 Constants.IDENIFICATIONTYPE_ZVR,
-				 Constants.IDENIFICATIONTYPE_ERSB);
+				 Constants.IDENIFICATIONTYPE_ERSB,
+                 Constants.IDENIFICATIONTYPE_STORK);
 	}
 	
 	
@@ -216,7 +217,10 @@ public class OAGeneralConfig {
 					if (Constants.PREFIX_WPBK.startsWith(split[0]) && split.length >= 2) {
 						identificationType = split[1];
 						identificationNumber = split[2];
-					}
+					} else if (Constants.PREFIX_STORK.startsWith(split[0]) && split.length >= 2) {
+                        identificationType = split[1]; // setting at as iden category ?
+                        identificationNumber = split[2]; // setting sp country as ident type -> sp ident
+                    }
 				}
 			}
 			
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 4a0bf744a..370923ca1 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -746,13 +746,8 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
             dboa.setStorkSPTargetCountry(generalOA.getStorkSPTargetCountry());
 
 
-            String num = generalOA.getIdentificationNumber().replaceAll(" ", "");
-
-            if (num.startsWith(Constants.IDENIFICATIONTYPE_STORK))
-                num = num.substring(Constants.IDENIFICATIONTYPE_STORK.length());
-
             IdentificationNumber idnumber = new IdentificationNumber();
-            idnumber.setValue(Constants.PREFIX_STORK + "AT+" + generalOA.getIdentificationType() + num);
+            idnumber.setValue(Constants.PREFIX_STORK + "AT+" + generalOA.getStorkSPTargetCountry());
             idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType()));
 
             authoa.setIdentificationNumber(idnumber);