Changes in src/Parameters/Specifics/Value_elements.cpp [80f678:2f429e]

File:

• src/Parameters/Specifics/Value_elements.cpp (modified) (1 diff)

src/Parameters/Specifics/Value_elements.cpp

@@ -57 +57 @@
   for(tokenizer::iterator beg=tok.begin();
       beg != tok.end();++beg) {
-    const int tempvalue = boost::lexical_cast<atomicNumber_t>(*beg);
-    const element * _element =
-        World::getInstance().getPeriode()->FindElement(tempvalue);
-    ASSERT( _element != NULL,
+    const element * elem = NULL;
+    try {
+      const int tempvalue = boost::lexical_cast<atomicNumber_t>(*beg);
+      elem = World::getInstance().getPeriode()->FindElement(tempvalue);
+    } catch( boost::bad_lexical_cast &e) {
+      elem = World::getInstance().getPeriode()->FindElement(*beg);
+    }
+    ASSERT( elem != NULL,
         "FindElementsByString() - cannnot find element "
-        +toString(tempvalue)+" in periodentafel.");
-    elements.push_back(_element);
+        +toString(*beg)+" in periodentafel.");
+    elements.push_back(elem);
   }
   return elements;