You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2009/12/15 20:07:10 UTC

svn commit: r890945 - /incubator/uima/uimacpp/branches/uimacpp-2.3.0/src/cas/xmiwriter.cpp

Author: eae
Date: Tue Dec 15 19:07:09 2009
New Revision: 890945

URL: http://svn.apache.org/viewvc?rev=890945&view=rev
Log:
UIMA-1707

Modified:
    incubator/uima/uimacpp/branches/uimacpp-2.3.0/src/cas/xmiwriter.cpp

Modified: incubator/uima/uimacpp/branches/uimacpp-2.3.0/src/cas/xmiwriter.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/branches/uimacpp-2.3.0/src/cas/xmiwriter.cpp?rev=890945&r1=890944&r2=890945&view=diff
==============================================================================
--- incubator/uima/uimacpp/branches/uimacpp-2.3.0/src/cas/xmiwriter.cpp (original)
+++ incubator/uima/uimacpp/branches/uimacpp-2.3.0/src/cas/xmiwriter.cpp Tue Dec 15 19:07:09 2009
@@ -741,7 +741,10 @@
       //attributes
       for (size_t a=0; a < oed->attributes.size(); a++) {
         XmlAttribute * attr = oed->attributes.at(a);
-        os << " " << attr->name << "=\"" << attr->value << "\"";
+        icu::UnicodeString us;
+        icu::UnicodeString av(attr->value.c_str());
+        normalize( av, us );
+        os << " " << attr->name << "=\"" << us << "\"";
       }
       //child elements
       map<string,vector<string>*>::iterator ite ;
@@ -749,8 +752,11 @@
         ite != oed->childElements.end(); ite++) {
           vector<string> * values = ite->second;
           for (size_t v=0; v < values->size();v++) {
+            icu::UnicodeString us;
+            icu::UnicodeString av(values->at(v).c_str());
+            normalize( av, us );
             strcontent << " <" << ite->first 
-              << ">" << values->at(v) 
+              << ">" << us
               << "</" << ite->first << ">";
           }
         }
@@ -1197,7 +1203,10 @@
     // Add other attributes
     for (size_t a=0; a < oed->attributes.size();a++) {
       XmlAttribute * attr = oed->attributes.at(a);
-      os << " " << attr->name << "=\"" << attr->value << "\"";
+      icu::UnicodeString us;
+      icu::UnicodeString av(attr->value.c_str());
+      normalize( av, us );
+      os << " " << attr->name << "=\"" << us << "\"";
     }
     if (oed->childElements.size() > 0) {
       os << ">";
@@ -1206,8 +1215,11 @@
       for (ite = oed->childElements.begin(); ite != oed->childElements.end();ite++ ) {
         vector<string> * values = ite->second;
         for (size_t v=0; v < values->size(); v++) {
+	        icu::UnicodeString us;
+			icu::UnicodeString av(values->at(v).c_str());
+			normalize( av, us );
           os << " <" << ite->first << ">";
-          os << values->at(v); 
+          os << us;
           os << "</" << ite->first << ">";
         }
       }