Changeset 100 in pacpusframework

Timestamp:

Jun 2, 2013, 10:10:12 AM (11 years ago)

Author:

morasjul

Message:

beta 2.0 : fix some bug with xml reading function

Location:

branches/2.0-beta1

Files:

• include/Pacpus/kernel/inputOutputBase.h (modified) (1 diff)
• src/PacpusLib/XmlComponentConfig.cpp (modified) (7 diffs)
• src/PacpusLib/XmlConfigFile.cpp (modified) (1 diff)

branches/2.0-beta1/include/Pacpus/kernel/inputOutputBase.h

@@ -29 +29 @@
     void addConnection(ConnectionBase connection) { _connection.append(connection);}
     bool removeConnection(ConnectionBase connection) { return _connection.removeOne(connection);}
+
+    bool hasConnection() { return _connection.size() > 0;}
 
 protected:

branches/2.0-beta1/src/PacpusLib/XmlComponentConfig.cpp

@@ -46 +46 @@
     {
         LOG_ERROR("cannot add component property:"
-                  << " component '" << component_.tagName() << "'"
+                  << " component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
                   << " already contains property '" << name << "'"
                   << " and its value is '" << component_.attribute(name) << "'"
@@ -56 +56 @@
     component_.setAttribute(name, 0);
     LOG_INFO("property '" << name << "'"
-              << " was added to the component " << component_.tagName() << "'"
+              << " was added to the component " << component_.attribute(kPropertyComponentName.c_str()) << "'"
               << " and set to '" << component_.attribute(name) << "'"
               );
@@ -66 +66 @@
     {
         LOG_WARN("cannot delete compoenent property '" << name << "'"
-                 << " of component '" << component_.tagName() << "'"
+                 << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
                  << ". Component does not contain this property."
                  );
@@ -75 +75 @@
     component_.removeAttribute(name);
     LOG_INFO("property '" << name << "' "
-      << " of component '" << component_.tagName() << "'"
+      << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
       << " was deleted"
       );
@@ -87 +87 @@
     {
         LOG_WARN("cannot retrieve component property '" << name << "'"
-                 << " of component '" << component_.tagName() << "'"
+                 << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
                  << ". Component does not contain this property."
                  );
@@ -116 +116 @@
     component_.setAttribute(name, value);
     LOG_INFO("property " << name
-             << " of the component " << component_.tagName()
+             << " of the component " << component_.attribute(kPropertyComponentName.c_str())
              << " was set to : " << value
              );
@@ -138 +138 @@
 QString const XmlComponentConfig::getComponentName() const
 {
-    //return component_.tagName();
+    //return component_.attribute(kPropertyComponentName.c_str());
     return getProperty(kPropertyComponentName.c_str());
 }

branches/2.0-beta1/src/PacpusLib/XmlConfigFile.cpp

@@ -74 +74 @@
 { 
     _mutex.lock();
-
+// TODO change .tagName => .attribute(kPropertyComponentName.c_str())
     if (_document.documentElement().namedItem(componentSection).namedItem(component.tagName()).isNull()) {
         LOG_WARN("component " << component.tagName() << " exists already in the document");