Revision: 20229
http://sourceforge.net/p/gate/code/20229
Author: ian_roberts
Date: 2017-06-02 13:18:06 +0000 (Fri, 02 Jun 2017)
Log Message:
-----------
Backport fix for https://github.com/GateNLP/gate-core/issues/7 from
8.5-SNAPSHOT - proper handling of CDATA in TextWithNodes
Modified Paths:
--------------
gate/trunk/src/main/gate/corpora/DocumentStaxUtils.java
Modified: gate/trunk/src/main/gate/corpora/DocumentStaxUtils.java
===================================================================
--- gate/trunk/src/main/gate/corpora/DocumentStaxUtils.java 2017-06-02
13:17:03 UTC (rev 20228)
+++ gate/trunk/src/main/gate/corpora/DocumentStaxUtils.java 2017-06-02
13:18:06 UTC (rev 20229)
@@ -440,10 +440,6 @@
while((eventType = xsr.next()) != XMLStreamConstants.END_ELEMENT) {
switch(eventType) {
case XMLStreamConstants.CHARACTERS:
- stringRep.append(xsr.getTextCharacters(), xsr.getTextStart(),
- xsr.getTextLength());
- break;
-
case XMLStreamConstants.CDATA:
stringRep.append(xsr.getTextCharacters(), xsr.getTextStart(),
xsr.getTextLength());
@@ -492,6 +488,7 @@
while((eventType = xsr.next()) != XMLStreamConstants.END_ELEMENT) {
switch(eventType) {
case XMLStreamConstants.CHARACTERS:
+ case XMLStreamConstants.CDATA:
textBuf.append(xsr.getTextCharacters(), xsr.getTextStart(), xsr
.getTextLength());
break;
@@ -587,15 +584,11 @@
while((eventType = xsr.next()) != XMLStreamConstants.END_ELEMENT) {
switch(eventType) {
case XMLStreamConstants.CHARACTERS:
+ case XMLStreamConstants.CDATA:
stringRep.append(xsr.getTextCharacters(), xsr.getTextStart(), xsr
.getTextLength());
break;
- case XMLStreamConstants.CDATA:
- stringRep.append(xsr.getTextCharacters(), xsr.getTextStart(), xsr
- .getTextLength());
- break;
-
case XMLStreamConstants.START_ELEMENT:
throw new XMLStreamException("Elements not allowed within "
+ "feature name or value element.", xsr.getLocation());
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs
