# HG changeset patch # User František Kučera # Date 1637696255 -3600 # Node ID 6507d454b9a6a70352ee4e10aac9606d68fc22ac # Parent cc601886f0a7b462c6884e3d0c97b8c969966926 fix raw-xml formatting (remove XML declaration) diff -r cc601886f0a7 -r 6507d454b9a6 src/XMLTableCommand.h --- a/src/XMLTableCommand.h Tue Jun 08 22:53:20 2021 +0200 +++ b/src/XMLTableCommand.h Tue Nov 23 20:37:35 2021 +0100 @@ -43,7 +43,10 @@ std::wstring_convert> convertor; // TODO: support also other encodings. string_t formatRawXML(string_t rawXML) { - std::wregex pattern(L"^<\\?xml version=\"1.0\" encoding=\"UTF-8\"\\?>\n|\n$"); + std::wregex pattern(L"^(<\\?xml version=\"1.0\" encoding=\"UTF-8\"\\?>\\s*)+|\n$"); + // libxml sometimes returns doubled XML declaration (probably a bug), see: + // --relation ini --records '/' --attribute 'xml' string '.' --mode raw-xml # (but not for --records '//*') + // so we remove all of them and also trailing line ends (if any). return std::regex_replace(rawXML, pattern, L""); }