[lmi-commits] [5677] Diagnose the defect noted 20130414T1341Z

[Greg Chicares]

Revision: 5677
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5677
Author:   chicares
Date:     2013-04-14 15:06:19 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
Diagnose the defect noted 20130414T1341Z

Modified Paths:
--------------
    lmi/trunk/Makefile.am
    lmi/trunk/configurable_settings.cpp
    lmi/trunk/objects.make

Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am       2013-04-14 14:00:43 UTC (rev 5676)
+++ lmi/trunk/Makefile.am       2013-04-14 15:06:19 UTC (rev 5677)
@@ -541,7 +541,11 @@
   configurable_settings.cpp \
   configurable_settings_test.cpp \
   data_directory.cpp \
+  datum_base.cpp \
+  facets.cpp \
   global_settings.cpp \
+  mc_enum.cpp \
+  mc_enum_types.cpp \
   miscellany.cpp \
   path_utility.cpp \
   xml_lmi.cpp

Modified: lmi/trunk/configurable_settings.cpp
===================================================================
--- lmi/trunk/configurable_settings.cpp 2013-04-14 14:00:43 UTC (rev 5676)
+++ lmi/trunk/configurable_settings.cpp 2013-04-14 15:06:19 UTC (rev 5677)
@@ -33,6 +33,8 @@
 #include "contains.hpp"
 #include "data_directory.hpp"           // AddDataDir()
 #include "handle_exceptions.hpp"
+#include "mc_enum.hpp"                  // all_strings<>()
+#include "mc_enum_type_enums.hpp"       // mcenum_report_column
 #include "miscellany.hpp"               // lmi_array_size()
 #include "path_utility.hpp"             // validate_directory(), 
validate_filepath()
 #include "platform_dependent.hpp"       // access()
@@ -41,7 +43,6 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 
-#include <algorithm>                    // std::copy()
 #include <iterator>
 #include <sstream>
 #include <stdexcept>
@@ -425,12 +426,26 @@
         ? default_calculation_summary_columns()
         : z.calculation_summary_columns()
         );
+    std::vector<std::string> const& allowable = 
all_strings<mcenum_report_column>();
     std::vector<std::string> columns;
-    std::copy
-        (std::istream_iterator<std::string>(iss)
-        ,std::istream_iterator<std::string>()
-        ,std::back_inserter(columns)
-        );
+    std::istream_iterator<std::string> i(iss);
+    std::istream_iterator<std::string> const eos;
+    for(; i != eos; ++i)
+        {
+        if(contains(allowable, *i))
+            {
+            columns.push_back(*i);
+            }
+        else
+            {
+            warning()
+                << "Disregarding unrecognized calculation-summary column '"
+                << *i
+                << "'. Use 'Preferences' to remove it permanently."
+                << std::flush
+                ;
+            }
+        }
     return columns;
 }
 

Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make      2013-04-14 14:00:43 UTC (rev 5676)
+++ lmi/trunk/objects.make      2013-04-14 15:06:19 UTC (rev 5677)
@@ -599,7 +599,11 @@
   configurable_settings.o \
   configurable_settings_test.o \
   data_directory.o \
+  datum_base.o \
+  facets.o \
   global_settings.o \
+  mc_enum.o \
+  mc_enum_types.o \
   miscellany.o \
   path_utility.o \
   xml_lmi.o \