Changeset 3598

Timestamp:

05/02/07 14:26:45 (6 years ago)

Author:

balister

Message:

Can find and parse SPD file again.

Location:

ossie/trunk/ossie

Files:

• include/ossie/Makefile.am (modified) (1 diff)
• include/ossie/SADComponentFile.h (added)
• include/ossie/SADParser.h (modified) (2 diffs)
• parser/Makefile.am (modified) (1 diff)
• parser/SADComponentFile.cpp (added)
• parser/SADParser.cpp (modified) (2 diffs)

ossie/trunk/ossie/include/ossie/Makefile.am

@@ -1 @@
-pkginclude_HEADERS = ApplicationFactory_impl.h LoadableDevice_impl.h Application_impl.h orb_wrap.h automaticTest.h OS_config.h ComponentAssemblyParser.h ossiecf.h ComponentInstantiation.h ossieparser.h ComponentPlacement.h Port.h ComponentSupportedInterface.h Port_impl.h Connection.h PortSupplier_impl.h DCDComponentInstantiation.h PRFParser.h PRFProperty.h DCDComponentPlacement.h PRFSimpleProperty.h PRFSimpleSequenceProperty.h DCDConnectionParser.h PropertySet_impl.h DCDInstantiationProperty.h ProvidesPort.h DCDParser.h Resource_impl.h Device_impl.h SADComponentInstantiation.h DeviceManager_impl.h SADComponentPlacement.h DMDParser.h SADHostCollocation.h DomainManager_impl.h SADParser.h ExecutableDevice_impl.h SCDParser.h ExternalPort.h SPDAuthor.h File_impl.h SPDImplementation.h FileManager_impl.h SPDParser.h FileSystem_impl.h SPDUsesDevice.h FindBy.h InstantiationProperty.h TestableObject_impl.h LifeCycle_impl.h UsesPort.h ossieSupport.h portability.h prop_helpers.h debug.h
+pkginclude_HEADERS = ApplicationFactory_impl.h LoadableDevice_impl.h Application_impl.h orb_wrap.h automaticTest.h OS_config.h ComponentAssemblyParser.h ossiecf.h ComponentInstantiation.h ossieparser.h ComponentPlacement.h Port.h ComponentSupportedInterface.h Port_impl.h Connection.h PortSupplier_impl.h DCDComponentInstantiation.h PRFParser.h PRFProperty.h DCDComponentPlacement.h PRFSimpleProperty.h PRFSimpleSequenceProperty.h DCDConnectionParser.h PropertySet_impl.h DCDInstantiationProperty.h ProvidesPort.h DCDParser.h Resource_impl.h Device_impl.h SADComponentInstantiation.h DeviceManager_impl.h SADComponentPlacement.h DMDParser.h SADHostCollocation.h DomainManager_impl.h SADParser.h ExecutableDevice_impl.h SCDParser.h ExternalPort.h SPDAuthor.h File_impl.h SPDImplementation.h FileManager_impl.h SPDParser.h FileSystem_impl.h SPDUsesDevice.h FindBy.h InstantiationProperty.h TestableObject_impl.h LifeCycle_impl.h UsesPort.h ossieSupport.h portability.h prop_helpers.h debug.h SADComponentFile.h
 

ossie/trunk/ossie/include/ossie/SADParser.h

@@ -32 +32 @@
 #include "ossie/ComponentAssemblyParser.h"
 #include "ossie/SADComponentPlacement.h"
+#include "ossie/SADComponentFile.h"
 #include "ossie/SADHostCollocation.h"
 #include "ossie/ExternalPort.h"
@@ -54 +55 @@
     SADComponentInstantiation* assemblyControllerInstantiation;
     std::vector <SADComponentPlacement*> components;
+    std::vector <SADComponentFile*> componentFiles;
     std::vector <SADHostCollocation*> hostCollocations;
     std::vector <ExternalPort*> externalPorts;
 
     void parseFile(TiXmlHandle docHandle);
+    void parseComponentFiles(TiXmlHandle docHandle);
     void parseComponents(TiXmlHandle docHandle);
     void parseHostCollocation(TiXmlHandle docHandle);

ossie/trunk/ossie/parser/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libossieparser.la
-libossieparser_la_SOURCES = ComponentAssemblyParser.cpp  Port.cpp ComponentInstantiation.cpp PRFParser.cpp ComponentPlacement.cpp PRFProperty.cpp PRFSimpleProperty.cpp PRFSimpleSequenceProperty.cpp ComponentSupportedInterface.cpp  ProvidesPort.cpp Connection.cpp SADComponentInstantiation.cpp DCDComponentInstantiation.cpp SADComponentPlacement.cpp DCDComponentPlacement.cpp SADHostCollocation.cpp DCDConnectionParser.cpp SADParser.cpp DCDInstantiationProperty.cpp SCDParser.cpp DCDParser.cpp SPDAuthor.cpp DMDParser.cpp SPDImplementation.cpp ExternalPort.cpp SPDParser.cpp FindBy.cpp SPDUsesDevice.cpp InstantiationProperty.cpp orb_wrap.cpp UsesPort.cpp ORB.cpp EventChannelSupport.cpp prop_helpers.cpp tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
+libossieparser_la_SOURCES = ComponentAssemblyParser.cpp  Port.cpp ComponentInstantiation.cpp PRFParser.cpp ComponentPlacement.cpp PRFProperty.cpp PRFSimpleProperty.cpp PRFSimpleSequenceProperty.cpp ComponentSupportedInterface.cpp  ProvidesPort.cpp Connection.cpp SADComponentInstantiation.cpp DCDComponentInstantiation.cpp SADComponentPlacement.cpp DCDComponentPlacement.cpp SADHostCollocation.cpp DCDConnectionParser.cpp SADParser.cpp DCDInstantiationProperty.cpp SCDParser.cpp DCDParser.cpp SPDAuthor.cpp DMDParser.cpp SPDImplementation.cpp ExternalPort.cpp SPDParser.cpp FindBy.cpp SPDUsesDevice.cpp InstantiationProperty.cpp orb_wrap.cpp UsesPort.cpp ORB.cpp EventChannelSupport.cpp prop_helpers.cpp tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp SADComponentFile.cpp
 
 pkginclude_HEADERS = tinystr.h tinyxml.h

ossie/trunk/ossie/parser/SADParser.cpp

@@ -64 +64 @@
 {
 
+    parseComponentFiles(docHandle);
     parseComponents(docHandle);
     parseHostCollocation(docHandle);
     parseAssemblyController(docHandle);
     parseExternalPorts(docHandle);
+}
+
+void SADParser::parseComponentFiles(TiXmlHandle docHandle)
+{
+    DEBUG(6, SADParser, "About to parse component files");
+
+    TiXmlElement *cf = docHandle.FirstChild("componentfiles").FirstChild("componentfile").Element();
+
+    for (; cf; cf = cf->NextSiblingElement()) {
+        componentFiles.push_back (new SADComponentFile (cf));
+    }
 }
 
@@ -179 +191 @@
 }
 
-const char *SADParser::getSPDById(const char *refId)
-{
-
-}
+const char *SADParser::getSPDById(const char *_refId)
+{
+    std::string refId(_refId);
+
+    for(unsigned int i(0); i < componentFiles.size(); ++i) {
+        std::string testId = componentFiles[i]->getId();
+
+        if (refId == testId)
+            return componentFiles[i]->getFileName();
+    }
+
+    return NULL;
+}