Changes in src/UIElements/CommandLineUI/CommandLineParser_validate.cpp [94d5ac6:33e801]

File:

• src/UIElements/CommandLineUI/CommandLineParser_validate.cpp (modified) (3 diffs)

src/UIElements/CommandLineUI/CommandLineParser_validate.cpp

@@ -42 +42 @@
 #include "Actions/Values.hpp"
 #include "CommandLineParser_validate.hpp"
+#include "Parameters/Specifics/KeyValuePair.hpp"
 
 /** boost::program_options validator specialization for VectorValue.
@@ -157 +158 @@
 void validate(boost::any& v, const std::vector<std::string>& values, boost::filesystem::path *, int)
 {
-  boost::filesystem::path filename;
-
-  std::cerr << "boost::filesystem::path validator used." << std::endl;
+//  std::cerr << "boost::filesystem::path validator used." << std::endl;
+
+  // Make sure no previous assignment to 'a' was made.
+  boost::program_options::validators::check_first_occurrence(v);
+  // Extract the first string from 'values'. If there is more than
+  // one string, it's an error, and exception will be thrown.
+  const std::string& s = boost::program_options::validators::get_single_string(values);
+
+  v = boost::any(boost::filesystem::path(s));
+}
+
+/** boost::program_options validator specialization for boost::filesystem::path.
+ * \param &v  reference for return value
+ * \param &values string vector of scanned options
+ * \param *
+ * \param
+ *
+ */
+void validate(boost::any& v, const std::vector<std::string>& values, KeyValuePair *, int)
+{
+//  std::cerr << "KeyValuePair validator used." << std::endl;
+
+  // Make sure no previous assignment to 'a' was made.
+  boost::program_options::validators::check_first_occurrence(v);
+  // Extract the first string from 'values'. If there is more than
+  // one string, it's an error, and exception will be thrown.
+  const std::string& s = boost::program_options::validators::get_single_string(values);
+
+  if (s.find("=") == std::string::npos) {
+#if BOOST_VERSION < 104200
+    throw boost::program_options::validation_error("Invalid KeyValue given");
+#else
+throw boost::program_options::validation_error(
+    boost::program_options::validation_error::invalid_option_value,
+    std::string("value"),
+    std::string("vector<KeyValuePair>")
+    );
+#endif
+  }
+  v = boost::any(KeyValuePair(s));
+}
+
+/** boost::program_options validator specialization for boost::filesystem::path.
+ * \param &v  reference for return value
+ * \param &values string vector of scanned options
+ * \param *
+ * \param
+ *
+ */
+void validate(boost::any& v, const std::vector<std::string>& values, std::vector<KeyValuePair> *, int)
+{
+//  std::cerr << "vector<KeyValuePair> validator used." << std::endl;
 
   // split comma-separated values
-  if (values.size() != 1) {
-    std::cerr <<  "Not one file but " << values.size() << " given " << std::endl;
+  if (values.size() > 1) {
 #if BOOST_VERSION < 104200
     throw boost::program_options::validation_error("Unequal to one file given");
@@ -171 +220 @@
           boost::program_options::validation_error::at_least_one_value_required,
           std::string("value"),
-          std::string("boost::filesystem::path")
-      );
-    } else {
-      throw boost::program_options::validation_error(
-          boost::program_options::validation_error::multiple_values_not_allowed,
-          std::string("value"),
-          std::string("boost::filesystem::path")
+          std::string("vector<KeyValuePair>")
       );
     }
 #endif
-  }
-  filename = values.at(0);
-  v = boost::any(boost::filesystem::path(filename));
-}
-
+    for (std::vector<std::string>::const_iterator iter = values.begin();
+        iter != values.end();++iter)
+      if ((*iter).find("=") == std::string::npos) {
+#if BOOST_VERSION < 104200
+    throw boost::program_options::validation_error("Invalid KeyValue given");
+#else
+    throw boost::program_options::validation_error(
+        boost::program_options::validation_error::invalid_option_value,
+        std::string("value"),
+        std::string("vector<KeyValuePair>")
+    );
+#endif
+      }
+  }
+  std::vector<KeyValuePair> temp;
+  for (std::vector<std::string>::const_iterator iter = values.begin();
+      iter != values.end();++iter)
+    temp.push_back(KeyValuePair(*iter));
+  v = boost::any(temp);
+}