X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fdocbook%2FDbkUtils.java;h=6bcecb7b3e9fec2d3efa61161f8d94acffe57210;hp=19f7cd40fd905dd46c543785e3d292cb655caf34;hb=34148928e47a56bde06635334fb06d4d5bb70d50;hpb=cf3e6fe2b8c0f37d3e83980047764f12aabb6d49

diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java
index 19f7cd4..6bcecb7 100644
--- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java
+++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java
@@ -3,10 +3,12 @@ package org.argeo.docbook;
 import static org.argeo.docbook.DbkType.para;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
@@ -97,11 +99,6 @@ public class DbkUtils {
 	public static Node insertImageAfter(Node sibling) {
 		try {
 
-			// FIXME make it more robust
-			if (DbkType.imagedata.get().equals(sibling.getName())) {
-				sibling = sibling.getParent().getParent();
-			}
-
 			Node parent = sibling.getParent();
 			Node mediaNode = addDbk(parent, DbkType.mediaobject);
 			// TODO optimise?
@@ -123,7 +120,7 @@ public class DbkUtils {
 //			// TODO make it more robust and generic
 //			String fileRef = mediaNode.getName();
 //			imageDataNode.setProperty(DocBookNames.DBK_FILEREF, fileRef);
-			return imageDataNode;
+			return mediaNode;
 		} catch (RepositoryException e) {
 			throw new JcrException("Cannot insert empty image after " + sibling, e);
 		}
@@ -156,6 +153,16 @@ public class DbkUtils {
 		}
 	}
 
+	public static void importXml(Node baseNode, InputStream in) throws IOException {
+		try {
+			baseNode.getSession().importXML(baseNode.getPath(), in,
+					ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING);
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot import XML to " + baseNode, e);
+		}
+
+	}
+
 	/** Singleton. */
 	private DbkUtils() {
 	}