Changeset 4270

Timestamp:

07/10/07 10:45:39 (6 years ago)

Author:

jgaeddert

Message:

removing amara: check in early, check in often

Files:

• WaveDev/branches/WaveDevNoAmara/wavedev/XML_gen/application_gen.py (modified) (11 diffs)

WaveDev/branches/WaveDevNoAmara/wavedev/XML_gen/application_gen.py

@@ -23 +23 @@
 import component_gen
 from amara import binderytools
+import xml.dom.minidom
+from xml.dom.minidom import Node
 import xmlBeautify
 import wavedev.ComponentClass as CC
@@ -32 +34 @@
 
 try:
-    doc_cfg = binderytools.bind_file('../wavedev.cfg')
+    doc_cfg = xml.dom.minidom.parse('../wavedev.cfg')
 except:   #if  not being called from wavedev, try looking for the file
-    doc_cfg = binderytools.bind_file('/sdr/tools/WaveDev/wavedev.cfg')
-
-
-version = str(doc_cfg.owdconfiguration.version)
+    doc_cfg = xml.dom.minidom.parse('/sdr/tools/WaveDev/wavedev.cfg')
+
+
+version = str(doc_cfg.getElementsByTagName("version")[0].firstChild.data)
 
 #vtext = open('../version.txt')
@@ -52 +54 @@
 def genxml(complist, genPath, waveName):
 
-   if genPath[len(genPath)-1] != '/':
+    if genPath[len(genPath)-1] != '/':
         genPath = genPath + '/'
-   genPath = unicode(genPath)
-   waveformDir = unicode(genPath + waveName + '/')
+    genPath = unicode(genPath)
+    waveformDir = unicode(genPath + waveName + '/')
 
    
-   appName = unicode(waveName)
-   #namingServicePrefix = u'ossie'
-   outputFilename_sad = appName + u'.sad.xml'
+    appName = unicode(waveName)
+    #namingServicePrefix = u'ossie'
+    outputFilename_sad = appName + u'.sad.xml'
    
-   # Generate the individual component xml files
-   for n in complist:
-      if n.generate:
-        component_gen.gen_scd(n, genPath)
-        component_gen.gen_spd(n, genPath)
-        component_gen.gen_prf(n, genPath)      
+    # Generate the individual component xml files
+    for n in complist:
+        if n.generate:
+            component_gen.gen_scd(n, genPath)
+            component_gen.gen_spd(n, genPath)
+            component_gen.gen_prf(n, genPath)      
    
-   #----------------------------------------------------------------------------
-   # SAD Parser / Generator
-   #
+    #----------------------------------------------------------------------------
+    # SAD Parser / Generator
+    #
    
-   # Use the Amara toolkit to objectify and generate the SAD file
-   try:  #if running from wavedev
-        doc_sad = binderytools.bind_file('XML_gen/_sad.xml.tpl')
-   except:   #if not being called from wavedev, try looking for the file
-        doc_sad = binderytools.bind_file('/sdr/tools/WaveDev/wavedev/XML_gen/_sad.xml.tpl')
-
-   doc_sad.softwareassembly.name = u'OSSIE::' + appName
-   doc_sad.softwareassembly.id = u'DCE:' + unicode(uuidgen())
-    
-   baseComponentList = [] 
-   for n in complist:
+    # Use the Amara toolkit to objectify and generate the SAD file
+    try:  #if running from wavedev
+        doc_sad = xml.dom.minidom.parse('XML_gen/_sad.xml.tpl')
+    except:   #if not being called from wavedev, try looking for the file
+        doc_sad = xml.dom.minidom.parse('/sdr/tools/WaveDev/wavedev/XML_gen/_sad.xml.tpl')
+
+    doc_sad.getElementsByTagName("softwareassembly")[0].setAttribute("name", u'OSSIE::' + appName )
+    doc_sad.getElementsByTagName("softwareassembly")[0].setAttribute("id", u'DCE:' + unicode(uuidgen()) )
+    
+    # get root nodes for componentfiles, partitioning, assemblycontroller, and connections tags
+    componentfilesNode = doc_sad.getElementsByTagName("componentfiles")[0]
+    partitioningNode = doc_sad.getElementsByTagName("partitioning")[0]
+    assemblycontrollerNode = doc_sad.getElementsByTagName("assemblycontroller")[0]
+    connectionsNode = doc_sad.getElementsByTagName("connections")[0]
+    
+    baseComponentList = [] 
+    for n in complist:
         # Generate the componentfile entries
         #tmpid = unicode(n.name) + u'_' + unicode(uuidgen())
@@ -90 +98 @@
         if n.baseName not in baseComponentList:
             baseComponentList.append(n.baseName)
-            e = doc_sad.xml_create_element(u'componentfile', attributes={u'type': u'SPD', u'id': tmpid})
-            doc_sad.softwareassembly.componentfiles.xml_append(e)
-            newLen = len(list(doc_sad.softwareassembly.componentfiles.componentfile))
-            #e = doc_sad.xml_create_element(u'localfile',attributes={u'name':unicode(xmlpath + n.baseName + '/' + n.baseName + 'Resource.spd.xml')})
-            e = doc_sad.xml_create_element(u'localfile',attributes={u'name':unicode(xmlpath + n.baseName + '/' + n.xmlName + '.spd.xml')})
-            doc_sad.softwareassembly.componentfiles.componentfile[newLen-1].xml_append(e)
-   
+
+            # create component file tag node
+            componentfileNode = doc_sad.createElement("componentfile")
+            componentfileNode.setAttribute("type", "SPD")
+            componentfileNode.setAttribute("id", tmpid)
+
+            # create localfile tag node
+            localfileNode = doc_sad.createElement("localfile")
+            localfileNode.setAttribute("name", unicode(xmlpath + n.baseName + '/' + n.xmlName + '.spd.xml') )
+
+            # append nodes to .sad.xml file
+            componentfileNode.appendChild(localfileNode)
+            componentfilesNode.appendChild(componentfileNode)
+
+        # Generate the partitioning elements
+        componentplacementNode = doc_sad.createElement("componentplacement")
+        componentfilerefNode = doc_sad.createElement("componentfileref")
+        componentinstantiationNode = doc_sad.createElement("componentinstantiation")
+        usagenameNode = doc_sad.createElement("usagename")
+        usagenametextNode = doc_sad.createTextNode(unicode(n.name))
+        findcomponentNode = doc_sad.createElement("findcomponent")
+
+        # Set attributes appropriately
+        componentfilerefNode.setAttribute("refid", tmpid)
+        componentinstantiationNode.setAttribute("id", u'DCE:' + unicode(n.uuid) )
+
+'''
         # Generate the partitioning entries
         e = doc_sad.xml_create_element(u'componentplacement')
@@ -110 +138 @@
         e = doc_sad.xml_create_element(u'findcomponent')
         doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.xml_append(e)
+'''
 
         # Check for overloaded properties
@@ -119 +148 @@
             if tmp_prop.elementType == "SimpleSequence":
                 try:
-                    if tmp_prop.values != tmp_prop.defaultValues:
-                        overload_flag = True
-                except:
-                    pass
+                    if tmp_prop.values != tmp_prop.defaultValues:
+                        overload_flag = True
+                except:
+                    pass
                         
         if overload_flag:
-            e = doc_sad.xml_create_element(u'componentproperties')
+            componentpropertiesNode = doc_sad.createElement("componentproperties")
+            #e = doc_sad.xml_create_element(u'componentproperties')
             doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.xml_append(e)
             for tmp_prop in n.properties:
                 if tmp_prop.elementType == "Simple":
                     if tmp_prop.value != tmp_prop.defaultValue:
-                        e = doc_sad.xml_create_element(u'simpleref',attributes={u'refid': unicode(tmp_prop.id),u'name': unicode(tmp_prop.name),u'description': unicode(tmp_prop.description), u'value': unicode(tmp_prop.value)})
-                        doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.xml_append(e)
+                        simplerefNode = doc_sad.createElement("simpleref")
+                        simplerefNode.setAttribute("refid", unicode(tmp_prop.id))
+                        simplerefNode.setAttribute("name", unicode(tmp_prop.name) )
+                        simplerefNode.setAttribute("description", unicode(tmp_prop.description))
+                        simplerefNode.setAttribute("value", unicode(tmp_prop.value))
+                        componentpropertiesNode.appendChild(simplerefNode)
+                        #e = doc_sad.xml_create_element(u'simpleref',attributes={u'refid': unicode(tmp_prop.id),u'name': unicode(tmp_prop.name),u'description': unicode(tmp_prop.description), u'value': unicode(tmp_prop.value)})
+                        #doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.xml_append(e)
                 if tmp_prop.elementType == "SimpleSequence":
                     ssflag = False
-                    try:
-                        if tmp_prop.values != tmp_prop.defaultValues:
-                            ssflag = True
-                    except:
-                        pass
+                    try:
+                        if tmp_prop.values != tmp_prop.defaultValues:
+                            ssflag = True
+                    except:
+                        pass
 
                     if ssflag:
-                        e = doc_sad.xml_create_element(u'simplesequenceref',attributes={u'refid': unicode(tmp_prop.id),u'name': unicode(tmp_prop.name),u'description': unicode(tmp_prop.description)})
-                        doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.xml_append(e)
-                        ssLen = len(list(doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.simplesequenceref))
-
-                        e = doc_sad.xml_create_element(u'values')
-                        doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.simplesequenceref[ssLen-1].xml_append(e)
+                        simplesequencerefNode = doc_sad.createElement("simplesequenceref")
+                        simplesequencerefNode.setAttribute("refid", unicode(tmp_prop.id) )
+                        simplesequencerefNode.setAttribute("name", unicode(tmp_prop.name) )
+                        simplesequencerefNode.setAttribute("description", unicode(tmp_prop.description) )
+                        valuesNode = doc_sad.createElement("values")
+                        #e = doc_sad.xml_create_element(u'simplesequenceref',attributes={u'refid': unicode(tmp_prop.id),u'name': unicode(tmp_prop.name),u'description': unicode(tmp_prop.description)})
+                        #doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.xml_append(e)
+                        #ssLen = len(list(doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.simplesequenceref))
+
+                        #e = doc_sad.xml_create_element(u'values')
+                        #doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.simplesequenceref[ssLen-1].xml_append(e)
 
                         for tmp_v2 in tmp_prop.values:
-                            e = doc_sad.xml_create_element(u'value',content=unicode(tmp_v2))
-                            doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.simplesequenceref[ssLen-1].values.xml_append(e)
-
-        
+                            valueNode = doc_sad.createElement("value")
+                            valuetextNode = doc_sad.createTextNode(tmp_v2)
+                            valueNode.appendChild(valuetextNode)
+                            valuesNode.appendChild(valueNode)
+                            #e = doc_sad.xml_create_element(u'value',content=unicode(tmp_v2))
+                            #doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.componentproperties.simplesequenceref[ssLen-1].values.xml_append(e)
+
+                        simplesequencerefNode.appendChild(valuesNode)
+                        componentpropertiesNode.appendChild(simplesequencerefNode)
+
+        #TODO: append child nodes to componentplacement
+
         #NSname = u'DomainName1/' + namingServicePrefix + unicode(n.name) + u'Resource'
 #        NSname = u'DomainName1/' + unicode(n.name)
         NSname = unicode(n.name)
 
-        e = doc_sad.xml_create_element(u'namingservice', attributes={u'name': NSname})
-        doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.findcomponent.xml_append(e)
+        namingserviceNode = doc_sad.createElement("namingservice")
+        namingserviceNode.setAttribute("name", NSname)
+        findcomponentNode.appendChild(namingserviceNode)
+        #e = doc_sad.xml_create_element(u'namingservice', attributes={u'name': NSname})
+        #doc_sad.softwareassembly.partitioning.componentplacement[newLen-1].componentinstantiation.findcomponent.xml_append(e)
         
         # Generate the connections entries
@@ -184 +236 @@
                     dev_pname = u'DomainName1/' + pname
                     devFlag = True
-                
-            e = doc_sad.xml_create_element(u'connectinterface', attributes={u'id': u'DCE:' + unicode(uuidgen())})
-            doc_sad.softwareassembly.connections.xml_append(e)
-            newLen = len(list(doc_sad.softwareassembly.connections.connectinterface))
             
+            connectinterfaceNode = doc_sad.createElement("connectinterface")
+            connectinterfaceNode.setAttribute("id",u'DCE:' + unicode(uuidgen()))
+            #doc_sad.softwareassembly.connections.xml_append(e)
+            #newLen = len(list(doc_sad.softwareassembly.connections.connectinterface))
+
+            usesportNode = doc_sad.createElement("usesport")
+            usesidentifierNode = doc_sad.createElement("usesidentifier")
+            usesidentifiertextNode = doc_sad.createTextNode(uname)
+            findbyNode = doc_sad.createElement("findby")
+            namingserviceNode2 = doc_sad.createElement("namingservice")
+            namingserviceNode2.setAttribute("name", c1name)
+            
+            '''
             e = doc_sad.xml_create_element(u'usesport')
             doc_sad.softwareassembly.connections.connectinterface[newLen-1].xml_append(e)
@@ -197 +258 @@
             e = doc_sad.xml_create_element(u'namingservice',attributes={u'name': c1name})
             doc_sad.softwareassembly.connections.connectinterface[newLen-1].usesport.findby.xml_append(e)
+            '''
         
             if devFlag != True:
@@ -212 +274 @@
                 e = doc_sad.xml_create_element(u'namingservice',attributes={u'name': dev_pname})
                 doc_sad.softwareassembly.connections.connectinterface[newLen-1].findby.xml_append(e)
+
+            # Append child nodes
+            usesidentifierNode.appendChild(usesidentifierTextNode)
+            findbyNode.appendChild(namingserviceNode2)
             
         # Specify the uuid for the Assembly Controller
         if n.AssemblyController == True:
-           assemblycontroller_id = u'DCE:' + unicode(n.uuid)
-           doc_sad.softwareassembly.assemblycontroller.componentinstantiationref.refid = assemblycontroller_id    
-        
-   # Create and beautify the SAD file as a temporary file
-   data = doc_sad.xml()
-   xmlBeautify.beautify(data,waveformDir + '.' + outputFilename_sad + '.tmp')
-
-
-   # Post Processing - add some of the header lines
-
-   preProcessed_sad = open(waveformDir + '.' + outputFilename_sad + '.tmp', 'r')
-   postProcessed_sad = open(waveformDir + outputFilename_sad, 'w')
-
-   # Specify external DTD
-   line0 = preProcessed_sad.readline()
-   remaining = preProcessed_sad.readlines()
-   postProcessed_sad.writelines(line0)
-   postProcessed_sad.writelines(u'<!DOCTYPE softwareassembly SYSTEM \"../../xml/dtd/softwareassembly.dtd\">\n')
-   postProcessed_sad.writelines(commentLine)
-   postProcessed_sad.writelines(remaining)
-   postProcessed_sad.close()
+            assemblycontroller_id = u'DCE:' + unicode(n.uuid)
+            doc_sad.softwareassembly.assemblycontroller.componentinstantiationref.refid = assemblycontroller_id    
+        
+    # Create and beautify the SAD file as a temporary file
+    data = doc_sad.toxml('UTF-8')
+    xmlBeautify.beautify(data,waveformDir + '.' + outputFilename_sad + '.tmp')
+
+
+    # Post Processing - add some of the header lines
+
+    preProcessed_sad = open(waveformDir + '.' + outputFilename_sad + '.tmp', 'r')
+    postProcessed_sad = open(waveformDir + outputFilename_sad, 'w')
+
+    # Specify external DTD
+    line0 = preProcessed_sad.readline()
+    remaining = preProcessed_sad.readlines()
+    postProcessed_sad.writelines(line0)
+    postProcessed_sad.writelines(u'<!DOCTYPE softwareassembly SYSTEM \"../../xml/dtd/softwareassembly.dtd\">\n')
+    postProcessed_sad.writelines(commentLine)
+    postProcessed_sad.writelines(remaining)
+    postProcessed_sad.close()
   
-   # Remove temporary files
-   os.remove(waveformDir + '.' + outputFilename_sad + '.tmp')
+    # Remove temporary files
+    os.remove(waveformDir + '.' + outputFilename_sad + '.tmp')
    
-   #######################
-   #Generate the DCD file
-   #######################
-   #genDCD(complist,genPath,waveName,xmlpath)
+    #######################
+    #Generate the DCD file
+    #######################
+    #genDCD(complist,genPath,waveName,xmlpath)
 
 ################################################################################
@@ -385 +451 @@
             e = doc_dcd.xml_create_element(u'componentinstantiation',attributes={u'id': u'DCE:' + unicode(n.uuid)})
         else:
-            e = doc_dcd.xml_create_element(u'componentinstantiation',attributes={u'id': u'DCE:' + unicode(n.uuid)})
+            e = doc_dcd.xml_create_element(u'componentinstantiation',attributes={u'id': u'DCE:' + unicode(n.uuid)})
 
         doc_dcd.deviceconfiguration.partitioning.componentplacement[newLen-1].xml_append(e)
@@ -439 +505 @@
 \n\
 if len(sys.argv) != 2:\n\
-        sys.exit(1)\n\
+        sys.exit(1)\n\
 \n\
 sys.argv.append('--install-lib='+install_location)\n\n"