[lmi-commits] [5496] Rename certain variables

[Greg Chicares]

Revision: 5496
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5496
Author:   chicares
Date:     2012-06-12 22:02:21 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
Rename certain variables

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/fo_common.xsl
    lmi/trunk/ledger_invariant.cpp
    lmi/trunk/ledger_invariant.hpp
    lmi/trunk/product_data.cpp
    lmi/trunk/product_data.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-06-12 17:40:14 UTC (rev 5495)
+++ lmi/trunk/ChangeLog 2012-06-12 22:02:21 UTC (rev 5496)
@@ -30284,3 +30284,12 @@
   dbnames.xpp
 Add a field for minimum VLR rate.
 
+20120612T2202Z <address@hidden> [578]
+
+  fo_common.xsl
+  ledger_invariant.cpp
+  ledger_invariant.hpp
+  product_data.cpp
+  product_data.hpp
+Rename certain variables.
+

Modified: lmi/trunk/fo_common.xsl
===================================================================
--- lmi/trunk/fo_common.xsl     2012-06-12 17:40:14 UTC (rev 5495)
+++ lmi/trunk/fo_common.xsl     2012-06-12 22:02:21 UTC (rev 5496)
@@ -165,18 +165,18 @@
     <xsl:choose>
       <xsl:when test="$scalars/IsInforce!='1'">
         <xsl:if test="$scalars/Composite='1'">
-          <xsl:value-of select="$scalars/CompositeTrackingNumber"/>
+          <xsl:value-of select="$scalars/ImprimaturPresaleComposite"/>
         </xsl:if>
         <xsl:if test="$scalars/Composite!='1'">
-          <xsl:value-of select="$scalars/PresaleTrackingNumber"/>
+          <xsl:value-of select="$scalars/ImprimaturPresale"/>
         </xsl:if>
       </xsl:when>
       <xsl:otherwise>
         <xsl:if test="$scalars/Composite='1'">
-          <xsl:value-of select="$scalars/InforceCompositeTrackingNumber"/>
+          <xsl:value-of select="$scalars/ImprimaturInforceComposite"/>
         </xsl:if>
         <xsl:if test="$scalars/Composite!='1'">
-          <xsl:value-of select="$scalars/InforceTrackingNumber"/>
+          <xsl:value-of select="$scalars/ImprimaturInforce"/>
         </xsl:if>
       </xsl:otherwise>
     </xsl:choose>

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2012-06-12 17:40:14 UTC (rev 5495)
+++ lmi/trunk/ledger_invariant.cpp      2012-06-12 22:02:21 UTC (rev 5496)
@@ -253,10 +253,10 @@
     Strings         ["IrrCsvFootnote"                ] = &IrrCsvFootnote       
          ;
     Strings         ["MortalityChargesFootnote"      ] = 
&MortalityChargesFootnote       ;
     Strings         ["LoanAndWithdrawalFootnote"     ] = 
&LoanAndWithdrawalFootnote      ;
-    Strings         ["PresaleTrackingNumber"         ] = 
&PresaleTrackingNumber          ;
-    Strings         ["CompositeTrackingNumber"       ] = 
&CompositeTrackingNumber        ;
-    Strings         ["InforceTrackingNumber"         ] = 
&InforceTrackingNumber          ;
-    Strings         ["InforceCompositeTrackingNumber"] = 
&InforceCompositeTrackingNumber ;
+    Strings         ["ImprimaturPresale"             ] = &ImprimaturPresale    
          ;
+    Strings         ["ImprimaturPresaleComposite"    ] = 
&ImprimaturPresaleComposite     ;
+    Strings         ["ImprimaturInforce"             ] = &ImprimaturInforce    
          ;
+    Strings         ["ImprimaturInforceComposite"    ] = 
&ImprimaturInforceComposite     ;
     Strings         ["InforceNonGuaranteedFootnote0" ] = 
&InforceNonGuaranteedFootnote0  ;
     Strings         ["InforceNonGuaranteedFootnote1" ] = 
&InforceNonGuaranteedFootnote1  ;
     Strings         ["InforceNonGuaranteedFootnote2" ] = 
&InforceNonGuaranteedFootnote2  ;
@@ -654,10 +654,10 @@
         IrrCsvFootnote                 = p.datum("IrrCsvFootnote"              
   );
         MortalityChargesFootnote       = p.datum("MortalityChargesFootnote"    
   );
         LoanAndWithdrawalFootnote      = p.datum("LoanAndWithdrawalFootnote"   
   );
-        PresaleTrackingNumber          = p.datum("PresaleTrackingNumber"       
   );
-        CompositeTrackingNumber        = p.datum("CompositeTrackingNumber"     
   );
-        InforceTrackingNumber          = p.datum("InforceTrackingNumber"       
   );
-        InforceCompositeTrackingNumber = 
p.datum("InforceCompositeTrackingNumber" );
+        ImprimaturPresale              = p.datum("ImprimaturPresale"           
   );
+        ImprimaturPresaleComposite     = p.datum("ImprimaturPresaleComposite"  
   );
+        ImprimaturInforce              = p.datum("ImprimaturInforce"           
   );
+        ImprimaturInforceComposite     = p.datum("ImprimaturInforceComposite"  
   );
         InforceNonGuaranteedFootnote0  = 
p.datum("InforceNonGuaranteedFootnote0"  );
         InforceNonGuaranteedFootnote1  = 
p.datum("InforceNonGuaranteedFootnote1"  );
         InforceNonGuaranteedFootnote2  = 
p.datum("InforceNonGuaranteedFootnote2"  );
@@ -920,10 +920,10 @@
     IrrCsvFootnote                 = a_Addend.IrrCsvFootnote;
     MortalityChargesFootnote       = a_Addend.MortalityChargesFootnote;
     LoanAndWithdrawalFootnote      = a_Addend.LoanAndWithdrawalFootnote;
-    PresaleTrackingNumber          = a_Addend.PresaleTrackingNumber;
-    CompositeTrackingNumber        = a_Addend.CompositeTrackingNumber;
-    InforceTrackingNumber          = a_Addend.InforceTrackingNumber;
-    InforceCompositeTrackingNumber = a_Addend.InforceCompositeTrackingNumber;
+    ImprimaturPresale              = a_Addend.ImprimaturPresale;
+    ImprimaturPresaleComposite     = a_Addend.ImprimaturPresaleComposite;
+    ImprimaturInforce              = a_Addend.ImprimaturInforce;
+    ImprimaturInforceComposite     = a_Addend.ImprimaturInforceComposite;
     InforceNonGuaranteedFootnote0  = a_Addend.InforceNonGuaranteedFootnote0;
     InforceNonGuaranteedFootnote1  = a_Addend.InforceNonGuaranteedFootnote1;
     InforceNonGuaranteedFootnote2  = a_Addend.InforceNonGuaranteedFootnote2;

Modified: lmi/trunk/ledger_invariant.hpp
===================================================================
--- lmi/trunk/ledger_invariant.hpp      2012-06-12 17:40:14 UTC (rev 5495)
+++ lmi/trunk/ledger_invariant.hpp      2012-06-12 22:02:21 UTC (rev 5496)
@@ -269,10 +269,10 @@
     std::string     IrrCsvFootnote;
     std::string     MortalityChargesFootnote;
     std::string     LoanAndWithdrawalFootnote;
-    std::string     PresaleTrackingNumber;
-    std::string     CompositeTrackingNumber;
-    std::string     InforceTrackingNumber;
-    std::string     InforceCompositeTrackingNumber;
+    std::string     ImprimaturPresale;
+    std::string     ImprimaturPresaleComposite;
+    std::string     ImprimaturInforce;
+    std::string     ImprimaturInforceComposite;
     std::string     InforceNonGuaranteedFootnote0;
     std::string     InforceNonGuaranteedFootnote1;
     std::string     InforceNonGuaranteedFootnote2;

Modified: lmi/trunk/product_data.cpp
===================================================================
--- lmi/trunk/product_data.cpp  2012-06-12 17:40:14 UTC (rev 5495)
+++ lmi/trunk/product_data.cpp  2012-06-12 22:02:21 UTC (rev 5496)
@@ -267,10 +267,10 @@
     ascribe("IrrCsvFootnote"                , &product_data::IrrCsvFootnote    
            );
     ascribe("MortalityChargesFootnote"      , 
&product_data::MortalityChargesFootnote      );
     ascribe("LoanAndWithdrawalFootnote"     , 
&product_data::LoanAndWithdrawalFootnote     );
-    ascribe("PresaleTrackingNumber"         , 
&product_data::PresaleTrackingNumber         );
-    ascribe("CompositeTrackingNumber"       , 
&product_data::CompositeTrackingNumber       );
-    ascribe("InforceTrackingNumber"         , 
&product_data::InforceTrackingNumber         );
-    ascribe("InforceCompositeTrackingNumber", 
&product_data::InforceCompositeTrackingNumber);
+    ascribe("ImprimaturPresale"             , &product_data::ImprimaturPresale 
            );
+    ascribe("ImprimaturPresaleComposite"    , 
&product_data::ImprimaturPresaleComposite    );
+    ascribe("ImprimaturInforce"             , &product_data::ImprimaturInforce 
            );
+    ascribe("ImprimaturInforceComposite"    , 
&product_data::ImprimaturInforceComposite    );
     ascribe("InforceNonGuaranteedFootnote0" , 
&product_data::InforceNonGuaranteedFootnote0 );
     ascribe("InforceNonGuaranteedFootnote1" , 
&product_data::InforceNonGuaranteedFootnote1 );
     ascribe("InforceNonGuaranteedFootnote2" , 
&product_data::InforceNonGuaranteedFootnote2 );

Modified: lmi/trunk/product_data.hpp
===================================================================
--- lmi/trunk/product_data.hpp  2012-06-12 17:40:14 UTC (rev 5495)
+++ lmi/trunk/product_data.hpp  2012-06-12 22:02:21 UTC (rev 5496)
@@ -226,10 +226,10 @@
     glossed_string IrrCsvFootnote;
     glossed_string MortalityChargesFootnote;
     glossed_string LoanAndWithdrawalFootnote;
-    glossed_string PresaleTrackingNumber;
-    glossed_string CompositeTrackingNumber;
-    glossed_string InforceTrackingNumber;
-    glossed_string InforceCompositeTrackingNumber;
+    glossed_string ImprimaturPresale;
+    glossed_string ImprimaturPresaleComposite;
+    glossed_string ImprimaturInforce;
+    glossed_string ImprimaturInforceComposite;
     glossed_string InforceNonGuaranteedFootnote0;
     glossed_string InforceNonGuaranteedFootnote1;
     glossed_string InforceNonGuaranteedFootnote2;