Changeset 5015 in orxonox.OLD for orxonox/trunk/src/lib/util/ini_parser.cc

Timestamp:

Aug 14, 2005, 5:25:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: robust IniParser

File:

• orxonox/trunk/src/lib/util/ini_parser.cc (modified) (8 diffs)

orxonox/trunk/src/lib/util/ini_parser.cc

@@ -23 +23 @@
 #include "list.h"
 #include "stdlibincl.h"
-
-#include "resource_manager.h"
 #include "debug.h"
 
@@ -53 +51 @@
 }
 
+/**
+ * removes all the sections. This is like delete, but even cooler :)
+ */
 void IniParser::deleteSections()
 {
@@ -80 +81 @@
   }
   delete this->sections;
+  this->currentEntry = NULL;
+  this->currentSection = NULL;
   this->sections = NULL;
 }
@@ -88 +91 @@
  * @return true on success false otherwise;
 */
-bool IniParser::openFile(const char* filename)
+bool IniParser::openFile(const char* fileName)
 {
   FILE*    stream;           //!< The stream we use to read the file.
 
-
-  if( filename == NULL)
-    return false;
-  char* tmpName = ResourceManager::homeDirCheck(filename);
 
   if (sections != NULL)
     deleteSections();
-
-  if( (stream = fopen (tmpName, "r")) == NULL)
-  {
-    PRINTF(1)("IniParser could not open %s\n", filename);
-    delete tmpName;
+  if( fileName == NULL)
+    return false;
+
+  if( (stream = fopen (fileName, "r")) == NULL)
+  {
+    PRINTF(1)("IniParser could not open %s\n", fileName);
     return false;
   }
@@ -189 +189 @@
     {
       this->currentSection = sectionEnum;
+      this->currentEntry = NULL;
       delete sectionIt;
       return true;
@@ -200 +201 @@
 
 /**
+ * moves to the first section
+ */
+void IniParser::getFirstSection()
+{
+  if (this->sections)
+    this->currentSection = this->sections->firstElement();
+  else
+    this->currentSection = NULL;
+  this->currentEntry = NULL;
+}
+
+/**
  * searches the next section
  * @returns the name of the section if found, NULL otherwise
@@ -210 +223 @@
   {
     if (this->sections)
-      this->currentSection = sections->nextElement(this->currentSection);
-  }
+    {
+      if (this->currentSection == this->sections->lastElement())
+        this->currentSection = NULL;
+      else
+        this->currentSection = this->sections->nextElement(this->currentSection);
+    }
+  }
+
   if (this->currentSection != NULL)
     return this->currentSection->name;
@@ -219 +238 @@
 
 /**
+ * moves to the first Variable of the current Section
+ */
+void IniParser::getFirstVar()
+{
+  if (this->currentSection)
+    this->currentEntry = this->currentSection->entries->firstElement();
+  else
+    this->currentEntry = NULL;
+}
+
+/**
  *  gets the next VarName=VarValue pair from the parsing stream
- * @param name: a pointer to the Name of the next Var
- * @param value: a pointer to the Value of the next Var
  * @return true on success, false otherwise (in the latter case name and value will be NULL)
  */
 bool IniParser::nextVar()
 {
-  if (this->currentSection == NULL)
-    return false;
-  if(this->currentEntry == this->currentSection->entries->lastElement())
+  if (this->currentSection == NULL
+      || this->currentEntry == NULL
+      || this->currentEntry == this->currentSection->entries->lastElement())
   {
     this->currentEntry = NULL;
     return false;
   }
-  if (this->currentEntry == NULL)
-    this->currentEntry = this->currentSection->entries->firstElement();
-  else
-    this->currentEntry = this->currentSection->entries->nextElement(this->currentEntry);
+  this->currentEntry = this->currentSection->entries->nextElement(this->currentEntry);
 
   if (this->currentEntry == NULL)