Skip to content

Emit combined text for mixed content in HtmlDecoder #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 2, 2023
Merged

Emit combined text for mixed content in HtmlDecoder #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6485d17
Emit combined text for mixed content in HtmlDecoder
fsteeg Mar 2, 2023
fb23d42
Replace type specification with diamond operator
fsteeg Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions metafacture-html/src/main/java/org/metafacture/html/HtmlDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,10 @@ private void process(final Element parent, final StreamReceiver receiver) {
addedValueAsSubfield = handleAttributeValuesAsSubfields(receiver, element, attributes, attribute);
receiver.literal(attribute.getKey(), attribute.getValue());
}
if (element.children().isEmpty()) {
final String text = element.text().trim();
final String value = text.isEmpty() ? element.data() : text;
if (!value.isEmpty() && !addedValueAsSubfield) {
receiver.literal("value", value);
}
final String text = element.text().trim();
final String value = text.isEmpty() ? element.data() : text;
if (!value.isEmpty() && !addedValueAsSubfield) {
receiver.literal("value", value);
}
process(element, receiver);
receiver.endEntity();
Expand Down Expand Up @@ -133,7 +131,7 @@ private boolean handleAttributeValuesAsSubfields(final StreamReceiver receiver,
* @param mapString the attributes to be added as subfields
*/
public void setAttrValsAsSubfields(final String mapString) {
this.attrValsAsSubfields = new HashMap<String, String>();
this.attrValsAsSubfields = new HashMap<>();
final String input = mapString.startsWith("&") ? DEFAULT_ATTR_VALS_AS_SUBFIELDS + mapString : mapString;
for (final String nameValuePair : input.split("&")) {
final String[] nameValue = nameValuePair.split("=");
Expand Down
11 changes: 11 additions & 0 deletions metafacture-html/src/test/java/org/metafacture/html/HtmlDecoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,17 @@ public void nestedEntities() {

}

@Test
public void mixedContent() {
htmlDecoder.process(new StringReader("<p>This is the <strong>full</strong> text</p>"));
final InOrder ordered = inOrder(receiver);
ordered.verify(receiver).startEntity("p");
ordered.verify(receiver).literal("value", "This is the full text");
// elements above plus body, html
ordered.verify(receiver, times(4)).endEntity();

}

@Test
public void htmlAttributesAsLiterals() {
htmlDecoder.process(new StringReader("<p class=lead>Text"));
Expand Down