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

Refactoring Separator

Browse source
This commit is contained in:
Georgy Litvinov 2021-03-13 17:41:38 +01:00
parent f223b2ef9b
commit 0680742212
2 changed files with 53 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/main/java/w2phtml/xhtml/content/Separator.java
View file

@ -55,32 +55,22 @@ public class Separator {
headingPath = new int[10]; headingPath = new int[10];
} }
public Node processOutlineLevel(Node currentNode, Node hnode, int pageNum) { public Node whatToDoWithOutlineNodeOnPage(Node currentNode, Node hnode, int pageNum) {
// Get outline level // Get outline level
Node outlineNode = null; if (isBadOutlineNode(currentNode)) {
if (currentNode.getNodeName().contentEquals(TABLE_TABLE)) { return hnode;
outlineNode = getOulineNodeFromTable(currentNode);
} else {
outlineNode = currentNode;
} }
Node outlineNode = getRealOntlineNode(currentNode);
Integer curLevel = getOutlineLevel(outlineNode); Integer curLevel = getOutlineLevel(outlineNode);
if (curLevel < 1) {
return hnode;
}
String title = getOutlineTitle(outlineNode); String title = getOutlineTitle(outlineNode);
if (title == null || title.isEmpty()) {
return hnode;
}
if (!greenstoneSeparation &&
if (noSplitNeeded(pageNum, curLevel)) { !needPagination() &&
// System.out.println("No split needed"); !needCurrentLevelSplitOnThisPage(curLevel,pageNum)) {
return hnode; return hnode;
} }
if (isSplitTime(curLevel, pageNum)) { if (needCurrentLevelSplitOnThisPage(curLevel, pageNum)) {
prevPageContainer = hnode; prevPageContainer = hnode;
} }
@ -94,7 +84,7 @@ public class Separator {
updateHeadingPath(curLevel); updateHeadingPath(curLevel);
if (isSplitTime(curLevel, pageNum)) { if (needCurrentLevelSplitOnThisPage(curLevel, pageNum)) {
hnode = splitFiles(hnode); hnode = splitFiles(hnode);
if (rdfSeparation) { if (rdfSeparation) {
setContentPath(hnode,curLevel); setContentPath(hnode,curLevel);
@ -107,13 +97,36 @@ public class Separator {
addToCommentStack(curLevel.toString()); addToCommentStack(curLevel.toString());
} }
if (pagination) { if (needPagination()) {
hnode = openPage(hnode, pageNum); hnode = openPage(hnode, pageNum);
} }
return hnode; return hnode;
} }
private boolean isBadOutlineNode(Node currentNode) {
Node outlineNode = getRealOntlineNode(currentNode);
Integer curLevel = getOutlineLevel(outlineNode);
if (curLevel < 1) {
return true;
}
String title = getOutlineTitle(outlineNode);
if (title == null || title.isEmpty()) {
return true;
}
return false;
}
private Node getRealOntlineNode(Node currentNode) {
Node outlineNode = null;
if (currentNode.getNodeName().contentEquals(TABLE_TABLE)) {
outlineNode = getOulineNodeFromTable(currentNode);
} else {
outlineNode = currentNode;
}
return outlineNode;
}
private int getOutlineLevel(Node currentNode) { private int getOutlineLevel(Node currentNode) {
String levelAttr = getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL); String levelAttr = getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL);
if (levelAttr == null || levelAttr.isEmpty()) { if (levelAttr == null || levelAttr.isEmpty()) {
@ -159,11 +172,10 @@ public class Separator {
} }
private boolean noSplitNeeded(int pageNum, int curLevel) {
return !greenstoneSeparation && !needPageSplits() && !isSplitTime(curLevel,pageNum);
}
private boolean needChapterSplits() { private boolean needChapterSplits() {
if (splitLevel > 0 ) {
return true;
}
if (greenstoneSeparation) { if (greenstoneSeparation) {
return true; return true;
} }
@ -173,7 +185,7 @@ public class Separator {
return false; return false;
} }
private boolean needPageSplits() { private boolean needPagination() {
if (pagination) { if (pagination) {
return true; return true;
} }
@ -212,10 +224,13 @@ public class Separator {
((Element) hnode).setAttribute("path", path.toString()); ((Element) hnode).setAttribute("path", path.toString());
} }
private boolean isSplitTime(int curLevel, int pageNum) { private boolean needCurrentLevelSplitOnThisPage(int curLevel, int curPage) {
if ((rdfSeparation || splitLevel >= curLevel )) { if (!needChapterSplits()) {
return false;
}
if ( splitLevel >= curLevel ) {
if (alignSplitToPages) { if (alignSplitToPages) {
if (lastSplitPageNum != pageNum) { if (lastSplitPageNum != curPage) {
return true; return true;
} }
} else { } else {
@ -226,7 +241,7 @@ public class Separator {
} }
public Node processPageBreak(Node currentNode, Node hnode, Integer pageNum) { public Node processPageBreak(Node currentNode, Node hnode, Integer pageNum) {
if (!pagination) { if (!needPagination()) {
return hnode; return hnode;
} }
if (pageOpened) { if (pageOpened) {
@ -245,7 +260,7 @@ public class Separator {
* Opens main document section heading tag * Opens main document section heading tag
*/ */
public Node startDocument(Node hnode, String title, int pageNum) { public Node startDocument(Node hnode, String title, int pageNum) {
if (!greenstoneSeparation && !pagination) { if (!greenstoneSeparation && !needPagination()) {
return hnode; return hnode;
} }
if (greenstoneSeparation) { if (greenstoneSeparation) {
@ -259,7 +274,7 @@ public class Separator {
// Method to close open tags at the end of the document // Method to close open tags at the end of the document
public Node endDocument(Node hnode) { public Node endDocument(Node hnode) {
if (!greenstoneSeparation && !pagination) { if (!greenstoneSeparation && !needPagination()) {
return hnode; return hnode;
} }
if (pageOpened) { if (pageOpened) {
@ -357,7 +372,6 @@ public class Separator {
public static String getOutlineTitle(Node currentNode) { public static String getOutlineTitle(Node currentNode) {
Node content = currentNode.cloneNode(true); Node content = currentNode.cloneNode(true);
String title = null;
NodeList lineBreaks = ((Element) content).getElementsByTagName(XMLString.TEXT_LINE_BREAK); NodeList lineBreaks = ((Element) content).getElementsByTagName(XMLString.TEXT_LINE_BREAK);
NodeList textTabs = ((Element) content).getElementsByTagName(XMLString.TEXT_TAB); NodeList textTabs = ((Element) content).getElementsByTagName(XMLString.TEXT_TAB);
@ -365,7 +379,7 @@ public class Separator {
replaceWithSpaces(textTabs); replaceWithSpaces(textTabs);
deleteNotesIn(content); deleteNotesIn(content);
deleteCommentsIn(content); deleteCommentsIn(content);
title = content.getTextContent().trim(); String title = content.getTextContent().trim();
return title; return title;
} }
@ -435,7 +449,7 @@ public class Separator {
return hnode; return hnode;
} }
hnode = exitPageContainer(hnode); hnode = exitPageContainer(hnode);
if (pagination) { if (needPagination()) {
hnode = exitPageDiv(hnode); hnode = exitPageDiv(hnode);
} }
pageOpened = false; pageOpened = false;
@ -443,7 +457,7 @@ public class Separator {
} }
public Node openPage(Node hnode, Integer pageNum) { public Node openPage(Node hnode, Integer pageNum) {
if (pageOpened == true || !pagination) { if (pageOpened == true || !needPagination()) {
return hnode; return hnode;
} }
hnode = openPageDiv(hnode, pageNum); hnode = openPageDiv(hnode, pageNum);
@ -505,19 +519,14 @@ public class Separator {
} }
public Node breaksOrOutline(Node currentNode, Node hnode, int pageNum) { public Node breaksOrOutline(Node currentNode, Node hnode, int pageNum) {
Node outlineNode = null; Node outlineNode = getRealOntlineNode(currentNode);
if (currentNode.getNodeName().contentEquals(TABLE_TABLE)) {
outlineNode = getOulineNodeFromTable(currentNode);
} else {
outlineNode = currentNode;
}
Integer curLevel = getOutlineLevel(outlineNode); Integer curLevel = getOutlineLevel(outlineNode);
String title = getOutlineTitle(outlineNode); String title = getOutlineTitle(outlineNode);
if (curLevel < 1 || title == null || title.isEmpty()) { if (curLevel < 1 || title == null || title.isEmpty()) {
hnode = processPageBreak(currentNode, hnode, pageNum); hnode = processPageBreak(currentNode, hnode, pageNum);
} else { } else {
hnode = processOutlineLevel(currentNode, hnode, pageNum); hnode = whatToDoWithOutlineNodeOnPage(currentNode, hnode, pageNum);
} }
return hnode; return hnode;
} }

4
src/main/java/w2phtml/xhtml/content/TextParser.java
View file

@ -1211,7 +1211,7 @@ public class TextParser extends Parser {
if (currentMasterPage == null && style != null) { if (currentMasterPage == null && style != null) {
//Document wasn't started yet. //Document wasn't started yet.
hnode = startDocument(hnode, style, newPageNumber); hnode = startDocument(hnode, style, newPageNumber);
hnode = docSep.processOutlineLevel(currentNode, hnode, pageNum); hnode = docSep.whatToDoWithOutlineNodeOnPage(currentNode, hnode, pageNum);
} else if (hasMasterPage(style) || hasBreakBefore(style) || breakBeforeNextNode) { } else if (hasMasterPage(style) || hasBreakBefore(style) || breakBeforeNextNode) {
if (hasBreakBefore(style)) { if (hasBreakBefore(style)) {
@ -1235,7 +1235,7 @@ public class TextParser extends Parser {
return hnode; return hnode;
} else { } else {
hnode = docSep.processOutlineLevel(currentNode, hnode, pageNum); hnode = docSep.whatToDoWithOutlineNodeOnPage(currentNode, hnode, pageNum);
} }
if (checkHardBreakAfter(style)) { if (checkHardBreakAfter(style)) {