[lmi-commits] [5276] Move certain database entities

[Greg Chicares]

Revision: 5276
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5276
Author:   chicares
Date:     2011-09-12 17:29:14 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
Move certain database entities

Modified Paths:
--------------
    lmi/trunk/dbdict.cpp
    lmi/trunk/dbdict.hpp
    lmi/trunk/dbnames.hpp
    lmi/trunk/dbnames.xpp

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2011-08-25 17:01:46 UTC (rev 5275)
+++ lmi/trunk/dbdict.cpp        2011-09-12 17:29:14 UTC (rev 5276)
@@ -180,6 +180,8 @@
     ascribe("GenAcctIntBonus"     , &DBDictionary::GenAcctIntBonus     );
     ascribe("BonusInt"            , &DBDictionary::BonusInt            );
     ascribe("IntFloor"            , &DBDictionary::IntFloor            );
+    ascribe("AllowGenAcct"        , &DBDictionary::AllowGenAcct        );
+    ascribe("AllowSepAcct"        , &DBDictionary::AllowSepAcct        );
     ascribe("MaxGenAcctRate"      , &DBDictionary::MaxGenAcctRate      );
     ascribe("MaxSepAcctRate"      , &DBDictionary::MaxSepAcctRate      );
     ascribe("SepAcctSpreadMethod" , &DBDictionary::SepAcctSpreadMethod );
@@ -329,8 +331,6 @@
     ascribe("NoLapseDbo1Only"     , &DBDictionary::NoLapseDbo1Only     );
     ascribe("NoLapseAlwaysActive" , &DBDictionary::NoLapseAlwaysActive );
     ascribe("AllowHoneymoon"      , &DBDictionary::AllowHoneymoon      );
-    ascribe("AllowGenAcct"        , &DBDictionary::AllowGenAcct        );
-    ascribe("AllowSepAcct"        , &DBDictionary::AllowSepAcct        );
     ascribe("DeductionMethod"     , &DBDictionary::DeductionMethod     );
     ascribe("DeductionAcct"       , &DBDictionary::DeductionAcct       );
     ascribe("DistributionMethod"  , &DBDictionary::DistributionMethod  );

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2011-08-25 17:01:46 UTC (rev 5275)
+++ lmi/trunk/dbdict.hpp        2011-09-12 17:29:14 UTC (rev 5276)
@@ -154,6 +154,8 @@
     database_entity GenAcctIntBonus     ;
     database_entity BonusInt            ;
     database_entity IntFloor            ;
+    database_entity AllowGenAcct        ;
+    database_entity AllowSepAcct        ;
     database_entity MaxGenAcctRate      ;
     database_entity MaxSepAcctRate      ;
     database_entity SepAcctSpreadMethod ;
@@ -303,8 +305,6 @@
     database_entity NoLapseDbo1Only     ;
     database_entity NoLapseAlwaysActive ;
     database_entity AllowHoneymoon      ;
-    database_entity AllowGenAcct        ;
-    database_entity AllowSepAcct        ;
     database_entity DeductionMethod     ;
     database_entity DeductionAcct       ;
     database_entity DistributionMethod  ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2011-08-25 17:01:46 UTC (rev 5275)
+++ lmi/trunk/dbnames.hpp       2011-09-12 17:29:14 UTC (rev 5276)
@@ -192,6 +192,8 @@
         ,DB_GenAcctIntBonus
         ,DB_BonusInt
         ,DB_IntFloor
+        ,DB_AllowGenAcct
+        ,DB_AllowSepAcct
         ,DB_MaxGenAcctRate
         ,DB_MaxSepAcctRate
 
@@ -404,8 +406,6 @@
 
     ,DB_Topic_Allocations
 
-        ,DB_AllowGenAcct
-        ,DB_AllowSepAcct
         ,DB_DeductionMethod
         ,DB_DeductionAcct
         ,DB_DistributionMethod

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2011-08-25 17:01:46 UTC (rev 5275)
+++ lmi/trunk/dbnames.xpp       2011-09-12 17:29:14 UTC (rev 5276)
@@ -92,6 +92,8 @@
 {DB_GenAcctIntBonus,DB_Topic_Interest,"GenAcctIntBonus","Interest bonus added 
to the general account rate",}, \
 {DB_BonusInt,DB_Topic_Interest,"BonusInt","Bonus interest [not yet 
implemented]",}, \
 {DB_IntFloor,DB_Topic_Interest,"IntFloor","[not used]",}, \
+{DB_AllowGenAcct,DB_Topic_Interest,"AllowGenAcct","Allow investment in general 
account",}, \
+{DB_AllowSepAcct,DB_Topic_Interest,"AllowSepAcct","Allow investment in 
separate account",}, \
 {DB_MaxGenAcctRate,DB_Topic_Interest,"MaxGenAcctRate","Maximum general account 
interest rate",}, \
 {DB_MaxSepAcctRate,DB_Topic_Interest,"MaxSepAcctRate","Maximum separate 
account interest rate",}, \
 
{DB_SepAcctSpreadMethod,DB_Topic_Interest,"SepAcctSpreadMethod","Separate-account
 spread and fee subtraction: 0=annual (effective), 1=daily (nominal)",}, \
@@ -252,8 +254,6 @@
 
{DB_NoLapseAlwaysActive,DB_Topic_SecondaryGuarantees,"NoLapseAlwaysActive","No-lapse
 guarantee requirements are always met by contract or issue rules: 0=no, 
1=yes",}, \
 {DB_AllowHoneymoon,DB_Topic_SecondaryGuarantees,"AllowHoneymoon","Honeymoon 
allowed: 0=no, 1=yes",}, \
 {DB_Topic_Allocations,DB_FIRST,"Allocations","Allocations between general and 
separate account",}, \
-{DB_AllowGenAcct,DB_Topic_Allocations,"AllowGenAcct","Allow investment in 
general account",}, \
-{DB_AllowSepAcct,DB_Topic_Allocations,"AllowSepAcct","Allow investment in 
separate account",}, \
 {DB_DeductionMethod,DB_Topic_Allocations,"DeductionMethod","Apportionment of 
deductions between general and separate accounts: 0=in proportion to assets, 
1=debit 'preferred' account first",}, \
 {DB_DeductionAcct,DB_Topic_Allocations,"DeductionAcct","Preferred account for 
non-proportional deductions: 0=general account, 1=separate account",}, \
 
{DB_DistributionMethod,DB_Topic_Allocations,"DistributionMethod","Apportionment 
of distributions between general and separate accounts: 0=in proportion to 
assets, 1=debit 'preferred' account first",}, \