Changeset 3662

Timestamp:

05/04/07 11:05:10 (6 years ago)

Author:

balister

Message:

Fix parsing of component naming service name.

Files:

• ossie/trunk/ossie/parser/SADComponentInstantiation.cpp (modified) (2 diffs)

ossie/trunk/ossie/parser/SADComponentInstantiation.cpp

@@ -59 +59 @@
 void SADComponentInstantiation::parseFindComponent(TiXmlElement *elem)
 {
-    TiXmlElement * find = elem->FirstChildElement("findcomponent");
+    DEBUG(9, SADComponentInstantiation, "In parseFindComponent");
+    TiXmlElement * findcomponent = elem->FirstChildElement("findcomponent");
+    if (findcomponent) {
+        TiXmlElement *tag = findcomponent->FirstChildElement();
 
-    if (elem->ValueStr() == "namingservice") {
-        findByNamingServiceName = elem->Value();
+        DEBUG(9, SADComponentInstantiation, "Found tag:" << tag->ValueStr());
+        
+        if (tag->ValueStr() == "namingservice") {
+            findByNamingServiceName = tag->Attribute("name");
+            ifNamingService = true;
+            DEBUG(9, SADComponentInstantiation, "Found naming service name: " << findByNamingServiceName);
 
-    } else if (elem->ValueStr() == "componentresourcefactoryref") {
-        resourceFactoryRefId = elem->Attribute("refid");
-        ///\todo Parse resource factory properties
-        DEBUG(1, SADComponentInstantiation, "Trying to parse resource factory properties, need to write some more code.");
+            
+        } else if (tag->ValueStr() == "componentresourcefactoryref") {
+            resourceFactoryRefId = tag->Attribute("refid");
+            ///\todo Parse resource factory properties
+            DEBUG(1, SADComponentInstantiation, "Trying to parse resource factory properties, need to write some more code.");
+        }
     }
 
@@ -112 +121 @@
 const char* SADComponentInstantiation::getFindByNamingServiceName()
 {
+    DEBUG(9, SADComponentInstantiation, "getFindByNamingServiceName returning: " << findByNamingServiceName);
     return findByNamingServiceName.c_str();
 }