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

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..b654c73 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;
@@ -51,6 +53,16 @@ public class DbkUtils {
 		return Jcr.getName(node).equals(type.get());
 	}
 
+	/** Whether this node is a DocBook type. */
+	public static boolean isDbk(Node node) {
+		String name = Jcr.getName(node);
+		for (DbkType type : DbkType.values()) {
+			if (name.equals(type.get()))
+				return true;
+		}
+		return false;
+	}
+
 	public static String getTitle(Node node) {
 		return JcrxApi.getXmlValue(node, DbkType.title.get());
 	}
@@ -94,13 +106,34 @@ public class DbkUtils {
 		return p;
 	}
 
-	public static Node insertImageAfter(Node sibling) {
+	/**
+	 * Removes a paragraph if it empty. The sesison is not saved.
+	 * 
+	 * @return true if the paragraph was empty and it was removed
+	 */
+	public static boolean removeIfEmptyParagraph(Node node) {
 		try {
-
-			// FIXME make it more robust
-			if (DbkType.imagedata.get().equals(sibling.getName())) {
-				sibling = sibling.getParent().getParent();
+			if (isDbk(node, DbkType.para)) {
+				NodeIterator nit = node.getNodes();
+				if (!nit.hasNext())
+					return false;// log this unexpected situation?
+				Node first = nit.nextNode();
+				if (nit.hasNext())
+					return false;
+				String str = JcrxApi.getXmlValue(first);
+				if (str != null && str.trim().equals("")) {
+					node.remove();
+					return true;
+				}
 			}
+			return false;
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot remove possibly empty paragraph", e);
+		}
+	}
+
+	public static Node insertImageAfter(Node sibling) {
+		try {
 
 			Node parent = sibling.getParent();
 			Node mediaNode = addDbk(parent, DbkType.mediaobject);
@@ -123,7 +156,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 +189,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() {
 	}