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

Fixed mistake in previous commit

Browse source
This commit is contained in:
Georgy Litvinov 2020-02-24 22:18:35 +01:00
parent 508b905e5c
commit 6c90059fb0
3 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/writer2latex/rdf/DocumentPart.java
View file

@ -67,9 +67,10 @@ public class DocumentPart {
private void calculateParentPath() { private void calculateParentPath() {
if(path.length() == 1) { if(path.length() == 1) {
parentPath = ""; parentPath = "";
} } else {
parentPath = path.replaceAll(" [0-9]+$", ""); parentPath = path.replaceAll(" [0-9]+$", "");
} }
}
private void extractBody() { private void extractBody() {
Element excerptContentNode = excerptDoc.getContentNode(); Element excerptContentNode = excerptDoc.getContentNode();
StringBuilder bodyBuilder; StringBuilder bodyBuilder;

26
src/main/java/writer2latex/rdf/DocumentStructure.java
View file

@ -22,6 +22,7 @@ public class DocumentStructure {
private final String PARSERNAME = "w2phtml"; private final String PARSERNAME = "w2phtml";
private final String EXCERPT = "Excerpt"; private final String EXCERPT = "Excerpt";
private final String TOC_ELEMENT = "TOCElement"; private final String TOC_ELEMENT = "TOCElement";
private final String ELENPHARTICLE = "elenphArticle";
private String documentID = "DOC_ID"; private String documentID = "DOC_ID";
Model m; Model m;
@ -33,7 +34,6 @@ public class DocumentStructure {
} }
public DocumentStructure(Vector<XhtmlDocument> files) { public DocumentStructure(Vector<XhtmlDocument> files) {
this(); this();
System.out.println("DocStructure");
Iterator<XhtmlDocument> filesIterator = files.iterator(); Iterator<XhtmlDocument> filesIterator = files.iterator();
while (filesIterator.hasNext()) { while (filesIterator.hasNext()) {
XhtmlDocument inputDoc = filesIterator.next(); XhtmlDocument inputDoc = filesIterator.next();
@ -53,15 +53,12 @@ public class DocumentStructure {
if (levels[i].equals("0")) { if (levels[i].equals("0")) {
String emptyPath = createEmptyPath(levels, i); String emptyPath = createEmptyPath(levels, i);
if (!inputParts.containsKey(emptyPath)) { if (!inputParts.containsKey(emptyPath)) {
System.out.println("empty path added " + emptyPath);
DocumentPart emptyPart = new DocumentPart(emptyPath); DocumentPart emptyPart = new DocumentPart(emptyPath);
addPart(emptyPart); addPart(emptyPart);
} }
} }
} }
} }
} }
private String createEmptyPath(String[] levels, int i) { private String createEmptyPath(String[] levels, int i) {
StringBuilder emptyPath = new StringBuilder(); StringBuilder emptyPath = new StringBuilder();
@ -95,6 +92,14 @@ public class DocumentStructure {
elements.put(docPart.getPath(), element); elements.put(docPart.getPath(), element);
attachExcerpt(docPart, element); attachExcerpt(docPart, element);
} }
private void createDocumentElement(DocumentPart docPart) {
String elementName = TS + ELENPHARTICLE + "/" + PARSERNAME + "_" + documentID ;
Resource element = m.createResource(elementName);
elements.put(docPart.getPath(), element);
attachExcerpt(docPart, element);
}
private void createTOCItem(DocumentPart docPart) { private void createTOCItem(DocumentPart docPart) {
String tocItemName = TS + TOCITEM + "/" + PARSERNAME + "_" + documentID + docPart.getSafePath(); String tocItemName = TS + TOCITEM + "/" + PARSERNAME + "_" + documentID + docPart.getSafePath();
Resource tocItem = m.createResource(tocItemName); Resource tocItem = m.createResource(tocItemName);
@ -104,9 +109,10 @@ public class DocumentStructure {
tocItem.addLiteral(itemNumber, docPart.getNumber()); tocItem.addLiteral(itemNumber, docPart.getNumber());
tocItem.addProperty(pointsTo, elements.get(docPart.getPath())); tocItem.addProperty(pointsTo, elements.get(docPart.getPath()));
if (!docPart.getPath().isEmpty()) {
Resource parent = elements.get(docPart.getParentPath()); Resource parent = elements.get(docPart.getParentPath());
parent.addProperty(hasTOCItem, tocItem); m.add(parent, hasTOCItem, tocItem);
}
} }
@ -137,7 +143,13 @@ public class DocumentStructure {
private void createElements() { private void createElements() {
Set<String> paths = inputParts.keySet(); Set<String> paths = inputParts.keySet();
for (String path : paths) { for (String path : paths) {
createElement(inputParts.get(path)); DocumentPart part = inputParts.get(path);
if (part.getPath().isEmpty()) {
createDocumentElement(part);
} else {
createElement(part);
} }
} }
} }
}

3
src/main/java/writer2latex/xhtml/content/Separator.java
View file

@ -70,7 +70,6 @@ public class Separator {
if (noSplitNeeded(pageNum, curLevel)) { if (noSplitNeeded(pageNum, curLevel)) {
System.out.println(sLevel + "no split needed"); System.out.println(sLevel + "no split needed");
return hnode; return hnode;
} }
@ -149,7 +148,7 @@ public class Separator {
} }
private boolean isSplitTime(int curLevel, int pageNum) { private boolean isSplitTime(int curLevel, int pageNum) {
if ((rdfSeparation || splitLevel >= curLevel ) && converter.outFileHasContent()) { if ((rdfSeparation || splitLevel >= curLevel )) {
if (alignSplitToPages) { if (alignSplitToPages) {
if (lastSplitPageNum != pageNum) { if (lastSplitPageNum != pageNum) {
return true; return true;