Merge branch 'v2.x'

[gpl/argeo-suite.git] / publishing / org.argeo.publishing.ui / src / org / argeo / docbook / DbkUtils.java

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 19f7cd40fd905dd46c543785e3d292cb655caf34..6bcecb7b3e9fec2d3efa61161f8d94acffe57210 100644 (file)
--- 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() {
        }