Changeset 897 for code/branches/core2

Timestamp:

Mar 17, 2008, 10:12:55 PM (17 years ago)

Author:

landauf

Message:

bugfix

Location:

code/branches/core2/src/orxonox/core

Files:

• Loader.cc (modified) (2 diffs)
• Namespace.cc (modified) (2 diffs)

code/branches/core2/src/orxonox/core/Loader.cc

@@ -116 +116 @@
             xmlfile.LoadFile();
             ticpp::Element rootElement;
-            rootElement.SetAttribute("name", "rootNamespace");
+            rootElement.SetAttribute("name", "root");
 
             for (ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++)
@@ -124 +124 @@
             rootNamespace->setLoaderIndentation("    ");
             rootNamespace->setLevel(level);
+            rootNamespace->setNamespace(rootNamespace);
             rootNamespace->deleteNamespaceNodesAfterDestruction(true);
             rootNamespace->XMLPort(rootElement, true);

code/branches/core2/src/orxonox/core/Namespace.cc

@@ -60 +60 @@
     void Namespace::XMLPort(Element& xmlelement, bool loading)
     {
+std::cout << "1_1\n";
         BaseObject::XMLPort(xmlelement, loading);
+std::cout << "1_2\n";
 
         std::string name = this->getName();
+std::cout << "1_3\n";
         unsigned int pos = 0;
         while ((pos = name.find(',')) != std::string::npos)
@@ -72 +75 @@
         while ((pos = name.find('\t')) != std::string::npos)
             name.replace(pos, 1, " ");
-        SubString tokens(name, " ", '\0', false, '\\', '"', '\0', '\0', '\0');
+std::cout << "1_4\n";
+        SubString tokens(name, " ", "", false, '\\', '"', '\0', '\0', '\0');
+std::cout << "1_5\n";
         for (unsigned int i = 0; i < tokens.size(); i++)
         {
+std::cout << "1_6\n";
             for (std::set<NamespaceNode*>::iterator it = this->getNamespace()->representingNamespaces_.begin(); it != this->getNamespace()->representingNamespaces_.end(); ++it)
             {
+std::cout << "1_7\n";
                 std::set<NamespaceNode*> temp = (*it)->getNodeRelative(tokens[i]);
+std::cout << "1_8\n";
                 this->representingNamespaces_.insert(temp.begin(), temp.end());
+std::cout << "1_9\n";
             }
         }
+std::cout << "1_10\n";
 
         XMLPortParam(Namespace, "operator", setOperator, getOperator, xmlelement, loading);