litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Refactoring

Browse source
This commit is contained in:
Georgy Litvinov 2019-04-21 16:03:07 +03:00
parent d81af813b4
commit 87560f97a4
2 changed files with 82 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/writer2latex/util/Misc.java
View file

@ -313,7 +313,26 @@ public class Misc{
public static final boolean isElement(Node node) { public static final boolean isElement(Node node) {
return node.getNodeType()==Node.ELEMENT_NODE; return node.getNodeType()==Node.ELEMENT_NODE;
} }
public static boolean isRoot(Node node) {
if (node.getParentNode() == null) {
return true;
}
return false;
}
public static boolean isElement(String name, Node node) {
if (!isElement(node)){
return false;
}
if (((Element) node).getTagName().equals(name)){
return true;
}
return false;
}
/* Utility method to determine if a Node is a specific Element /* Utility method to determine if a Node is a specific Element
*/ */
public static final boolean isElement(Node node, String sTagName) { public static final boolean isElement(Node node, String sTagName) {

120
src/main/java/writer2latex/xhtml/GreenstoneTags.java
View file

@ -10,7 +10,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import writer2latex.office.XMLString; import writer2latex.office.XMLString;
import writer2latex.util.Misc; import static writer2latex.util.Misc.*;
//LinkedList<String> stringList = new LinkedList<String>(); //LinkedList<String> stringList = new LinkedList<String>();
@ -24,14 +24,14 @@ public class GreenstoneTags {
private static LinkedList<Integer> headerStack = new LinkedList<Integer>(); private static LinkedList<Integer> headerStack = new LinkedList<Integer>();
private static boolean pageOpened = false; private static boolean pageOpened = false;
//headings none //headings none
private static String headingTags = "sections"; private static String headingSeparation = "sections";
//sections div none //sections div none
private static String pageTags = "sections"; private static String pageSeparation = "sections";
protected static Node processHeading(Node currentNode, Node hnode, int pageNum) { protected static Node processHeading(Node currentNode, Node hnode, int pageNum) {
//Get outline level //Get outline level
String sLevel = Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL); String sLevel = getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL);
String title = getTitle(currentNode).trim(); String title = getTitle(currentNode).trim();
if (sLevel == null || sLevel.isEmpty()) { if (sLevel == null || sLevel.isEmpty()) {
return hnode; return hnode;
@ -45,13 +45,13 @@ public class GreenstoneTags {
hnode = closePage(hnode); hnode = closePage(hnode);
} }
if (headingTags.equals(SECTIONS)){ if (headingSeparation.equals(SECTIONS)){
closeHeadingSections(hnode, nLevel); closeHeadingSections(hnode, nLevel);
openHeadingSection(hnode, title); openHeadingComment(hnode, title);
headerStack.offerFirst(Integer.parseInt(sLevel)); headerStack.offerFirst(Integer.parseInt(sLevel));
} }
if (!pageTags.equals(NONE) && !headingTags.equals(NONE)){ if (!noPageSeparation() && !noHeadingSeparation()){
hnode = openPage(hnode, pageNum); hnode = openPage(hnode, pageNum);
} }
@ -59,7 +59,7 @@ public class GreenstoneTags {
} }
protected static Node processPageBreak(Node currentNode, Node hnode, Integer pageNum){ protected static Node processPageBreak(Node currentNode, Node hnode, Integer pageNum){
if (pageTags.equals(NONE)){ if (noPageSeparation()){
return hnode; return hnode;
} }
if (pageOpened) { if (pageOpened) {
@ -74,15 +74,15 @@ public class GreenstoneTags {
* Opens main document section heading tag * Opens main document section heading tag
*/ */
protected static Node StartDocument(Node hnode, String title, String heading, String pages, int pageNum){ protected static Node StartDocument(Node hnode, String title, String heading, String pages, int pageNum){
headingTags = heading; headingSeparation = heading;
pageTags = pages; pageSeparation = pages;
if (headingTags.equals(NONE) && pageTags.equals(NONE)){ if (noHeadingSeparation() && noPageSeparation()){
return hnode; return hnode;
} }
if(headingTags.equals(SECTIONS)){ if(headingSeparation.equals(SECTIONS)){
//Create global section //Create global section
openHeadingSection(hnode, title); openHeadingComment(hnode, title);
} }
hnode = openPage(hnode, pageNum); hnode = openPage(hnode, pageNum);
@ -90,50 +90,43 @@ public class GreenstoneTags {
} }
//Method to close open tags at the end of the document //Method to close open tags at the end of the document
protected static Node endDocument(Node hnode){ protected static Node endDocument(Node hnode){
if (headingTags.equals(NONE) && pageTags.equals(NONE)){ if (noHeadingSeparation() && noPageSeparation()){
return hnode; return hnode;
} }
if (pageOpened){ if (pageOpened){
hnode = closePage(hnode); hnode = closePage(hnode);
} }
if (headingTags.equals(SECTIONS)){ if (headingSeparation.equals(SECTIONS)){
closeHeadingSections(hnode, 0); closeHeadingSections(hnode, 0);
//Close global section //Close global section
closeSection(hnode); addCloseComment(hnode);
} }
return hnode; return hnode;
} }
private static Node openPageDiv(Node hnode,int pageNum){ private static Node openPageDiv(Node node,int pageNum){
if (hnode == null){ if (node == null){
return hnode; return node;
} }
Document doc = hnode.getOwnerDocument(); Document doc = node.getOwnerDocument();
Element openBlock = (Element) doc.createElement("div"); Element openBlock = (Element) doc.createElement("div");
openBlock.setAttribute("class", "pageNum"); openBlock.setAttribute("class", "pageNum");
openBlock.setAttribute("page", Integer.toString(pageNum)); openBlock.setAttribute("page", Integer.toString(pageNum));
// insert open section comment before header node // insert open section comment before header node
hnode.appendChild((Node)openBlock); node.appendChild((Node)openBlock);
hnode = openBlock; node = openBlock;
return openBlock; return openBlock;
} }
private static Node exitPageDiv(Node hnode){ private static Node exitPageDiv(Node node){
while ( hnode.getParentNode() != null while ( !isRoot(node) && !isElement("div", node) ){
&& node = node.getParentNode();
!(
hnode.getNodeType() == Node.ELEMENT_NODE
&&
((Element) hnode).getTagName().equals("div")
)
){
hnode = hnode.getParentNode();
} }
Node result = hnode.getParentNode(); Node result = node.getParentNode();
if (hnode.getChildNodes().getLength() == 0){ if (node.getChildNodes().getLength() == 0){
result.removeChild(hnode); result.removeChild(node);
} }
return result; return result;
@ -147,7 +140,7 @@ public class GreenstoneTags {
int i = 0; int i = 0;
while (i < contentNodes.getLength()) { while (i < contentNodes.getLength()) {
Node child = contentNodes.item(i); Node child = contentNodes.item(i);
if (child.getNodeType() == Node.ELEMENT_NODE){ if (isElement(child) ){
if (child.getNodeName().equals(XMLString.TEXT_TAB) || if (child.getNodeName().equals(XMLString.TEXT_TAB) ||
child.getNodeName().equals(XMLString.TEXT_LINE_BREAK) ){ child.getNodeName().equals(XMLString.TEXT_LINE_BREAK) ){
Document doc = child.getOwnerDocument(); Document doc = child.getOwnerDocument();
@ -169,30 +162,25 @@ public class GreenstoneTags {
} }
private static void openPageSection(Node hnode, Integer pageNum){ private static void openPageComment(Node hnode, Integer pageNum){
Document doc = hnode.getOwnerDocument(); Document doc = hnode.getOwnerDocument();
String commentText = "<Section>\n<Description>\n<Metadata name=\"Title\">" + pageNum Node openSection = doc.createComment(openPageCommentText(pageNum));
+ "</Metadata>\n<Metadata name=\"Page\">" + pageNum + "</Metadata>\n</Description>";
Node openSection = doc.createComment(commentText);
// insert open section comment before header node // insert open section comment before header node
hnode.appendChild(openSection); hnode.appendChild(openSection);
} }
private static void openHeadingSection(Node hnode, String title){
private static void openHeadingComment(Node hnode, String title){
Document doc = hnode.getOwnerDocument(); Document doc = hnode.getOwnerDocument();
String commentText = "<Section>\n<Description>\n<Metadata name=\"Title\">" + title Node openSection = doc.createComment(openHeadingCommentText(title));
+ "</Metadata>\n</Description>";
Node openSection = doc.createComment(commentText);
// insert open section comment before header node // insert open section comment before header node
hnode.appendChild(openSection); hnode.appendChild(openSection);
} }
private static void closeSection(Node hnode){ private static void addCloseComment(Node node){
Document doc = hnode.getOwnerDocument(); Document doc = node.getOwnerDocument();
String commentText = "</Section>"; Node closeSection = doc.createComment("</Section>");
Node closeSection = doc.createComment(commentText);
//insert open section comment before header node //insert open section comment before header node
hnode.appendChild(closeSection); node.appendChild(closeSection);
} }
private static void closeHeadingSections(Node hnode, int nLevel){ private static void closeHeadingSections(Node hnode, int nLevel){
@ -201,7 +189,7 @@ public class GreenstoneTags {
} }
//Close all sections with level less than current //Close all sections with level less than current
while (nLevel <= headerStack.peek()) { while (nLevel <= headerStack.peek()) {
closeSection(hnode); addCloseComment(hnode);
headerStack.poll(); headerStack.poll();
if (headerStack.isEmpty()) { if (headerStack.isEmpty()) {
break; break;
@ -209,32 +197,48 @@ public class GreenstoneTags {
} }
} }
protected static Node closePage(Node hnode){ protected static Node closePage(Node hnode){
if (pageTags.equals(SECTIONS)){ if (pageSeparation.equals(SECTIONS)){
//If section is empty. In case we are closing section //If section is empty. In case we are closing section
// the last comment is opened page section // the last comment is opened page section
if (hnode.getLastChild().getNodeType() == Node.COMMENT_NODE){ if (hnode.getLastChild().getNodeType() == Node.COMMENT_NODE){
hnode.removeChild(hnode.getLastChild()); hnode.removeChild(hnode.getLastChild());
} else { } else {
closeSection(hnode); addCloseComment(hnode);
} }
} else if (pageTags.equals(DIV)){ } else if (pageSeparation.equals(DIV)){
hnode = exitPageDiv(hnode); hnode = exitPageDiv(hnode);
} }
pageOpened = false; pageOpened = false;
return hnode; return hnode;
} }
protected static Node openPage(Node hnode, Integer pageNum){ protected static Node openPage(Node hnode, Integer pageNum){
if (pageTags.equals(SECTIONS)){ if (pageSeparation.equals(SECTIONS)){
openPageSection(hnode, pageNum); openPageComment(hnode, pageNum);
pageOpened = true; pageOpened = true;
} }
else if (pageTags.equals(DIV)){ else if (pageSeparation.equals(DIV)){
hnode = openPageDiv(hnode, pageNum); hnode = openPageDiv(hnode, pageNum);
pageOpened = true; pageOpened = true;
} }
return hnode; return hnode;
} }
private static boolean noHeadingSeparation() {
return headingSeparation.equals(NONE);
}
private static boolean noPageSeparation() {
return pageSeparation.equals(NONE);
}
private static String openHeadingCommentText(String title) {
String comment = "<Section>\n<Description>\n<Metadata name=\"Title\">" + title
+ "</Metadata>\n</Description>";
return comment;
}
private static String openPageCommentText(Integer pageNum) {
String comment = "<Section>\n<Description>\n<Metadata name=\"Title\">" + pageNum
+ "</Metadata>\n<Metadata name=\"Page\">" + pageNum + "</Metadata>\n</Description>";
return comment;
}
} }