honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issues importing markdown into heirarchical tables

This commit is contained in:
Grahame Grieve 2019-10-02 14:49:57 +10:00
parent 8392361b7f
commit 85a1256b24
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java
View File

@ -229,19 +229,46 @@ public class HierarchicalTableGenerator extends TranslatingUtilities {
} }
return this; return this;
} }
private List<Piece> htmlToParagraphPieces(String html) throws IOException, FHIRException {
private List<Piece> htmlToParagraphPieces(String html) {
List<Piece> myPieces = new ArrayList<Piece>(); List<Piece> myPieces = new ArrayList<Piece>();
String[] paragraphs = html.replace("<p>", "").split("<\\/p>|<br \\/>"); try {
for (int i=0;i<paragraphs.length;i++) { XhtmlNode node = new XhtmlParser().parseFragment("<html>"+html+"</html>");
if (!paragraphs[i].isEmpty()) { boolean first = true;
if (i!=0) { for (XhtmlNode c : node.getChildNodes()) {
myPieces.add(new Piece("br")); if (first) {
first = false;
} else {
myPieces.add(new Piece("br")); myPieces.add(new Piece("br"));
myPieces.add(new Piece("br"));
}
if (c.getNodeType() == NodeType.Text) {
if (!Utilities.isWhitespace(c.getContent()))
addNode(myPieces, c);
} else if ("p".equals(c.getName())) {
for (XhtmlNode g : c.getChildNodes()) {
addNode(myPieces, g);
}
} else {
Piece x = new Piece(c.getName());
x.getChildren().addAll(c.getChildNodes());
myPieces.add(x);
} }
myPieces.addAll(htmlFormattingToPieces(paragraphs[i]));
} }
// String[] paragraphs = html.replace("<p>", "").split("<\\/p>|<br \\/>");
// for (int i=0;i<paragraphs.length;i++) {
// if (!paragraphs[i].isEmpty()) {
// if (i!=0) {
// myPieces.add(new Piece("br"));
// myPieces.add(new Piece("br"));
// }
// myPieces.addAll(htmlFormattingToPieces(paragraphs[i]));
// }
// }
} catch (Exception e) {
throw new FHIRException("Exception parsing html: "+e.getMessage()+" for "+html, e);
} }
return myPieces; return myPieces;
} }