Changeset 6613 in orxonox.OLD for trunk/src/util

Timestamp:

Jan 19, 2006, 1:51:00 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better LoadParam

Location:

trunk/src/util/loading

Files:

• load_param.cc (modified) (4 diffs)
• load_param.h (modified) (2 diffs)

trunk/src/util/loading/load_param.cc

@@ -38 +38 @@
   // determin the LoadString.
   if (likely(!inLoadCycle))
-    this->loadString = grabParameter(root, paramName);
+    this->loadElem = grabParameterElement(root, paramName);
+  //this->loadString = grabParameter(root, paramName);
+  else if (!strcmp(root->Value(), paramName))
+    this->loadElem = (TiXmlElement*)root->FirstChild();
   else
-  {
-    if (!strcmp(root->Value(), paramName))
-    {
-      const TiXmlNode* val = root->FirstChild();
-      if( val->ToText())
-        this->loadString = val->Value();
-    }
-    else
-      this->loadString = NULL;
-  }
+    this->loadElem = NULL;
 
   // set the Executor.
@@ -65 +59 @@
   if (likely(this->executor != NULL))
   {
-    if (likely(this->object != NULL && this->executor != NULL) &&
+    if (this->loadElem != NULL &&  this->loadElem->ToText())
+      this->loadString = this->loadElem->Value();
+    else
+      this->loadString = NULL;
+    if (likely(this->object != NULL) &&
         ( this->loadString != NULL ||
          ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
@@ -74 +72 @@
     delete this->executor;
   }
-
 }
 
@@ -250 +247 @@
   return NULL;
 }
+
+/**
+ * @param root: The XML-element to grab a parameter from
+ * @param parameterName: the parameter to grab
+ * @returns the Element of the parameter if found, NULL otherwise
+ */
+const TiXmlElement* grabParameterElement(const TiXmlElement* root, const char* parameterName)
+{
+  const TiXmlElement* element;
+  const TiXmlNode* node;
+
+  if (root == NULL || parameterName == NULL)
+    return NULL;
+  assert( parameterName != NULL);
+
+  element = root->FirstChildElement( parameterName);
+  if( element == NULL) return NULL;
+
+  node = element->FirstChild();
+  while( node != NULL)
+  {
+    if( node->ToText()) return (TiXmlElement*)node;
+    node = node->NextSibling();
+  }
+  return NULL;
+}
+
+
+

trunk/src/util/loading/load_param.h

@@ -104 +104 @@
     LoadClassDescription*    classDesc;            //!< The LoadClassDescription of this CLoadParameter
     LoadParamDescription*    paramDesc;            //!< The LoadParameterDescription of this LoadParameter
+    const TiXmlElement*      loadElem;             //!< The Element to load.
     const char*              loadString;           //!< The string loaded by this LoadParam
     const void*              pointerToParam;       //!< A Pointer to a Parameter.
@@ -113 +114 @@
 
 const char* grabParameter(const TiXmlElement* root, const char* parameterName);
+const TiXmlElement* grabParameterElement(const TiXmlElement* root, const char* parameterName);
 
 #endif /* _LOAD_PARAM_H */