[lmi-commits] [lmi] valyuta/007 e3830e7a 07/18: Fix omissions earlier on this branch

[Greg Chicares]

branch: valyuta/007
commit e3830e7afc245436a5d0d7af600b39cce62e8fcb
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Fix omissions earlier on this branch
    
    Methodical search-and-replace commands for "base" field names like
    "AcctVal" didn't identify "compound" names like "AcctVal_Current".
---
 ledger_text_formats.cpp | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index d9357f76..cddd83d9 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -74,7 +74,7 @@ std::map<std::string,ledger_metadata> const& 
ledger_metadata_map()
         m["InforceLives"               ] = ledger_metadata(4, oe_format_normal 
   , "BOY Lives Inforce"                     ); // "Inforce Lives BOY"
         m["SpecAmt"                    ] = ledger_metadata(0, 
oe_cents_as_dollars , "Specified Amount"                      ); // "Base 
Specified Amount"
         m["TermSpecAmt"                ] = ledger_metadata(0, 
oe_cents_as_dollars , "Term Specified Amount"                 );
-        m["SupplSpecAmt"               ] = ledger_metadata(0, oe_format_normal 
   , "Suppl Specified Amount"                ); // "Supplemental Specified 
Amount"
+        m["SupplSpecAmt"               ] = ledger_metadata(0, 
oe_cents_as_dollars , "Suppl Specified Amount"                ); // 
"Supplemental Specified Amount"
         m["CorridorFactor"             ] = ledger_metadata(0, 
oe_format_percentage, "Corridor Factor"                       );
         m["AnnGAIntRate_Current"       ] = ledger_metadata(2, 
oe_format_percentage, "Curr Ann Gen Acct Int Rate"            ); // "General 
Account Crediting Rate"
         m["AnnSAIntRate_Current"       ] = ledger_metadata(2, 
oe_format_percentage, "Curr Ann Sep Acct Int Rate"            ); // "Separate 
Account Net Rate"
@@ -86,39 +86,39 @@ std::map<std::string,ledger_metadata> const& 
ledger_metadata_map()
         m["ErModalMinimumPremium"      ] = ledger_metadata(0, 
oe_cents_as_dollars , "ER Modal Minimum Premium"              );
         m["NetWD"                      ] = ledger_metadata(0, 
oe_cents_as_dollars , "Withdrawal"                            );
         m["NewCashLoan"                ] = ledger_metadata(0, 
oe_cents_as_dollars , "Annual Loan"                           ); // "New Cash 
Loan"
-        m["TotalLoanBalance_Current"   ] = ledger_metadata(0, oe_format_normal 
   , "Curr Total Loan Balance"               ); // "Current Total Loan Balance"
-        m["TotalLoanBalance_Guaranteed"] = ledger_metadata(0, oe_format_normal 
   , "Guar Total Loan Balance"               ); // "Guaranteed Total Loan 
Balance"
-        m["AcctVal_Current"            ] = ledger_metadata(0, oe_format_normal 
   , "Curr Account Value"                    ); // "Current Account Value"
-        m["AcctVal_Guaranteed"         ] = ledger_metadata(0, oe_format_normal 
   , "Guar Account Value"                    ); // "Guaranteed Account Value"
-        m["CSVNet_Current"             ] = ledger_metadata(0, oe_format_normal 
   , "Curr Net Cash Surr Value"              ); // "Current Cash Surrender 
Value"
-        m["CSVNet_Guaranteed"          ] = ledger_metadata(0, oe_format_normal 
   , "Guar Net Cash Surr Value"              ); // "Guaranteed Cash Surrender 
Value"
-        m["EOYDeathBft_Current"        ] = ledger_metadata(0, oe_format_normal 
   , "Curr EOY Death Benefit"                ); // "Current Death Benefit"
-        m["EOYDeathBft_Guaranteed"     ] = ledger_metadata(0, oe_format_normal 
   , "Guar EOY Death Benefit"                ); // "Guaranteed Death Benefit"
+        m["TotalLoanBalance_Current"   ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Total Loan Balance"               ); // "Current 
Total Loan Balance"
+        m["TotalLoanBalance_Guaranteed"] = ledger_metadata(0, 
oe_cents_as_dollars , "Guar Total Loan Balance"               ); // "Guaranteed 
Total Loan Balance"
+        m["AcctVal_Current"            ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Account Value"                    ); // "Current 
Account Value"
+        m["AcctVal_Guaranteed"         ] = ledger_metadata(0, 
oe_cents_as_dollars , "Guar Account Value"                    ); // "Guaranteed 
Account Value"
+        m["CSVNet_Current"             ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Net Cash Surr Value"              ); // "Current 
Cash Surrender Value"
+        m["CSVNet_Guaranteed"          ] = ledger_metadata(0, 
oe_cents_as_dollars , "Guar Net Cash Surr Value"              ); // "Guaranteed 
Cash Surrender Value"
+        m["EOYDeathBft_Current"        ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr EOY Death Benefit"                ); // "Current 
Death Benefit"
+        m["EOYDeathBft_Guaranteed"     ] = ledger_metadata(0, 
oe_cents_as_dollars , "Guar EOY Death Benefit"                ); // "Guaranteed 
Death Benefit"
         m["BaseDeathBft_Current"       ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Base Death Benefit"               ); // "Current 
Base Death Benefit"
         m["BaseDeathBft_Guaranteed"    ] = ledger_metadata(0, 
oe_cents_as_dollars , "Guar Base Death Benefit"               ); // "Guaranteed 
Base Death Benefit"
-        m["TermPurchased_Current"      ] = ledger_metadata(0, oe_format_normal 
   , "Curr Term Amt Purchased"               ); // "Current Term Purchased"
-        m["TermPurchased_Guaranteed"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Term Amt Purchased"               ); // "Guaranteed Term Purchased"
-        m["SupplDeathBft_Current"      ] = ledger_metadata(0, oe_format_normal 
   , "Curr Suppl Death Benefit"              ); // "Current Supplemental Death 
Benefit"
-        m["SupplDeathBft_Guaranteed"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Suppl Death Benefit"              ); // "Guaranteed Supplemental 
Death Benefit"
-        m["COICharge_Current"          ] = ledger_metadata(0, oe_format_normal 
   , "Curr COI Charge"                       ); // "Current Mortality Charge"
-        m["COICharge_Guaranteed"       ] = ledger_metadata(0, oe_format_normal 
   , "Guar COI Charge"                       ); // "Guaranteed Mortality Charge"
-        m["RiderCharges_Current"       ] = ledger_metadata(0, oe_format_normal 
   , "Curr Rider Charges"                    ); // "Current Rider Charges"
+        m["TermPurchased_Current"      ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Term Amt Purchased"               ); // "Current 
Term Purchased"
+        m["TermPurchased_Guaranteed"   ] = ledger_metadata(0, 
oe_cents_as_dollars , "Guar Term Amt Purchased"               ); // "Guaranteed 
Term Purchased"
+        m["SupplDeathBft_Current"      ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Suppl Death Benefit"              ); // "Current 
Supplemental Death Benefit"
+        m["SupplDeathBft_Guaranteed"   ] = ledger_metadata(0, 
oe_cents_as_dollars , "Guar Suppl Death Benefit"              ); // "Guaranteed 
Supplemental Death Benefit"
+        m["COICharge_Current"          ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr COI Charge"                       ); // "Current 
Mortality Charge"
+        m["COICharge_Guaranteed"       ] = ledger_metadata(0, 
oe_cents_as_dollars , "Guar COI Charge"                       ); // "Guaranteed 
Mortality Charge"
+        m["RiderCharges_Current"       ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Rider Charges"                    ); // "Current 
Rider Charges"
         m["IrrCsv_Current"             ] = ledger_metadata(2, 
oe_format_percentage, "Curr IRR on CSV"                       ); // "Current 
Cash Value IRR"
         m["IrrCsv_Guaranteed"          ] = ledger_metadata(2, 
oe_format_percentage, "Guar IRR on CSV"                       ); // "Guaranteed 
Cash Value IRR"
         m["IrrDb_Current"              ] = ledger_metadata(2, 
oe_format_percentage, "Curr IRR on DB"                        ); // "Current 
Death Benefit IRR"
         m["IrrDb_Guaranteed"           ] = ledger_metadata(2, 
oe_format_percentage, "Guar IRR on DB"                        ); // "Guaranteed 
Death Benefit IRR"
         m["NetClaims_Current"          ] = ledger_metadata(0, oe_format_normal 
   , "Curr Net Claims"                       ); // "Experience Rating Current 
Net Claims"
         m["GrossPmt"                   ] = ledger_metadata(0, 
oe_cents_as_dollars , "Premium Outlay"                        ); // "Total 
Payment"
-        m["LoanIntAccrued_Current"     ] = ledger_metadata(0, oe_format_normal 
   , "Curr Loan Int Accrued"                 ); // "Current Accrued Loan 
Interest"
-        m["NetDeathBenefit"            ] = ledger_metadata(0, oe_format_normal 
   , "Net Death Benefit"                     ); // "Current Net Death Benefit"
+        m["LoanIntAccrued_Current"     ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Loan Int Accrued"                 ); // "Current 
Accrued Loan Interest"
+        m["NetDeathBenefit"            ] = ledger_metadata(0, 
oe_cents_as_dollars , "Net Death Benefit"                     ); // "Current 
Net Death Benefit"
         m["DeathProceedsPaid_Current"  ] = ledger_metadata(0, oe_format_normal 
   , "Curr Death Proceeds Paid"              ); // "Current Death Proceeds Paid"
         m["ClaimsPaid_Current"         ] = ledger_metadata(0, oe_format_normal 
   , "Curr Claims Paid"                      ); // "Current Claims Paid"
         m["AVRelOnDeath_Current"       ] = ledger_metadata(0, oe_format_normal 
   , "Account Value Released on Death"       ); // "Current Account Value 
Released on Death"
-        m["SpecAmtLoad_Current"        ] = ledger_metadata(0, oe_format_normal 
   , "Curr Spec Amt Load"                    ); // "Current Load on Specified 
Amount"
-        m["GrossIntCredited_Current"   ] = ledger_metadata(0, oe_format_normal 
   , "Curr Gross Int Credited"               ); // "Current Interest Credited 
before Separate Account Charges"
-        m["NetIntCredited_Current"     ] = ledger_metadata(0, oe_format_normal 
   , "Curr Net Int Credited"                 ); // "Current Interest Credited 
Net of Separate Account Charges"
-        m["SepAcctCharges_Current"     ] = ledger_metadata(0, oe_format_normal 
   , "Curr Sep Acct Charges"                 ); // "Current Separate Account 
Asset Charges"
-        m["PolicyFee_Current"          ] = ledger_metadata(0, oe_format_normal 
   , "Curr Policy Fee"                       ); // "Current Policy Fee"
+        m["SpecAmtLoad_Current"        ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Spec Amt Load"                    ); // "Current 
Load on Specified Amount"
+        m["GrossIntCredited_Current"   ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Gross Int Credited"               ); // "Current 
Interest Credited before Separate Account Charges"
+        m["NetIntCredited_Current"     ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Net Int Credited"                 ); // "Current 
Interest Credited Net of Separate Account Charges"
+        m["SepAcctCharges_Current"     ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Sep Acct Charges"                 ); // "Current 
Separate Account Asset Charges"
+        m["PolicyFee_Current"          ] = ledger_metadata(0, 
oe_cents_as_dollars , "Curr Policy Fee"                       ); // "Current 
Policy Fee"
         }
 
     return m;