Changeset 4122 in orxonox.OLD for orxonox/branches/heightMap/src/lib/util

Timestamp:

May 9, 2005, 11:29:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:

orxonox/branches/heightMap

Files:

• . (modified) (1 prop)
• src/lib/util/ini_parser.cc (modified) (4 diffs)
• src/lib/util/ini_parser.h (modified) (1 diff)
• src/lib/util/substring.cc (copied) (copied from orxonox/trunk/src/lib/util/substring.cc)
• src/lib/util/substring.h (copied) (copied from orxonox/trunk/src/lib/util/substring.h)

orxonox/branches/heightMap

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/heightMap/src/lib/util/ini_parser.cc

@@ -16 +16 @@
 
 #include "ini_parser.h"
+#include "resource_manager.h"
 
 using namespace std;
 
 /**
-        \brief constructs an IniParser using a file
-        \param filename: the path and name of the file to parse
+   \brief constructs an IniParser using a file
+   \param filename: the path and name of the file to parse
 */
-IniParser::IniParser (char* filename)
+IniParser::IniParser (const char* filename)
 {
   stream = NULL;
   bInSection = false;
-  openFile(filename);
+  this->openFile(filename);
 }
 
 /**
-        \brief removes the IniParser from memory
+   \brief removes the IniParser from memory
 */
 IniParser::~IniParser ()
@@ -43 +44 @@
    \return zero on success or -1 if an error occured;
 */
-int IniParser::openFile( char* filename)
+int IniParser::openFile(const char* filename)
 {
+  char* tmpName = ResourceManager::homeDirCheck(filename);
   if( filename == NULL) return -1;
   if( stream != NULL)   fclose (stream);
-  if( (stream = fopen (filename, "r")) == NULL)
+  if( (stream = fopen (tmpName, "r")) == NULL)
     {
-      printf("IniParser could not open %s\n", filename);
+      PRINTF(1)("IniParser could not open %s\n", filename);
+      delete tmpName;
       return -1;
     }
   bInSection = false;
+  delete tmpName;
   return 0;
 }
@@ -123 +127 @@
           return -1;
         }
-      if( (ptr = strchr( linebuffer, '=')) != NULL)
+      sscanf(linebuffer, "%s = %s", name, value);
+      return 0;
+      /*
+        if( (ptr = strchr( tmpBuffer, '=')) != NULL)
         {
-          if( ptr == linebuffer) continue;
-          strcpy (value, &ptr[1]);
-          strncpy (name, linebuffer, strlen (linebuffer) - strlen (value) - 1);
-          return 0;
+        if( ptr == linebuffer) continue;
+        strcpy (value, &ptr[1]);
+        strncpy (name, linebuffer, strlen (linebuffer) - strlen (value) - 1);
+        printf ("%s, %s\n", value, name);
+        return 0;
         }
+      */
     }
   return -1;    
@@ -144 +153 @@
    lead to unwanted behaviour.
 */
-char* IniParser::getVar( char* name, char* section, char* defvalue = "")
+char* IniParser::getVar(const char* name, char* section, char* defvalue = "")
 {
   strcpy (internbuf, defvalue);

orxonox/branches/heightMap/src/lib/util/ini_parser.h

@@ -26 +26 @@
         
  public:
-  IniParser (char* filename);
+  IniParser (const char* filename);
   ~IniParser ();
   
-  char* getVar( char* name, char* section, char* defvalue);
-        int openFile( char* name);
+  char* getVar(const char* name, char* section, char* defvalue);
+  int openFile(const char* name);
   int getSection( char* section);
   int nextVar( char* name, char* value);

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+