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

Refactored page splitter

Browse source
This commit is contained in:
Georgy Litvinov 2020-07-24 16:30:30 +02:00
parent 70fc8b4307
commit 96cb7d9a72
2 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/main/java/w2phtml/xhtml/ODFPageSplitter.java
View file

@ -16,9 +16,14 @@ public class ODFPageSplitter {
static Node truncatedListItemNodeContent = null; static Node truncatedListItemNodeContent = null;
static OfficeReader officeReader = null; static OfficeReader officeReader = null;
public static Node splitText(Node onode,OfficeReader ofr){ public static void splitOfficeText(Node onode, OfficeReader ofr) {
//Find par node with soft page break inside and split it
officeReader = ofr; officeReader = ofr;
splitText(onode);
}
public static void splitText(Node onode){
//Find par node with soft page break inside and split it
Document document = onode.getOwnerDocument(); Document document = onode.getOwnerDocument();
Element softPageBreak = document.createElement(TEXT_SOFT_PAGE_BREAK); Element softPageBreak = document.createElement(TEXT_SOFT_PAGE_BREAK);
NodeList nodes = onode.getChildNodes(); NodeList nodes = onode.getChildNodes();
@ -39,11 +44,11 @@ public class ODFPageSplitter {
//If SPB not the first node //If SPB not the first node
if (handleParagraph(child)){ if (handleParagraph(child)){
style = ofr.getParStyle(Misc.getAttribute(child, TEXT_STYLE_NAME)); style = officeReader.getParStyle(Misc.getAttribute(child, TEXT_STYLE_NAME));
} }
} else if (nodeName.equals(TABLE_TABLE)) { } else if (nodeName.equals(TABLE_TABLE)) {
if (handleTableTable(child)){ if (handleTableTable(child)){
style = ofr.getTableStyle(Misc.getAttribute(child, TABLE_STYLE_NAME)); style = officeReader.getTableStyle(Misc.getAttribute(child, TABLE_STYLE_NAME));
} }
} else if (nodeName.equals(TEXT_LIST)) { } else if (nodeName.equals(TEXT_LIST)) {
handleList(child); handleList(child);
@ -53,7 +58,7 @@ public class ODFPageSplitter {
splitABIndex(child); splitABIndex(child);
} else if (nodeName.equals(TEXT_SECTION)) { } else if (nodeName.equals(TEXT_SECTION)) {
if (handleSection(child)) { if (handleSection(child)) {
style = ofr.getSectionStyle(Misc.getAttribute(child, TEXT_SECTION)); style = officeReader.getSectionStyle(Misc.getAttribute(child, TEXT_SECTION));
} }
} else if (nodeName.equals(TEXT_TABLE_OF_CONTENT)){ } else if (nodeName.equals(TEXT_TABLE_OF_CONTENT)){
//HACK //HACK
@ -89,12 +94,12 @@ public class ODFPageSplitter {
i++; i++;
} }
//Debug.printNode(onode); //Debug.printNode(onode);
return onode;
} }
private static void splitABIndex(Node abIndex) { private static boolean splitABIndex(Node abIndex) {
Node parent = abIndex.getParentNode(); Node parent = abIndex.getParentNode();
Node abIndexFirstPart = abIndex.cloneNode(false); Node abIndexFirstPart = abIndex.cloneNode(false);
NodeList childs = abIndex.getChildNodes(); NodeList childs = abIndex.getChildNodes();
boolean dataMoved = false;
int i = 0; int i = 0;
while (childs.getLength() > i) { while (childs.getLength() > i) {
Node child = childs.item(i); Node child = childs.item(i);
@ -103,20 +108,24 @@ public class ODFPageSplitter {
abIndexFirstPart.appendChild(child.cloneNode(true)); abIndexFirstPart.appendChild(child.cloneNode(true));
} else } else
if (childName.equals(TEXT_INDEX_BODY)) { if (childName.equals(TEXT_INDEX_BODY)) {
Node indexBodyFirstPart = splitTextIndexBody(child); if (splitTextIndexBody(child)) {
abIndexFirstPart.appendChild(indexBodyFirstPart); abIndexFirstPart.appendChild(child.getPreviousSibling());
dataMoved = true;
}
} }
i++; i++;
} }
if (abIndexFirstPart != null) { if (dataMoved) {
parent.insertBefore(abIndexFirstPart, abIndex); parent.insertBefore(abIndexFirstPart, abIndex);
} }
return dataMoved;
} }
private static void splitTextIllustrationIndex(Node illustrationIndex) { private static boolean splitTextIllustrationIndex(Node illustrationIndex) {
Node parent = illustrationIndex.getParentNode(); Node parent = illustrationIndex.getParentNode();
Node illustrationIndexFirstPart = illustrationIndex.cloneNode(false); Node illustrationIndexFirstPart = illustrationIndex.cloneNode(false);
NodeList childs = illustrationIndex.getChildNodes(); NodeList childs = illustrationIndex.getChildNodes();
boolean dataMoved = false;
int i = 0; int i = 0;
while (childs.getLength() > i) { while (childs.getLength() > i) {
Node child = childs.item(i); Node child = childs.item(i);
@ -125,19 +134,23 @@ public class ODFPageSplitter {
illustrationIndexFirstPart.appendChild(child.cloneNode(true)); illustrationIndexFirstPart.appendChild(child.cloneNode(true));
} else } else
if (childName.equals(TEXT_INDEX_BODY)) { if (childName.equals(TEXT_INDEX_BODY)) {
Node indexBodyFirstPart = splitTextIndexBody(child); if(splitTextIndexBody(child)) {
illustrationIndexFirstPart.appendChild(indexBodyFirstPart); illustrationIndexFirstPart.appendChild(child.getPreviousSibling());
dataMoved = true;
}
} }
i++; i++;
} }
if (illustrationIndexFirstPart != null) { if (dataMoved) {
parent.insertBefore(illustrationIndexFirstPart, illustrationIndex); parent.insertBefore(illustrationIndexFirstPart, illustrationIndex);
} }
return dataMoved;
} }
private static Node splitTextIndexBody(Node indexBody) { private static boolean splitTextIndexBody(Node indexBody) {
Node indexBodyFirstPart = indexBody.cloneNode(false); Node indexBodyFirstPart = indexBody.cloneNode(false);
NodeList childs = indexBody.getChildNodes(); NodeList childs = indexBody.getChildNodes();
boolean dataMoved = false;
int i = 0; int i = 0;
while (childs.getLength() > i) { while (childs.getLength() > i) {
Node child = childs.item(i); Node child = childs.item(i);
@ -147,17 +160,20 @@ public class ODFPageSplitter {
String childName = child.getNodeName(); String childName = child.getNodeName();
if (childName.equals(TEXT_P)) { if (childName.equals(TEXT_P)) {
if (handleParagraph(child)) { if (handleParagraph(child)) {
indexBodyFirstPart.appendChild(child.getPreviousSibling()); indexBodyFirstPart.appendChild(child.getPreviousSibling());
dataMoved = true;
} }
return indexBodyFirstPart; return dataMoved;
} else } else
if (childName.equals(TEXT_SOFT_PAGE_BREAK)) { if (childName.equals(TEXT_SOFT_PAGE_BREAK)) {
indexBody.removeChild(child); //indexBody.removeChild(child);
return indexBodyFirstPart; //return dataMoved;
System.out.println("Error. Soft page break inside " + childName);
System.exit(1);
} }
} }
} }
return indexBodyFirstPart; return dataMoved;
} }
private static boolean handleList(Node list){ private static boolean handleList(Node list){
Node parent = list.getParentNode(); Node parent = list.getParentNode();
@ -633,7 +649,7 @@ public class ODFPageSplitter {
if (childName.equals(TEXT_NOTE)){ if (childName.equals(TEXT_NOTE)){
Element textNote = (Element) child; Element textNote = (Element) child;
//System.out.println("handle TextNote in para"); //System.out.println("handle TextNote in para");
splitText(textNote.getElementsByTagName(TEXT_NOTE_BODY).item(0), officeReader); splitText(textNote.getElementsByTagName(TEXT_NOTE_BODY).item(0));
} else } else
if (childName.equals(TEXT_SPAN)){ if (childName.equals(TEXT_SPAN)){
handleSpan(child); handleSpan(child);
@ -675,7 +691,7 @@ public class ODFPageSplitter {
if (child.getNodeType() == Node.ELEMENT_NODE) { if (child.getNodeType() == Node.ELEMENT_NODE) {
if (containsSPB(child)) { if (containsSPB(child)) {
if (childName.equals(TEXT_NOTE)) { if (childName.equals(TEXT_NOTE)) {
splitText(((Element)child).getElementsByTagName(TEXT_NOTE_BODY).item(0), officeReader); splitText(((Element)child).getElementsByTagName(TEXT_NOTE_BODY).item(0));
} else if (childName.equals(TEXT_SPAN)){ } else if (childName.equals(TEXT_SPAN)){
handleSpan(child); handleSpan(child);
} else { } else {
@ -687,22 +703,7 @@ public class ODFPageSplitter {
i++; i++;
} }
} }
private static Node handleNote(Node note) {
//Debug.printNode(note);
System.exit(1);
Node parent = note.getParentNode();
Element NoteElement = (Element) note;
Node noteBody = NoteElement.getElementsByTagName(TEXT_NOTE_BODY).item(0);
NodeList noteBodyNodes = noteBody.getChildNodes();
int i = 0;
boolean foundSPB = false;
while (noteBodyNodes.getLength() > i) {
Node child = noteBodyNodes.item(i);
}
return null;
}
private static boolean appendChild(Node parent, Node child) { private static boolean appendChild(Node parent, Node child) {
boolean dataMoved; boolean dataMoved;
parent.appendChild(child); parent.appendChild(child);

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

@ -166,7 +166,7 @@ public class TextParser extends Parser {
//Split pages //Split pages
if (pagination) { if (pagination) {
onode = (Element) ODFPageSplitter.splitText(onode,ofr); ODFPageSplitter.splitOfficeText(onode, ofr);
//Debug.printNode(onode); //Debug.printNode(onode);
} }
hnode = (Element)traverseBlockText(onode,hnode); hnode = (Element)traverseBlockText(onode,hnode);