1 files changed, 31 insertions, 13 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index c80bc1925..5022be915 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -29,6 +29,8 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -84,7 +86,7 @@ public class BasicOAAction extends BasicAction {
     private boolean newOA;
     private boolean isMetaDataRefreshRequired = false;
     
-    private InputStream stream;
+    private InputStream stream = null;
     
     /**
 	 * 
@@ -303,7 +305,10 @@ public class BasicOAAction extends BasicAction {
 	                    if (onlineapplication != null) {
 	                        log.info("The OAIdentifier is not unique");
 	                    	throw new BasicOAActionException(
-	                    			LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request), 
+	                    			LanguageHelper.getErrorString(
+	                    					"validation.general.oaidentifier.notunique", 
+	                    					new Object[]{onlineapplication.getPublicURLPrefix()}, 
+	                    					request), 
 	                        		Constants.STRUTS_ERROR_VALIDATION);
 	                    	
 	                    } else	                    
@@ -326,7 +331,10 @@ public class BasicOAAction extends BasicAction {
 	                        if ( (dbOA != null && !dbOA.getHjid().equals(oaid))) {
 	                        	log.info("The OAIdentifier is not unique");
 	                        	throw new BasicOAActionException(
-	                        			LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request), 
+	                        			LanguageHelper.getErrorString(
+	                        					"validation.general.oaidentifier.notunique",
+	                        					new Object[]{dbOA.getPublicURLPrefix()},
+	                        					request), 
 	                        			Constants.STRUTS_ERROR_VALIDATION);
 	                           
 	                        }
@@ -587,8 +595,8 @@ public class BasicOAAction extends BasicAction {
                 ConfigurationProvider config = ConfigurationProvider.getInstance();
                 String templateURL = config.getConfigRootDir() + ConfigurationProvider.HTMLTEMPLATE_DIR
                         + ConfigurationProvider.HTMLTEMPLATE_FILE;
-
-                File file = new File(templateURL);
+                
+                File file = new File(new URI(templateURL));
                 input = new FileInputStream(file);
 
                 String contextpath = config.getMOAIDInstanceURL();
@@ -656,6 +664,15 @@ public class BasicOAAction extends BasicAction {
 
         }
 
+        if (stream == null && MiscUtil.isNotEmpty(preview)) {
+			try {
+				stream = new ByteArrayInputStream(preview.getBytes("UTF-8"));
+				
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+				
+			}
+        }
         
 
         return Constants.STRUTS_SUCCESS;
@@ -699,12 +716,13 @@ public class BasicOAAction extends BasicAction {
     public void setPvp2OA(OAPVP2Config pvp2oa) {
     	formList.put(pvp2oa.getName(), pvp2oa);
     }
-    
-    /**
-     * @return the stream
-     */
-    public InputStream getStream() {
-        return stream;
-    }
-    
+
+	/**
+	 * @return the stream
+	 */
+	public InputStream getStream() {
+		return stream;
+	}
+
+
 }