Added new arguments to configuration::find_parameter() to allow for a list of

[AXE.git] / src / configuration.cpp

diff --git a/src/configuration.cpp b/src/configuration.cpp
index 76e0338..18046b4 100644 (file)
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -6,7 +6,7 @@
 ***********************
 **      FILE NAME      : configuration.cpp
 **      SYSTEM NAME    : AXE - Andromeda X-windows Encapsulation
-**      VERSION NUMBER : $Revision: 1.4 $
+**      VERSION NUMBER : $Revision: 1.6 $
 **
 **  DESCRIPTION      :  Implementation of configuration class
 **
@@ -18,13 +18,22 @@
 ********************************
 **      ORIGINAL AUTHOR : Arjen Baart - arjen@andromeda.nl
 **      CREATION DATE   : Jul 23, 2002
-**      LAST UPDATE     : Nov 22, 2002
+**      LAST UPDATE     : Apr 13, 2007
 **      MODIFICATIONS   : 
 **************************************************************************/
 
 /*****************************
    $Log: configuration.cpp,v $
-   Revision 1.4  2002-11-23 12:48:18  arjen
+   Revision 1.6  2007-05-04 14:01:22  arjen
+   Added new arguments to configuration::find_parameter() to allow for a list of
+   sections and a list of parameters in sections.
+   The new arguments are section index and parameter index (default = 0).
+
+   Revision 1.5  2003/03/29 07:19:37  arjen
+   Bugfix: Do not read the config file in the home
+   directory if the HOME environment variable doesn't exist
+
+   Revision 1.4  2002/11/23 12:48:18  arjen
    Check if a configuration file exists before feeding it to the XML parser.
 
    Revision 1.3  2002/11/02 14:35:15  arjen
@@ -41,12 +50,13 @@
 
 *****************************/
 
-static const char *RCSID = "$Id: configuration.cpp,v 1.4 2002-11-23 12:48:18 arjen Exp $";
+static const char *RCSID = "$Id: configuration.cpp,v 1.6 2007-05-04 14:01:22 arjen Exp $";
 
 #include <fcntl.h>
 #include <unistd.h>
 #include "configuration.h"
 
+
 /*=========================================================================
 **  NAME           : configuration::read
 **  SYNOPSIS       :
@@ -87,14 +97,17 @@ bool configuration::read(const String name)
       system = xmlParseFile(filename);
    }
 
-   filename = getenv("HOME");
-   filename += "/.";
-   filename += name + ".conf";
-   fd = open(filename, O_RDONLY);
-   if (fd > 0)
+   if (getenv("HOME") != NULL)
    {
-      close(fd);
-      user = xmlParseFile(filename);
+      filename = getenv("HOME");
+      filename += "/.";
+      filename += name + ".conf";
+      fd = open(filename, O_RDONLY);
+      if (fd > 0)
+      {
+         close(fd);
+         user = xmlParseFile(filename);
+      }
    }
 
    //  Check the root element, which must be the application name
@@ -138,11 +151,11 @@ bool configuration::read(const String name)
 **  VARS CHANGED   :
 **  FUNCTIONS USED :
 **  SEE ALSO       :
-**  LAST MODIFIED  : Jul 24, 2002
+**  LAST MODIFIED  : Apr 13, 2007
 **=========================================================================
 */
 
-xmlNodePtr configuration::xmlFindTag(xmlNodePtr node, const String tag)
+xmlNodePtr configuration::xmlFindTag(xmlNodePtr node, const String tag, int n)
 {
    xmlNodePtr   element = NULL;
 
@@ -150,7 +163,11 @@ xmlNodePtr configuration::xmlFindTag(xmlNodePtr node, const String tag)
    {
       if (node->type == XML_ELEMENT_NODE && tag == (char *)node->name)
       {
-         element = node;
+         if (n == 0)
+         {
+            element = node;
+         }
+         n--;
       }
       node = node->next;
    }
@@ -170,11 +187,11 @@ xmlNodePtr configuration::xmlFindTag(xmlNodePtr node, const String tag)
 **  VARS CHANGED   :
 **  FUNCTIONS USED :
 **  SEE ALSO       :
-**  LAST MODIFIED  : Nov 02, 2002
+**  LAST MODIFIED  : Apr 13, 2007
 **=========================================================================
 */
 
-String configuration::find_parameter(const String section, const String parameter)
+String configuration::find_parameter(const String section, const String parameter, int sec_n, int param_n)
 {
    xmlNodePtr     root_node;
    xmlNodePtr     section_node;
@@ -187,10 +204,10 @@ String configuration::find_parameter(const String section, const String paramete
    if (system)
    {
       root_node    = xmlDocGetRootElement(system);
-      section_node = xmlFindTag(root_node->children, section);
+      section_node = xmlFindTag(root_node->children, section, sec_n);
       if (section_node != NULL)
       {
-         param_node = xmlFindTag(section_node->children, parameter);
+         param_node = xmlFindTag(section_node->children, parameter, param_n);
          if (param_node != NULL)
          {
             param_node = param_node->children;
@@ -208,10 +225,10 @@ String configuration::find_parameter(const String section, const String paramete
    if (user)
    {
       root_node    = xmlDocGetRootElement(user);
-      section_node = xmlFindTag(root_node->children, section);
+      section_node = xmlFindTag(root_node->children, section, sec_n);
       if (section_node != NULL)
       {
-         param_node = xmlFindTag(section_node->children, parameter);
+         param_node = xmlFindTag(section_node->children, parameter, param_n);
          if (param_node != NULL)
          {
             param_node = param_node->children;