Changeset 19812

Timestamp:

02/14/07 11:28:11 (2 years ago)

Author:

patrick

Message:

MFT [rev 19811]:

Be more careful about the setting of mFileName. Since load() is called
recursively for loading included files, we have to be sure that mFileName
is set as the last step of loading rather than as the first so that the
originally named file is the one that gets associated with the
jccl::Configuration instance. Furthermore, during recursion, we cannot read
from mFileName because its value is invalid at that point. Instead, we need
to make careful use of scoping provided by the call stack to keep track of
which file name really refers to the parent file.

A better way of handling this may be to have a separate method used for
the recursive inclusion process. Making this change would require breaking
up load() so that its code can be reused more effectively. The need for a
separate method to do the recursive inclusion is debatable.

This fixes Trac Ticket #2.

Files:

• juggler/branches/2.0/modules/jackal/config/jccl/Config/Configuration.cpp (modified) (4 diffs)

juggler/branches/2.0/modules/jackal/config/jccl/Config/Configuration.cpp

@@ -182 +182 @@
-      << "' with parent file '" << parentfile << "'\n" << vprDEBUG_FLUSH;
-
-mFileName = ParseUtil::expandFileName(filename, parentfile);
-
-
-                     std::string("Loading config file ") + mFileName +
-                        std::string("\n"),
-                     std::string("")
+const std::string expanded_filename = ParseUtil::expandFileName(filename,
+
+
+std::ostringstream msg;
+msg << "Loading config file '" << expanded_filename << "'\n";
+vprDEBUG_OutputGuard(jcclDBG_CONFIG, vprDBG_CONFIG_LVL, msg.str(), ""
-
-   // XXX: Previously, this used ElementFactory::createXMLDocument(), but for
@@ -196 +196 @@
-   try
-   {
-mFileN
+expanded_filen
-
-      cppdom::NodePtr cfg_node(cfg_doc.getChild(tokens::CONFIGURATION));
@@ -222 +222 @@
-
-         // Load the file by making a recursive call to this method. We use
-mFileName so that the fully expanded path to the including file is
-
-mFileN
+expanded_filename so that the fully expanded path to the including
+file is 
+expanded_filen
-      }
-
-      // Load in the elements in the original file.
-
+
+
+
+
+
+
+
+
+
+
-
-      status = true;
@@ -243 +252 @@
-      vprDEBUG(vprDBG_ERROR, vprDBG_CRITICAL_LVL)
-         << clrOutBOLD(clrRED, "Configuration XML Error:") << " "
-mFileName << ": line " << line_num << " at position " << pos
-
+expanded_filename << ": line " << line_num << " at position "
+pos << 
-      vprDEBUG_NEXT(vprDBG_ERROR, vprDBG_CRITICAL_LVL)
-         << "Error: " << errmsg << std::endl << vprDEBUG_FLUSH;
-
-      // Print out the actual failed XML.
-mFileN
+expanded_filen
-      if ( errfile )
-      {