OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cd53ef2)
DirCmpReport.*: Create HTML report with UTF-8
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 16 Jul 2017 07:52:37 +0000 (16:52 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 16 Jul 2017 07:52:37 +0000 (16:52 +0900)
Src/DirCmpReport.cpp patch | blob | history
Src/DirCmpReport.h patch | blob | history

diff --git a/Src/DirCmpReport.cpp b/Src/DirCmpReport.cpp
index 54a75b0..941a615 100644 (file)
--- a/Src/DirCmpReport.cpp
+++ b/Src/DirCmpReport.cpp
@@ -67,6 +67,7 @@ DirCmpReport::DirCmpReport(const std::vector<String> & colRegKeys)
 , m_sSeparator(_T(","))
 , m_pFileCmpReport(NULL)
 , m_bIncludeFileCmpReport(false)
+, m_bOutputUTF8(false)
 {
 }
 
@@ -209,21 +210,25 @@ void DirCmpReport::GenerateReport(REPORT_TYPE nReportType)
        switch (nReportType)
        {
        case REPORT_TYPE_SIMPLEHTML:
+               m_bOutputUTF8 = true;
                GenerateHTMLHeader();
                GenerateXmlHtmlContent(false);
                GenerateHTMLFooter();
                break;
        case REPORT_TYPE_SIMPLEXML:
+               m_bOutputUTF8 = true;
                GenerateXmlHeader();
                GenerateXmlHtmlContent(true);
                GenerateXmlFooter();
                break;
        case REPORT_TYPE_COMMALIST:
+               m_bOutputUTF8 = false;
                m_sSeparator = _T(",");
                GenerateHeader();
                GenerateContent();
                break;
        case REPORT_TYPE_TABLIST:
+               m_bOutputUTF8 = false;
                m_sSeparator = _T("\t");
                GenerateHeader();
                GenerateContent();
@@ -237,7 +242,7 @@ void DirCmpReport::GenerateReport(REPORT_TYPE nReportType)
  */
 void DirCmpReport::WriteString(const String& sText)
 {
-       std::string sOctets = ucr::toThreadCP(sText);
+       std::string sOctets(m_bOutputUTF8 ? ucr::toUTF8(sText) : ucr::toThreadCP(sText));
        const char *pchOctets = sOctets.c_str();
        void *pvOctets = const_cast<char *>(pchOctets);
        size_t cchAhead = sOctets.length();
@@ -310,7 +315,9 @@ void DirCmpReport::GenerateHTMLHeader()
 {
        WriteString(_T("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n")
                _T("\t\"http://www.w3.org/TR/html4/loose.dtd\">\n")
-               _T("<html>\n<head>\n\t<title>"));
+               _T("<html>\n<head>\n")
+               _T("\t<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n")
+               _T("\t<title>"));
        WriteString(m_sTitle);
        WriteString(_T("</title>\n"));
        WriteString(_T("\t<style type=\"text/css\">\n\t<!--\n"));
diff --git a/Src/DirCmpReport.h b/Src/DirCmpReport.h
index bf2ca75..4b78e82 100644 (file)
--- a/Src/DirCmpReport.h
+++ b/Src/DirCmpReport.h
@@ -66,4 +66,5 @@ private:
        const std::vector<String>& m_colRegKeys; /**< Key names for currently displayed columns */
        IFileCmpReport *m_pFileCmpReport;
        bool m_bIncludeFileCmpReport;
+       bool m_bOutputUTF8;
 };
About OSDN
Find Software
Develop Software
Help