瀏覽代碼

HPCC-11016 Fix fileview output of EBCIDIC strings

Also fix regression of XML schema for XML output.

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Anthony Fishbeck 11 年之前
父節點
當前提交
cd34e27c85
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      common/fileview2/fvresultset.cpp
  2. 1 1
      common/thorhelper/thorxmlwrite.hpp

+ 1 - 1
common/fileview2/fvresultset.cpp

@@ -1610,7 +1610,7 @@ void CResultSetCursor::writeXmlText(IXmlWriter &writer, int columnIndex, const c
         len = getLength(type, cur);
         if (meta.isEBCDIC(columnIndex))
         {
-            rtlStrToEStrX(resultLen, resultStr, len, (const char *)cur);
+            rtlEStrToStrX(resultLen, resultStr, len, (const char *)cur);
             writer.outputString(resultLen, resultStr, name);
         }
         else

+ 1 - 1
common/thorhelper/thorxmlwrite.hpp

@@ -51,7 +51,7 @@ public:
     void outputBeginNested(const char *fieldname, bool nestChildren, bool doIndent);
     void outputEndNested(const char *fieldname, bool doIndent);
 
-    virtual void outputInlineXml(const char *text){out.append(text); flush(false);} //for appending raw xml content
+    virtual void outputInlineXml(const char *text){closeTag(); out.append(text); flush(false);} //for appending raw xml content
     virtual void outputQuoted(const char *text);
     virtual void outputQString(unsigned len, const char *field, const char *fieldname);
     virtual void outputString(unsigned len, const char *field, const char *fieldname);