Changeset 4260

Timestamp:

07/05/07 15:02:54 (6 years ago)

Author:

jgaeddert

Message:

removing amara dependency completely from importResource.py

Files:

• WaveDev/branches/WaveDevNoAmara/wavedev/importResource.py (modified) (4 diffs)

WaveDev/branches/WaveDevNoAmara/wavedev/importResource.py

@@ -18 +18 @@
 
 import os, sys
-import amara
-from amara import binderytools
 
 import xml.dom.minidom
@@ -46 +44 @@
     # Build the main component or device from the SCD file    
     #
-    doc_scd = amara.parse(stripDoctype(scdPath))
-    #doc_scd = binderytools.bind_file(scdPath)
-    if not hasattr(doc_scd.softwarecomponent,'componenttype'):
+    doc_scd = xml.dom.minidom.parse(scdPath)
+    try:
+        componenttypeNode = doc_scd.getElementsByTagName("componenttype")
+        componenttype = componenttypeNode[0].childNodes[0].data
+    except:
         errorMsg(parent,"Invalid file: " + scdPath)
         return None
     
-    doc_spd = amara.parse(stripDoctype(spdPath))
-    if not hasattr(doc_spd.softpkg.implementation, 'description'):
-        #errorMsg(parent,'No description found in ' + spdPath)
+    doc_spd = xml.dom.minidom.parse(spdPath)
+    descriptionNode = doc_spd.getElementsByTagName("description")
+    try:
+        Rdescription = descriptionNode[0].childNodes[0].data
+    except:
         Rdescription='No description found in ' + spdPath
-    else:
-        Rdescription=str(doc_spd.softpkg.implementation.description)
-        #errorMsg(parent,Rdescription)
-    
+
     #Instantiate a new component of the appropriate type
-    if doc_scd.softwarecomponent.componenttype == u'resource':
+    if componenttype == u'resource':
         newComp = CC.Component(name=Rname,type='resource',description=Rdescription)
-    elif doc_scd.softwarecomponent.componenttype == u'executabledevice':
+    elif componenttype == u'executabledevice':
         newComp = CC.Component(name=Rname,type='executabledevice',description=Rdescription)
-    elif doc_scd.softwarecomponent.componenttype == u'loadabledevice':
+    elif componenttype == u'loadabledevice':
         newComp = CC.Component(name=Rname,type='loadabledevice',description=Rdescription)
-    elif doc_scd.softwarecomponent.componenttype == u'device':
+    elif componenttype == u'device':
         newComp = CC.Component(name=Rname,type='device',description=Rdescription)
     else:
@@ -74 +73 @@
         
     # Get the Ports
-    if hasattr(doc_scd.softwarecomponent.componentfeatures,'ports'):
-        ports = doc_scd.softwarecomponent.componentfeatures.ports
-        if hasattr(ports,'provides'):
-            for p in ports.provides:
-                tmpName = p.providesname
-                tmpInt = getInterface(p.repid,tmpName)
-                if tmpInt == None:
-                    return None
-                tmpType = p.porttype.type
-                newPort = CC.Port(tmpName,tmpInt,type='Provides',portType=tmpType)
-                newComp.ports.append(newPort)
-                
-        if hasattr(ports,'uses'):
-            for p in ports.uses:
-                tmpName = p.usesname
-                tmpInt = getInterface(p.repid,tmpName)
-                if tmpInt == None:
-                    return None
-                tmpType = p.porttype.type
-                newPort = CC.Port(tmpName,tmpInt,type='Uses',portType=tmpType)
-                newComp.ports.append(newPort)
-    
+    portsNodes = doc_scd.getElementsByTagName("ports")
+    for node in portsNodes:
+        providesPortsNodes = node.getElementsByTagName("provides")
+        usesPortsNodes = node.getElementsByTagName("uses")
+
+    # Provides ports
+    for node in providesPortsNodes:
+        tmpName = node.getAttribute("providesname")
+        tmpInt = getInterface( node.getAttribute("repid"), tmpName )
+        if tmpInt == None:
+            return None
+        portTypeNodeList = node.getElementsByTagName("porttype")
+        tmpType = portTypeNodeList[0].getAttribute("type")
+        newPort = CC.Port(tmpName,tmpInt,type='Provides',portType=tmpType)
+        newComp.ports.append(newPort)
+
+    # Uses ports
+    for node in usesPortsNodes:
+        tmpName = node.getAttribute("usesname")
+        tmpInt = getInterface( node.getAttribute("repid"), tmpName )
+        if tmpInt == None:
+            return None
+        portTypeNodeList = node.getElementsByTagName("porttype")
+        tmpType = portTypeNodeList[0].getAttribute("type")
+        newPort = CC.Port(tmpName,tmpInt,type='Uses',portType=tmpType)
+        newComp.ports.append(newPort)
+
     # Make sure that xml and code are not generated for this resource
     newComp.generate = False        
@@ -113 +117 @@
         return newComp
 
-    # !noamara
     doc_prf = xml.dom.minidom.parse(prfPath)
     try: