Changeset 9770 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/load_param.cc

Timestamp:

Sep 19, 2006, 9:51:24 PM (18 years ago)

Author:

bensch

Message:

cleanup

File:

• branches/new_class_id/src/lib/util/loading/load_param.cc (modified) (3 diffs)

branches/new_class_id/src/lib/util/loading/load_param.cc

@@ -44 +44 @@
  * @returns a pointer to itself.
  */
-void LoadParamBase::describe(const std::string& descriptionText)
+void LoadParamBase::describe(const ClassID& classID, const std::string& descriptionText)
 {
+  PRINTF(5)("Describing Class '%s'(id:%d) Parameter '%s': description '%s'\n",
+  classID.name().c_str(), classID.id(), paramName.c_str(), descriptionText.c_str());
+
+//  LoadParamDescription
+
   /// TODO REIMPLEMENT
   /*  if (LoadParamClassDescription::parametersDescription && this->paramDesc && this->paramDesc->getDescription().empty())
@@ -65 +70 @@
  * @returns the Value of the parameter if found, NULL otherwise
 */
-std::string grabParameter(const TiXmlElement* root, const std::string& parameterName)
+const std::string& LoadParamBase::grabParameter(const TiXmlElement* root, const std::string& parameterName)
 {
-  const TiXmlElement* element;
-  const TiXmlNode* node;
-
-  if (root == NULL)
-    return "";
-
-  element = root->FirstChildElement( parameterName);
-  if( element == NULL) return "";
-
-  node = element->FirstChild();
-  while( node != NULL)
+  const TiXmlElement* const element = grabParameterElement(root, parameterName);
+  if (element != NULL)
+    return element->Value();
+  else
   {
-    if( node->ToText()) return node->Value();
-    node = node->NextSibling();
+    static std::string empty("");
+    return empty;
   }
-  return "";
 }
 
@@ -90 +87 @@
  * @returns the Element of the parameter if found, NULL otherwise
  */
-const TiXmlElement* grabParameterElement(const TiXmlElement* root, const std::string& parameterName)
+const TiXmlElement* LoadParamBase::grabParameterElement(const TiXmlElement* root, const std::string& parameterName)
 {
   const TiXmlElement* element;