Experiment with support for multiple lines within a paragraph.

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

diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java
index f13826bd693f1d66aff097f78e7923db1b79aa7c..25056efb7bd5e03b65e43431565583ba56893f54 100644 (file)
--- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java
+++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java
@@ -1,12 +1,19 @@
 package org.argeo.docbook.ui;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.List;
+
 import javax.jcr.Item;
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 
-import org.argeo.cms.CmsException;
+import org.apache.commons.io.IOUtils;
 import org.argeo.cms.text.TextInterpreter;
+import org.argeo.jcr.Jcr;
+import org.argeo.jcr.JcrException;
+import org.argeo.jcr.JcrxType;
 
 /** Based on HTML with a few Wiki-like shortcuts. */
 public class DbkTextInterpreter implements TextInterpreter {
@@ -16,17 +23,17 @@ public class DbkTextInterpreter implements TextInterpreter {
                try {
                        if (item instanceof Node) {
                                Node node = (Node) item;
-                               if (node.isNodeType(DocBookTypes.PARA)) {
+                               if (node.isNodeType(DocBookTypes.PARA) || node.isNodeType(DocBookTypes.TITLE)) {
                                        String raw = convertToStorage(node, content);
                                        validateBeforeStoring(raw);
                                        Node jcrText;
-                                       if (!node.hasNode(DocBookNames.JCR_XMLTEXT))
-                                               jcrText = node.addNode(DocBookNames.JCR_XMLTEXT, DocBookTypes.XMLTEXT);
+                                       if (!node.hasNode(Jcr.JCR_XMLTEXT))
+                                               jcrText = node.addNode(Jcr.JCR_XMLTEXT, JcrxType.JCRX_XMLTEXT);
                                        else
-                                               jcrText = node.getNode(DocBookNames.JCR_XMLTEXT);
-                                       jcrText.setProperty(DocBookNames.JCR_XMLCHARACTERS, raw);
+                                               jcrText = node.getNode(Jcr.JCR_XMLTEXT);
+                                       jcrText.setProperty(Jcr.JCR_XMLCHARACTERS, raw);
                                } else {
-                                       throw new CmsException("Don't know how to interpret " + node);
+                                       throw new IllegalArgumentException("Don't know how to interpret " + node);
                                }
                        } else {// property
                                Property property = (Property) item;
@@ -34,7 +41,7 @@ public class DbkTextInterpreter implements TextInterpreter {
                        }
                        // item.getSession().save();
                } catch (RepositoryException e) {
-                       throw new CmsException("Cannot set content on " + item, e);
+                       throw new JcrException("Cannot set content on " + item, e);
                }
        }
 
@@ -44,7 +51,7 @@ public class DbkTextInterpreter implements TextInterpreter {
                        String raw = raw(item);
                        return convertFromStorage(item, raw);
                } catch (RepositoryException e) {
-                       throw new CmsException("Cannot get " + item + " for edit", e);
+                       throw new JcrException("Cannot get " + item + " for edit", e);
                }
        }
 
@@ -54,22 +61,56 @@ public class DbkTextInterpreter implements TextInterpreter {
                        item.getSession().refresh(true);
                        if (item instanceof Node) {
                                Node node = (Node) item;
-                               if (node.isNodeType(DocBookTypes.PARA)) {
-                                       Node jcrText = node.getNode(DocBookNames.JCR_XMLTEXT);
-                                       String txt = jcrText.getProperty(DocBookNames.JCR_XMLCHARACTERS).getString();
+                               if (node.isNodeType(DocBookTypes.PARA) || node.isNodeType(DocBookTypes.TITLE)) {
+                                       Node jcrText = node.getNode(Jcr.JCR_XMLTEXT);
+                                       String txt = jcrText.getProperty(Jcr.JCR_XMLCHARACTERS).getString();
                                        // TODO make it more robust
-                                       txt = txt.replace("\n", "").replace("\t", "");
+                                       // txt = txt.replace("\n", "").replace("\t", "");
+                                       txt = txt.replace("\t", "  ");
                                        return txt;
                                } else {
-                                       throw new CmsException("Don't know how to interpret " + node);
+                                       throw new IllegalArgumentException("Don't know how to interpret " + node);
                                }
                        } else {// property
                                Property property = (Property) item;
                                return property.getString();
                        }
                } catch (RepositoryException e) {
-                       throw new CmsException("Cannot get " + item + " content", e);
+                       throw new JcrException("Cannot get " + item + " content", e);
+               }
+       }
+
+       final static int BR_LENGTH = "<br/>".length();
+
+       public String readSimpleHtml(Item item) {
+               String raw = raw(item);
+//             raw = "<span style='text-align:justify'>" + raw + "</span>";
+               if (raw.length() == 0)
+                       return raw;
+               try (StringReader reader = new StringReader(raw)) {
+                       List<String> lines = IOUtils.readLines(reader);
+                       if (lines.size() == 1)
+                               return lines.get(0);
+                       StringBuilder sb = new StringBuilder(raw.length() + lines.size() * BR_LENGTH);
+                       for (int i = 0; i < lines.size(); i++) {
+                               if (i != 0)
+                                       sb.append("<br/>");
+                               sb.append(lines.get(i));
+                       }
+                       return sb.toString();
+               } catch (IOException e) {
+                       throw new RuntimeException(e);
                }
+//             String[] lines = raw.split("[\r\n]+");
+//             if (lines.length == 1)
+//                     return lines[0];
+//             StringBuilder sb = new StringBuilder(raw.length() + lines.length * BR_LENGTH);
+//             for (int i = 0; i < lines.length; i++) {
+//                     if (i != 0)
+//                             sb.append("<br/>");
+//                     sb.append(lines[i]);
+//             }
+//             return sb.toString();
        }
 
        // EXTENSIBILITY