[lmi-commits] [6441] Revise the 20151210T2158Z change

[Greg Chicares]

Revision: 6441
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6441
Author:   chicares
Date:     2015-12-12 16:00:25 +0000 (Sat, 12 Dec 2015)
Log Message:
-----------
Revise the 20151210T2158Z change

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/census_view.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-12-12 15:58:25 UTC (rev 6440)
+++ lmi/trunk/ChangeLog 2015-12-12 16:00:25 UTC (rev 6441)
@@ -37721,3 +37721,9 @@
 Reconstitute 'ce_product_name' from 'mc_enum_base' (VS). See:
   http://lists.nongnu.org/archive/html/lmi/2015-12/msg00010.html
 
+20151212T1600Z <address@hidden> [456]
+
+  census_view.cpp
+Revise the 20151210T2158Z change. See:
+  http://lists.nongnu.org/archive/html/lmi/2015-12/msg00006.html
+

Modified: lmi/trunk/census_view.cpp
===================================================================
--- lmi/trunk/census_view.cpp   2015-12-12 15:58:25 UTC (rev 6440)
+++ lmi/trunk/census_view.cpp   2015-12-12 16:00:25 UTC (rev 6441)
@@ -42,6 +42,7 @@
 #include "ledger_text_formats.hpp"
 #include "miscellany.hpp"               // is_ok_for_cctype()
 #include "path_utility.hpp"
+#include "rtti_lmi.hpp"                 // lmi::TypeInfo
 #include "safely_dereference_as.hpp"
 #include "single_choice_popup_menu.hpp"
 #include "timer.hpp"
@@ -668,27 +669,47 @@
         {
         return get_impl<renderer_bool_convertor>();
         }
-    else if(is_reconstitutable_as<mc_enum_base  >(value))
+    else if(exact_cast<datum_string>(value))
         {
-        return get_impl<renderer_enum_convertor>();
+        return get_impl<renderer_fallback_convertor>();
         }
     else if(is_reconstitutable_as<datum_sequence>(value))
         {
         return get_impl<renderer_sequence_convertor>();
         }
+    else if(is_reconstitutable_as<mc_enum_base  >(value))
+        {
+        return get_impl<renderer_enum_convertor>();
+        }
     else if(is_reconstitutable_as<tn_range_base >(value))
         {
         tn_range_base const* as_range = member_cast<tn_range_base>(value);
         if(typeid(int) == as_range->value_type())
+            {
             return get_impl<renderer_int_range_convertor>();
+            }
         else if(typeid(double) == as_range->value_type())
+            {
             return get_impl<renderer_double_range_convertor>();
+            }
         else if(typeid(calendar_date) == as_range->value_type())
+            {
             return get_impl<renderer_date_convertor>();
+            }
+        else
+            {
+            // Fall through to warn and treat datum as string.
+            }
         }
     else
         {
-        ; // Fall through.
+        warning()
+            << "Type '"
+            << lmi::TypeInfo(value.type())
+            << "' not recognized. Please report this anomaly."
+            << LMI_FLUSH
+            ;
+        // Fall through to treat datum as string.
         }
 
     return get_impl<renderer_fallback_convertor>();