[lmi-commits] [5489] Change the headings of certain exotic columns

[Greg Chicares]

Revision: 5489
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5489
Author:   chicares
Date:     2012-06-04 19:57:43 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
Change the headings of certain exotic columns

Modified Paths:
--------------
    lmi/trunk/ledger_text_formats.cpp
    lmi/trunk/ledger_xml_io.cpp
    lmi/trunk/mc_enum_types.xpp

Modified: lmi/trunk/ledger_text_formats.cpp
===================================================================
--- lmi/trunk/ledger_text_formats.cpp   2012-06-04 10:57:24 UTC (rev 5488)
+++ lmi/trunk/ledger_text_formats.cpp   2012-06-04 19:57:43 UTC (rev 5489)
@@ -126,8 +126,8 @@
 // '*_CurrentZero' and '*_GuaranteedZero' columns deliberately suppressed--see:
 //   http://lists.nongnu.org/archive/html/lmi/2009-09/msg00012.html
 // TODO ?? EGREGIOUS_DEFECT: instead, don't offer these columns at all.
-//      m["AVGenAcct_CurrentZero"      ] = ledger_metadata(0, oe_format_normal 
   , "Curr Charges 0% Account Value Gen Acct"); // "Curr Charges 0% Account 
Value General Account"
-//      m["AVGenAcct_GuaranteedZero"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Charges 0% Account Value Gen Acct"); // "Guar Charges 0% Account 
Value General Account"
+//      m["AVGenAcct_CurrentZero"      ] = ledger_metadata(0, oe_format_normal 
   , "Curr Charges Account Value Gen Acct"   ); // "Curr Charges Account Value 
General Account"
+//      m["AVGenAcct_GuaranteedZero"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Charges Account Value Gen Acct"   ); // "Guar Charges Account Value 
General Account"
 //      m["AVSepAcct_CurrentZero"      ] = ledger_metadata(0, oe_format_normal 
   , "Curr Charges 0% Account Value Sep Acct"); // "Curr Charges 0% Account 
Value Separate Account"
 //      m["AVSepAcct_GuaranteedZero"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Charges 0% Account Value Sep Acct"); // "Guar Charges 0% Account 
Value Separate Account"
 //      m["AcctVal_CurrentZero"        ] = ledger_metadata(0, oe_format_normal 
   , "Curr Charges 0% Account Value"         ); // "Curr Charges 0% Account 
Value"

Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2012-06-04 10:57:24 UTC (rev 5488)
+++ lmi/trunk/ledger_xml_io.cpp 2012-06-04 19:57:43 UTC (rev 5489)
@@ -192,8 +192,8 @@
     // they are defined only on a current basis--experience-rating
     // columns, e.g.
 
-    title_map["AVGenAcct_CurrentZero"           ] = "Curr Charges 0% Account 
Value Gen Acct";
-    title_map["AVGenAcct_GuaranteedZero"        ] = "Guar Charges 0% Account 
Value Gen Acct";
+    title_map["AVGenAcct_CurrentZero"           ] = "Curr Charges Account 
Value Gen Acct";
+    title_map["AVGenAcct_GuaranteedZero"        ] = "Guar Charges Account 
Value Gen Acct";
     title_map["AVRelOnDeath_Current"            ] = "Account Value 
____Released on Death";
     title_map["AVSepAcct_CurrentZero"           ] = "Curr Charges 0% Account 
Value Sep Acct";
     title_map["AVSepAcct_GuaranteedZero"        ] = "Guar Charges 0% Account 
Value Sep Acct";

Modified: lmi/trunk/mc_enum_types.xpp
===================================================================
--- lmi/trunk/mc_enum_types.xpp 2012-06-04 10:57:24 UTC (rev 5488)
+++ lmi/trunk/mc_enum_types.xpp 2012-06-04 19:57:43 UTC (rev 5489)
@@ -717,8 +717,8 @@
     ,"Current Interest Credited Net of Separate Account Charges" \
     ,"Current Separate Account Asset Charges" \
     ,"Current Policy Fee" \
-    ,"Curr Charges 0% Account Value General Account" \
-    ,"Guar Charges 0% Account Value General Account" \
+    ,"Curr Charges Account Value General Account" \
+    ,"Guar Charges Account Value General Account" \
     ,"Curr Charges 0% Account Value Separate Account" \
     ,"Guar Charges 0% Account Value Separate Account" \
     ,"Curr Charges 0% Account Value" \