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=151bf10db690a0ae538e95ab061fc10d42996892;hp=6db73d0e5b8a28b525f00c6fac789a9a3b00ce4d;hb=4d8967c70edd1051e97ebdc393cbe2cd59d2b8b6;hpb=e3e0118b40d4036ef9739d12c7811922d375d46e

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 6db73d0..151bf10 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
@@ -11,7 +11,9 @@ import java.nio.file.Path;
 import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
+import javax.jcr.ValueFormatException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -123,7 +125,7 @@ public class DbkUtils {
 				if (nit.hasNext())
 					return false;
 				if (first.getName().equals(Jcr.JCR_XMLTEXT)) {
-					String str = JcrxApi.getXmlValue(first);
+					String str = Jcr.get(first, Jcr.JCR_XMLCHARACTERS);
 					if (str != null && str.trim().equals("")) {
 						node.remove();
 						return true;
@@ -168,6 +170,46 @@ public class DbkUtils {
 		}
 	}
 
+	public static Node insertVideoAfter(Node sibling) {
+		try {
+
+			Node parent = sibling.getParent();
+			Node mediaNode = addDbk(parent, DbkType.mediaobject);
+			// TODO optimise?
+			parent.orderBefore(mediaNode.getName() + "[" + mediaNode.getIndex() + "]",
+					sibling.getName() + "[" + sibling.getIndex() + "]");
+			parent.orderBefore(sibling.getName() + "[" + sibling.getIndex() + "]",
+					mediaNode.getName() + "[" + mediaNode.getIndex() + "]");
+
+			Node videoNode = addDbk(mediaNode, DbkType.videoobject);
+			Node videoDataNode = addDbk(videoNode, DbkType.videodata);
+			return mediaNode;
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot insert empty image after " + sibling, e);
+		}
+	}
+
+	public static String getMediaFileref(Node node) {
+		try {
+			Node mediadata;
+			if (node.hasNode(DbkType.imageobject.get())) {
+				mediadata = node.getNode(DbkType.imageobject.get()).getNode(DbkType.imagedata.get());
+			} else if (node.hasNode(DbkType.videoobject.get())) {
+				mediadata = node.getNode(DbkType.videoobject.get()).getNode(DbkType.videodata.get());
+			} else {
+				throw new IllegalArgumentException("Fileref not found in " + node);
+			}
+
+			if (mediadata.hasProperty(DbkAttr.fileref.name())) {
+				return mediadata.getProperty(DbkAttr.fileref.name()).getString();
+			} else {
+				return null;
+			}
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot retrieve file ref from " + node, e);
+		}
+	}
+
 	public static void exportXml(Node node, OutputStream out) throws IOException {
 		try {
 			node.getSession().exportDocumentView(node.getPath(), out, false, false);