[lmi-commits] [6465] Resolve a marked defect: replace 'DBOptInitInteger' with 'InitDBOpt'

[Greg Chicares]

Revision: 6465
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6465
Author:   chicares
Date:     2016-01-07 19:31:29 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Resolve a marked defect: replace 'DBOptInitInteger' with 'InitDBOpt'

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/illustration_reg.xsl
    lmi/trunk/ledger_xml_io.cpp
    lmi/trunk/nasd.xsl
    lmi/trunk/reg_d_group.xsl
    lmi/trunk/reg_d_individual.xsl

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2016-01-07 19:19:21 UTC (rev 6464)
+++ lmi/trunk/ChangeLog 2016-01-07 19:31:29 UTC (rev 6465)
@@ -38399,3 +38399,20 @@
 Refine configuration. See:
   http://lists.nongnu.org/archive/html/lmi/2016-01/msg00002.html
 
+20160107T1919Z <address@hidden> [456]
+
+  ledger_invariant.cpp
+  ledger_invariant.hpp
+  product_data.cpp
+  product_data.hpp
+Provide 'InitDBOpt'.
+
+20160107T1931Z <address@hidden> [455]
+
+  illustration_reg.xsl
+  ledger_xml_io.cpp
+  nasd.xsl
+  reg_d_group.xsl
+  reg_d_individual.xsl
+Resolve a marked defect: replace 'DBOptInitInteger' with 'InitDBOpt'.
+

Modified: lmi/trunk/illustration_reg.xsl
===================================================================
--- lmi/trunk/illustration_reg.xsl      2016-01-07 19:19:21 UTC (rev 6464)
+++ lmi/trunk/illustration_reg.xsl      2016-01-07 19:31:29 UTC (rev 6465)
@@ -721,6 +721,10 @@
               in effect on the date of death, prior to adjustments
               for policy debt and monthly charges payable to the date of death.
             </fo:block>
+<!--
+Presumably the description of death benefit options should be moved into
+'ProductDescription' (as has already been done in other '.xsl' files).
+-->
             <fo:block padding-top="1em">
               <fo:inline font-weight="bold">
                 Death Benefit Option 1:
@@ -1239,7 +1243,7 @@
               <xsl:if test="not($is_composite)">
                 <fo:block>
                   Initial Death Benefit Option:
-                  <xsl:value-of select="$scalars/DBOptInitInteger+1"/>
+                  <xsl:value-of select="$scalars/InitDBOpt"/>
                 </fo:block>
               </xsl:if>
               <xsl:call-template 
name="print-mastercontractnumber-and-contractnumber"/>

Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2016-01-07 19:19:21 UTC (rev 6464)
+++ lmi/trunk/ledger_xml_io.cpp 2016-01-07 19:31:29 UTC (rev 6465)
@@ -372,7 +372,6 @@
     format_map["AvgFund"                           ] = f1;
     format_map["ChildRiderAmount"                  ] = f1;
     format_map["CustomFund"                        ] = f1;
-    format_map["DBOptInitInteger"                  ] = f1;
     format_map["Dumpin"                            ] = f1;
     format_map["EndtAge"                           ] = f1;
     format_map["External1035Amount"                ] = f1;
@@ -701,13 +700,6 @@
     std::string ScaleUnit = ledger_invariant_->ScaleUnit();
     strings["ScaleUnit"] = &ScaleUnit;
 
-    // TODO ?? Presumably this is translated to a string in xsl;
-    // why not use the first element of <DbOpt>, which is already
-    // so formatted? Wouldn't that rule out any possibility of
-    // inconsistency between xsl's and the program's translations?
-    double DBOptInitInteger = ledger_invariant_->DBOpt[0].value();
-    scalars["DBOptInitInteger"] = &DBOptInitInteger;
-
     double InitTotalSA =
             ledger_invariant_->InitBaseSpecAmt
         +   ledger_invariant_->InitTermSpecAmt

Modified: lmi/trunk/nasd.xsl
===================================================================
--- lmi/trunk/nasd.xsl  2016-01-07 19:19:21 UTC (rev 6464)
+++ lmi/trunk/nasd.xsl  2016-01-07 19:31:29 UTC (rev 6465)
@@ -805,7 +805,7 @@
                   </xsl:choose>
                   <xsl:value-of select="$scalars/UWClass"/>,
                   Initial Death Benefit Option:
-                  <xsl:value-of select="$scalars/DBOptInitInteger+1"/>
+                  <xsl:value-of select="$scalars/InitDBOpt"/>
                 </fo:block>
               </xsl:if>
               <xsl:if test="not($is_composite) and $scalars/UWClass='Rated'">

Modified: lmi/trunk/reg_d_group.xsl
===================================================================
--- lmi/trunk/reg_d_group.xsl   2016-01-07 19:19:21 UTC (rev 6464)
+++ lmi/trunk/reg_d_group.xsl   2016-01-07 19:31:29 UTC (rev 6465)
@@ -248,7 +248,7 @@
             </fo:block>
             <fo:block padding-top="1em">
               This illustration assumes Initial Death Benefit Option
-              <xsl:value-of select="$scalars/DBOptInitInteger+1"/>.
+              <xsl:value-of select="$scalars/InitDBOpt"/>.
             </fo:block>
             <fo:block padding-top="1em">
               This policy is only available to entities that meet the 
definition
@@ -583,7 +583,7 @@
                   </xsl:choose>
                   <xsl:value-of select="$scalars/UWClass"/>,
                   Initial Death Benefit Option:
-                  <xsl:value-of select="$scalars/DBOptInitInteger+1"/>
+                  <xsl:value-of select="$scalars/InitDBOpt"/>
                 </fo:block>
               </xsl:if>
               <xsl:if test="$scalars/HasWP='1'">

Modified: lmi/trunk/reg_d_individual.xsl
===================================================================
--- lmi/trunk/reg_d_individual.xsl      2016-01-07 19:19:21 UTC (rev 6464)
+++ lmi/trunk/reg_d_individual.xsl      2016-01-07 19:31:29 UTC (rev 6465)
@@ -664,7 +664,7 @@
               </fo:block>
               <fo:block>
                 Initial Death Benefit Option:
-                <xsl:value-of select="$scalars/DBOptInitInteger+1"/>
+                <xsl:value-of select="$scalars/InitDBOpt"/>
               </fo:block>
             </fo:block>
           </fo:table-cell>