[lmi-commits] [5597] Accommodate deficient admin-system extracts more selectively

[Greg Chicares]

Revision: 5597
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5597
Author:   chicares
Date:     2012-11-14 13:31:21 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Accommodate deficient admin-system extracts more selectively

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/input_xml_io.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-11-13 13:57:50 UTC (rev 5596)
+++ lmi/trunk/ChangeLog 2012-11-14 13:31:21 UTC (rev 5597)
@@ -30913,3 +30913,21 @@
   ihs_basicval.cpp
 Refactor for simplicity.
 
+20121113T1240Z <address@hidden> [556]
+
+  multiple_cell_document.rnc
+  multiple_cell_document.xsd
+  single_cell_document.rnc
+  single_cell_document.xsd
+Improve documentation, noting desired file extensions for xml input.
+
+20121113T1357Z <address@hidden> [556]
+
+  test_schemata.sh
+Report scripted actions more verbosely.
+
+20121114T1331Z <address@hidden> [556]
+
+  input_xml_io.cpp
+Accommodate deficient admin-system extracts more selectively.
+

Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp  2012-11-13 13:57:50 UTC (rev 5596)
+++ lmi/trunk/input_xml_io.cpp  2012-11-14 13:31:21 UTC (rev 5597)
@@ -510,12 +510,17 @@
         InforceCumulativeNoLapsePayments = map_lookup(detritus_map, 
"InforceCumulativePayments");
         Internal1035ExchangeTaxBasis     = map_lookup(detritus_map, 
"Internal1035ExchangeBasis");
         MasterContractNumber             = map_lookup(detritus_map, 
"Franchise");
-        // Version 0 lacked 'PremiumHistory', as do "deficient" extracts.
-        if(0 < file_version && !deficient_extract)
+        // Some (but not all) variants of version 0 lacked
+        // 'PremiumHistory'; all later versions should include it.
+        if(!contains(detritus_map, "PremiumHistory"))
             {
+            LMI_ASSERT(0 == file_version);
+            }
+        else
+            {
             Inforce7702AAmountsPaidHistory  = map_lookup(detritus_map, 
"PremiumHistory");
             }
-        // "Deficient" extracts also lack 'SolveBasis'.
+        // "Deficient" extracts lack 'SolveBasis'.
         if(!deficient_extract)
             {
             SolveExpenseGeneralAccountBasis = map_lookup(detritus_map, 
"SolveBasis");