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

Fix #175 - Correctly parse ™

This commit is contained in:
jamesagnew 2015-06-04 20:24:47 -04:00
parent f9a9232926
commit 4d9b2c6e8c
3 changed files with 1456 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1557
hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java
View File

File diff suppressed because it is too large Load Diff

4
hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/model/primitive/XhtmlDtTest.java
View File

@ -66,7 +66,7 @@ public class XhtmlDtTest {
@Test @Test
public void testCharacterEntities() { public void testCharacterEntities() {
String input = "Sect: § uuml: ü Ü"; String input = "& Sect: § uuml: ü Ü Trade: ™";
XhtmlDt x = new XhtmlDt(); XhtmlDt x = new XhtmlDt();
x.setValueAsString(input); x.setValueAsString(input);
@ -77,7 +77,7 @@ public class XhtmlDtTest {
XhtmlDt x2 = new XhtmlDt(); XhtmlDt x2 = new XhtmlDt();
x2.setValue(x.getValue()); x2.setValue(x.getValue());
assertEquals("<div>Sect: § uuml: ü Ü</div>", x2.getValueAsString()); assertEquals("<div>&amp; Sect: § uuml: ü Ü Trade: ™</div>", x2.getValueAsString());
} }

4
src/changes/changes.xml
View File

@ -69,6 +69,10 @@
large attachments, so this setting has been increased to 100Mb. large attachments, so this setting has been increased to 100Mb.
Thanks to Nikos Kyriakoulakos for reporting! Thanks to Nikos Kyriakoulakos for reporting!
</action> </action>
<action type="fix" issue="175">
Some HTML entities were not correctly converted during parsing. Thanks to
Nick Kitto for reporting!
</action>
</release> </release>
<release version="1.0" date="2015-May-8"> <release version="1.0" date="2015-May-8">
<action type="add"> <action type="add">