From f46e72bbdb7a17dc1833bc6562ecd717400e9967 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Sat, 21 Feb 2015 00:20:30 +0100
Subject: [PATCH] [New] XmlExportModelService can now export to absolute path

---
 .../service/XmlExportModelArgument.java       |  4 +++
 .../service/XmlExportModelService.java        | 31 ++++++++++++++-----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelArgument.java b/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelArgument.java
index ffa15f294..977f43f61 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelArgument.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelArgument.java
@@ -24,6 +24,7 @@ public class XmlExportModelArgument extends ServiceArgument {
 	private static final long serialVersionUID = 1L;
 
 	public String modelFileName;
+	public boolean external;
 	public boolean overwrite;
 	public boolean multiFile;
 	public boolean doOrders = true;
@@ -36,6 +37,9 @@ public class XmlExportModelArgument extends ServiceArgument {
 		StringBuilder builder = new StringBuilder();
 		builder.append("XmlExportModelArgument [ ");
 
+		builder.append("external=");
+		builder.append(this.external);
+
 		builder.append("modelFileName=");
 		builder.append(this.modelFileName);
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelService.java b/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelService.java
index d9a00ba3b..9e8a45c11 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelService.java
@@ -19,7 +19,6 @@ import java.io.File;
 import java.text.MessageFormat;
 
 import li.strolch.command.XmlExportModelCommand;
-import li.strolch.exception.StrolchException;
 import li.strolch.model.ModelStatistics;
 import li.strolch.persistence.api.StrolchTransaction;
 import li.strolch.service.api.AbstractService;
@@ -43,14 +42,32 @@ public class XmlExportModelService extends AbstractService<XmlExportModelArgumen
 
 		DBC.PRE.assertNotEmpty("Modelfile must be set!", arg.modelFileName);
 
-		File dataPath = getRuntimeConfiguration().getDataPath();
-		File modelFile = new File(dataPath, arg.modelFileName);
-		if (modelFile.exists()) {
+		File modelFile;
 
+		File dataPath = getRuntimeConfiguration().getDataPath();
+		File modelFileName = new File(arg.modelFileName);
+		if (modelFileName.isAbsolute()) {
+			if (!arg.external)
+				return ServiceResult.error("Model file is absolute, yet service argument is not marked as external!");
+			modelFile = modelFileName;
+		} else {
+			if (arg.external)
+				return ServiceResult.error("Model file is not absolute, yet service argument is marked as externa!");
+
+			modelFile = new File(dataPath, arg.modelFileName);
+		}
+
+		if (modelFile.exists()) {
 			if (!arg.overwrite) {
-				String msg = "Model File already exists with name {0} in data path {1}"; //$NON-NLS-1$
-				msg = MessageFormat.format(msg, arg.modelFileName, dataPath);
-				throw new StrolchException(msg);
+				if (modelFileName.isAbsolute()) {
+					String msg = "Model File already exists at path {0}"; //$NON-NLS-1$
+					msg = MessageFormat.format(msg, arg.modelFileName);
+					return ServiceResult.error(msg);
+				} else {
+					String msg = "Model File already exists with name {0} in data path {1}"; //$NON-NLS-1$
+					msg = MessageFormat.format(msg, arg.modelFileName, dataPath);
+					return ServiceResult.error(msg);
+				}
 			}
 		}