Changeset 5031 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Aug 15, 2005, 9:39:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: made the IniParser more standAlone
also fixed all remaing SubProjects, so they compile again

Location:

orxonox/trunk/src/lib/util

Files:

• ini_parser.cc (modified) (10 diffs)
• ini_parser.h (modified) (4 diffs)

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

@@ -22 +22 @@
 
 #include "list.h"
-#include "stdlibincl.h"
+#include <stdlib.h>
+#include <string.h>
 #include "debug.h"
 
@@ -33 +34 @@
 IniParser::IniParser (const char* fileName)
 {
-  this->setClassID(CL_INI_PARSER, "IniParser");
-
   this->currentEntry = NULL;
   this->currentSection = NULL;
   this->sections = NULL;
+  this->fileName = NULL;
   if (fileName != NULL)
     this->readFile(fileName);
@@ -83 +83 @@
   this->currentSection = NULL;
   this->sections = NULL;
-  this->setName(NULL);
+  this->setFileName(NULL);
 }
 
@@ -98 +98 @@
   if( fileName == NULL)
     return false;
-  this->setName(fileName);
+  this->setFileName(fileName);
 
   if( (stream = fopen (fileName, "r")) == NULL)
@@ -234 +234 @@
   this->currentSection = newSection;
   this->sections->add(newSection);
-  PRINTF(0)("Added Section %s\n", sectionName);
+  PRINTF(5)("Added Section %s\n", sectionName);
   return true;
 }
@@ -375 +375 @@
     strcpy(newEntry->value, value);
     this->currentSection->entries->add(newEntry);
+    PRINTF(5)("Added Entry %s with Value '%s' to Section %s\n", newEntry->name, newEntry->name, addSection->name);
     return true;
   }
@@ -421 +422 @@
   }
   else
-    PRINTF(1)("%s not opened\n", this->getName());
+    PRINTF(1)("%s not opened\n", fileName);
 
   return defaultValue;
@@ -427 +428 @@
 }
 
+
+void IniParser::setFileName(const char* fileName)
+{
+  if (this->fileName)
+    delete []this->fileName;
+  if (fileName)
+  {
+    this->fileName = new char[strlen(fileName)+1];
+    strcpy(this->fileName, fileName);
+  }
+  else
+    this->fileName = NULL;
+}
+
+
 /**
  * output the whole tree in a nice and easy way.
@@ -432 +448 @@
 void IniParser::debug() const
 {
-  PRINTF(0)("Iniparser %s - debug\n", this->getName());
+  PRINTF(0)("Iniparser %s - debug\n", this->fileName);
   if (this->sections)
   {
@@ -456 +472 @@
   }
   else
-    PRINTF(1)("%s not opened\n", this->getName());
-}
+    PRINTF(1)("%s not opened\n", fileName);
+}

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

@@ -10 +10 @@
 
 #define PARSELINELENGHT     512       //!< how many chars to read at once
-
-#include "base_object.h"
+#ifndef NULL
+#define NULL 0x0                      //!< NULL
+#endif
 
 // FORWARD DEFINITION //
@@ -20 +21 @@
  * This class can be used to load an initializer file and parse it's contents for variablename=value pairs.
  */
-class IniParser : public BaseObject
+class IniParser
 {
   private:
@@ -53 +54 @@
     /** @returns true if the file is opened, false otherwise*/
     bool isOpen() const { return (sections != NULL)?true:false; };
+    /** @returns the fileName we have opened. */
+    const char* getFileName() const { return this->fileName; };
 
     bool addVar(const char* entryName, const char* value, const char* sectionName = NULL);
@@ -71 +74 @@
   private:
     void deleteSections();
+    void setFileName(const char* fileName);
 
   private:
+    char*                 fileName;        //!< The name of the File that was parsed.
     tList<IniSection>*    sections;        //!< a list of all stored Sections of the Parser
     IniSection*           currentSection;  //!< the current selected Section