|
@@ -329,7 +329,7 @@ public class ExportPaperUtil {
|
|
Document doc = Jsoup.parse(html);
|
|
Document doc = Jsoup.parse(html);
|
|
Element b = doc.body();
|
|
Element b = doc.body();
|
|
for (Node e : b.childNodes()) {
|
|
for (Node e : b.childNodes()) {
|
|
- if ("p".equals(e.nodeName()) && e.childNodeSize() > 0) {
|
|
|
|
|
|
+ if (("div".equals(e.nodeName())||"p".equals(e.nodeName())) && e.childNodeSize() > 0) {
|
|
JSection s = new JSection();
|
|
JSection s = new JSection();
|
|
List<SectionElement> ses = new ArrayList<SectionElement>();
|
|
List<SectionElement> ses = new ArrayList<SectionElement>();
|
|
s.setElements(ses);
|
|
s.setElements(ses);
|
|
@@ -344,10 +344,7 @@ public class ExportPaperUtil {
|
|
}
|
|
}
|
|
|
|
|
|
private static void getSectionElement(Node ce, List<SectionElement> ses, boolean diposeFillBlank) {
|
|
private static void getSectionElement(Node ce, List<SectionElement> ses, boolean diposeFillBlank) {
|
|
- if ("div".equals(ce.nodeName())) {
|
|
|
|
- log.error("*******************divcd:"+ce.childNodeSize());
|
|
|
|
- }
|
|
|
|
- if ("span".equals(ce.nodeName()) && ce.childNodeSize() > 0) {
|
|
|
|
|
|
+ if ("span".equals(ce.nodeName()) && ce.childNodeSize() > 0) {
|
|
for (Node e : ce.childNodes()) {
|
|
for (Node e : ce.childNodes()) {
|
|
getSectionElement(e, ses, diposeFillBlank);
|
|
getSectionElement(e, ses, diposeFillBlank);
|
|
}
|
|
}
|
|
@@ -376,9 +373,6 @@ public class ExportPaperUtil {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
ses.add(se);
|
|
ses.add(se);
|
|
- if ("div".equals(ce.nodeName())) {
|
|
|
|
- log.error("*******************seval:"+se.getValue());
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|