[lmi-commits] [lmi] master 181f696: Fix defect introduced 20180502T1434Z: broke build_type=so_test

[Greg Chicares]

branch: master
commit 181f696bdda79b052e8ce1941f0288d77340db0c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Fix defect introduced 20180502T1434Z: broke build_type=so_test
---
 census_view.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/census_view.cpp b/census_view.cpp
index 597925c..f7a2a23 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -1275,16 +1275,14 @@ void CensusView::paste_out_to_spreadsheet() const
         {
         for(auto const& header : distinct_headers)
             {
-            // Assume that the trailing '\t' doesn't matter.
             // Show calendar dates as YYYY-MM-DD rather than JDN.
-            if(auto const& z = exact_cast<tnr_date>(cell[header]))
-                {
-                os << z->value().str() << '\t';
-                }
-            else
+            std::string s = cell[header].str();
+            if(exact_cast<tnr_date>(cell[header]))
                 {
-                os << cell[header].str() << '\t';
+                s = calendar_date(JdnToYmd(jdn_t(value_cast<int>(s)))).str();
                 }
+            // Assume that the trailing '\t' doesn't matter.
+            os << s << '\t';
             }
         os << '\n';
         }