Changeset 7256 in orxonox.OLD for trunk/src/lib/parser

Timestamp:

Mar 30, 2006, 11:45:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the preferences back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD
no conflicts… nice work

Location:

trunk/src/lib/parser

Files:

• Makefile.am (modified) (1 diff)
• cmdline_parser (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser)
• cmdline_parser/Makefile.am (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser/Makefile.am)
• cmdline_parser/cmdline_parser.cc (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser/cmdline_parser.cc)
• cmdline_parser/cmdline_parser.h (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser/cmdline_parser.h)
• ini_parser/ini_parser.cc (modified) (1 diff)
• ini_parser/ini_parser.h (modified) (1 diff)
• preferences (copied) (copied from branches/preferences/src/lib/parser/preferences)
• preferences/Makefile.am (copied) (copied from branches/preferences/src/lib/parser/preferences/Makefile.am)
• preferences/cmd_line_prefs_reader.cc (copied) (copied from branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.cc)
• preferences/cmd_line_prefs_reader.h (copied) (copied from branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.h)
• preferences/ini_file_prefs_reader.cc (copied) (copied from branches/preferences/src/lib/parser/preferences/ini_file_prefs_reader.cc)
• preferences/ini_file_prefs_reader.h (copied) (copied from branches/preferences/src/lib/parser/preferences/ini_file_prefs_reader.h)

trunk/src/lib/parser/Makefile.am

@@ -1 +1 @@
 SUBDIRS = \
           tinyxml \
-          ini_parser
+          ini_parser \
+          preferences \
+          cmdline_parser
 
 

trunk/src/lib/parser/ini_parser/ini_parser.cc

@@ -392 +392 @@
 }
 
+/**
+ * @brief edits the entry speciefied by entryName in sectionName/currentSection or creates it if it doesn't exist
+ * @param entryName the Name of the Entry to add
+ * @param value the value to assign to this entry
+ * @param sectionName if NULL then this entry will be set to the currentSection
+ * otherwise to the section refered to by sectionName.
+ * If both are NULL no entry will be added
+ * @return true if everything is ok false on error
+ */
+bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName)
+{
+  std::list<IniSection>::iterator section;
+
+  if (!sectionName.empty())
+  {
+    for (section = this->sections.begin(); section != this->sections.end(); section++)
+      if ((*section).name == sectionName)
+        break;
+  }
+  else
+    section = this->currentSection;
+
+  if (section == this->sections.end())
+  {
+    IniSection sec;
+    sec.comment = "";
+    sec.name = sectionName;
+    section = this->sections.insert(this->sections.end(), sec);
+  }
+
+  if (section == this->sections.end())
+  {
+    PRINTF(2)("section '%s' not found for value '%s'\n", sectionName.c_str(), entryName.c_str());
+    return false;
+  }
+  else
+  {
+    //try find item
+    std::list<IniEntry>::iterator entry;
+    for (entry = section->entries.begin(); entry!=section->entries.end(); entry++)
+      if (entry->name == entryName )
+        break;
+
+    //found it?
+    if ( entry != section->entries.end() )
+    {
+      entry->value = value;
+
+      return true;
+    }
+
+    //not found -> create it
+    (*section).entries.push_back(IniEntry());
+    (*section).entries.back().comment = "";
+    (*section).entries.back().name = entryName;
+    (*section).entries.back().value = value;
+    PRINTF(5)("Added Entry %s with Value '%s' to Section %s\n",
+    (*section).entries.back().name.c_str(),
+    (*section).entries.back().value.c_str(),
+    (*section).name);
+    this->currentEntry = --(*section).entries.end();
+    return true;
+  }
+}
+
 
 /**

trunk/src/lib/parser/ini_parser/ini_parser.h

@@ -69 +69 @@
     bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "" );
     const std::string& getVar(const std::string& entryName, const std::string& sectionName, const std::string& defaultValue = "") const;
+    bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "");
     void setEntryComment(const std::string& comment, const std::string& entryName, const std::string& sectionName);
     const std::string& getEntryComment(const std::string& entryName, const std::string& sectionName) const;