[lmi-commits] [5575] Refactor for simplicity

[Greg Chicares]

Revision: 5575
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5575
Author:   chicares
Date:     2012-10-04 19:02:29 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
Refactor for simplicity

Modified Paths:
--------------
    lmi/trunk/mec_server.cpp
    lmi/trunk/mec_xml_document.cpp
    lmi/trunk/mec_xml_document.hpp

Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp    2012-10-04 12:15:38 UTC (rev 5574)
+++ lmi/trunk/mec_server.cpp    2012-10-04 19:02:29 UTC (rev 5575)
@@ -41,16 +41,16 @@
 #include "ihs_irc7702a.hpp"
 #include "materially_equal.hpp"
 #include "math_functors.hpp"
-#include "mc_enum_types_aux.hpp"     // mc_state_from_string()
+#include "mc_enum_types_aux.hpp"        // mc_state_from_string()
 #include "mec_input.hpp"
 #include "mec_xml_document.hpp"
-#include "miscellany.hpp"            // ios_out_trunc_binary()
+#include "miscellany.hpp"               // ios_out_trunc_binary()
 #include "oecumenic_enumerations.hpp"
-#include "path_utility.hpp"          // fs::path inserter
-#include "premium_tax.hpp"           // lowest_premium_tax_load()
+#include "path_utility.hpp"             // fs::path inserter
+#include "premium_tax.hpp"              // lowest_premium_tax_load()
 #include "product_data.hpp"
 #include "round_to.hpp"
-#include "stratified_algorithms.hpp" // TieredGrossToNet()
+#include "stratified_algorithms.hpp"    // TieredGrossToNet()
 #include "stratified_charges.hpp"
 #include "timer.hpp"
 #include "value_cast.hpp"
@@ -58,7 +58,7 @@
 #include <boost/filesystem/convenience.hpp>
 #include <boost/filesystem/fstream.hpp>
 
-#include <algorithm>                 // std::min()
+#include <algorithm>                    // std::min()
 #include <iostream>
 #include <limits>
 #include <string>
@@ -514,18 +514,7 @@
     if(".mec" == extension)
         {
         Timer timer;
-        fs::ifstream ifs(file_path);
-        if(!ifs)
-            {
-            fatal_error()
-                << "Unable to read file '"
-                << file_path
-                << "'."
-                << LMI_FLUSH
-                ;
-            }
-        mec_xml_document doc;
-        doc.read(ifs);
+        mec_xml_document doc(file_path.string());
         seconds_for_input_ = timer.stop().elapsed_seconds();
         return operator()(file_path, doc.input_data());
         }

Modified: lmi/trunk/mec_xml_document.cpp
===================================================================
--- lmi/trunk/mec_xml_document.cpp      2012-10-04 12:15:38 UTC (rev 5574)
+++ lmi/trunk/mec_xml_document.cpp      2012-10-04 19:02:29 UTC (rev 5575)
@@ -49,6 +49,14 @@
 }
 
 //============================================================================
+mec_xml_document::mec_xml_document(std::string const& filename)
+    :input_data_()
+{
+    xml_lmi::dom_parser parser(filename);
+    parse(parser.root_node(xml_root_name()));
+}
+
+//============================================================================
 mec_xml_document::~mec_xml_document()
 {
 }

Modified: lmi/trunk/mec_xml_document.hpp
===================================================================
--- lmi/trunk/mec_xml_document.hpp      2012-10-04 12:15:38 UTC (rev 5574)
+++ lmi/trunk/mec_xml_document.hpp      2012-10-04 19:02:29 UTC (rev 5575)
@@ -45,6 +45,7 @@
   public:
     mec_xml_document();
     mec_xml_document(mec_input const&);
+    mec_xml_document(std::string const& filename);
     ~mec_xml_document();
 
     mec_input const& input_data() const;