Changes in src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp [f130d4:2f429e]

File:

• src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp (modified) (2 diffs)

src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp

@@ -36 +36 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include <string>
+
 #include "CommandLineUI/Query/CommandLineQuery.hpp"
 #include "CommandLineUI/CommandLineParser.hpp"
@@ -51 +53 @@
 {}
 
+template <typename T>
+std::vector<const element *> getElementsFromInput(const std::vector<std::string> &_input)
+{
+  periodentafel *periode = World::getInstance().getPeriode();
+  std::vector<const element *> result;
+  const element *temp_element;
+  for (typename std::vector<std::string>::const_iterator ZRunner = _input.begin(); ZRunner != _input.end(); ++ZRunner) {
+    const T argument = boost::lexical_cast<T>(*ZRunner);
+    temp_element = periode->FindElement(argument);
+    ASSERT(temp_element != NULL, "Invalid element specified in ElementCommandLineQuery");
+    result.push_back(temp_element);
+  }
+  return result;
+}
+
 bool CommandLineDialog::ElementsCommandLineQuery::handle() {
   // TODO: vector of ints and removing first is not correctly implemented yet. How to remove from a vector?
-  periodentafel *periode = World::getInstance().getPeriode();
-  std::vector<int> AllElements;
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     try {
-      AllElements = CommandLineParser::getInstance().vm[getTitle()].as< vector<int> >();
+      std::vector<std::string> AllArguments;
+      AllArguments = CommandLineParser::getInstance().vm[getTitle()].as< vector<std::string> >();
+      try {
+        temp = getElementsFromInput<int>(AllArguments);
+      } catch(boost::bad_lexical_cast &e) {
+        try {
+        temp = getElementsFromInput<std::string>(AllArguments);
+        } catch(boost::bad_lexical_cast &e) {
+          return false;
+        }
+      }
     } catch(boost::bad_any_cast &e) {
-      AllElements.clear();
       return false;
     }
-    const element *temp_element;
-    for (vector<int>::iterator ZRunner = AllElements.begin(); ZRunner != AllElements.end(); ++ZRunner) {
-      temp_element = periode->FindElement(*ZRunner);
-      ASSERT(temp_element != NULL, "Invalid element specified in ElementCommandLineQuery");
-      temp.push_back(temp_element);
-    }
-    return true;
+    if (temp.empty())
+      return false;
+    else
+      return true;
   }
   return false;