Changeset 3159f5d for fedd/federation

Timestamp:

Mar 17, 2010 2:27:33 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

1dcaff4

Parents:

76441b6

Message:

Set up the repote splitter to translate into a topdl description. It has thus
become misnamed.

File:

• fedd/federation/split.py (modified) (4 diffs)

fedd/federation/split.py

@@ -5 +5 @@
 import tempfile
 import logging
+import topdl
 
 from util import *
@@ -128 +129 @@
         
         
-        tclcmd = [self.tclsh, self.tcl_splitter, '-s', '-x', 
+        tclcmd = [self.tclsh, self.tcl_splitter, '-t', '-x', 
             str(self.muxmax), '-m', master]
         if include_fedkit: tclcmd.append('-k')
@@ -135 +136 @@
         tclparser = subprocess.Popen(tclcmd, stdout=subprocess.PIPE)
 
-        out = ""
-        # Package up the split data
-        for line in tclparser.stdout:
-            out += line
+        top = topdl.topology_from_xml(file=tclparser.stdout, top="experiment")
 
         # Walk up tmpdir, deleting as we go
@@ -148 +146 @@
         os.rmdir(tmpdir)
 
-        resp = { 'output' : out }
+        resp = { 
+                'experimentdescription':  { 
+                    'topdldescription': top.to_dict(),
+                    }
+                }
 
         return resp