Changeset 3e293e4 for fedd

Timestamp:

Jun 24, 2008 4:59:50 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

d26d52e

Parents:

8f91e66

Message:

unpack to dictionary

File:

• fedd/fedd_util.py (modified) (3 diffs)

fedd/fedd_util.py

@@ -155 +155 @@
                 self.digest_bits(str().join([chr(x) for x in b]))
 
-def print_soap(soap, out=sys.stdout, level=0, show_all=False):
-    """Recursively print a soap element to out.
-
-    This is printed as pseudo XML with a <x></x> block around each element and
-    the element printed indented.  If show_all is true, even empty elements are
-    displayed.
-    """
-
-    indent = level* "\t"
-
-    methods = [ method for method in dir(soap) \
-            if method.startswith("get_element") and \
-            callable(getattr(soap, method))]
-    if len(methods) != 0:
-        for m in methods:
-            element = getattr(soap, m)();
-            if element != None or show_all:
-                # Element may be a list of repetitions of the same element. If
-                # so set elements to be that list, otherwise create a one entry
-                # tuple.  In either case we're going to iterate over elements.
-                if getattr(element,"__iter__", None) == None:
-                    elements = (element,)
-                else:
-                    elements = element
-                for e in elements:
-                    # attrs are the element attributes for this element and
-                    # they're printed in the framing XML rather than by the
-                    # recursive call.
-                    attrs = [ attr for attr in dir(e)\
-                            if attr.startswith("get_attribute") and \
-                            callable(getattr(e,attr))]
-                    print >> out, "%s<%s" % (indent, m[len("get_element_"):]),
-                    for a in attrs:
-                        print >>out, ' %s="%s"' % \
-                            (a[len("get_attribute_"):], getattr(e,a)()),
-                    print >>out, ">"
-                    print_soap(e, out, level+1)
-                    print >>out, "%s</%s>" % (indent, m[len("get_element_"):])
-    else:
-        print >> out, "%s%s" % (indent, soap)
-
 def pack_id(id):
     """
-    Return a dictionary with the field name set by the id type
+    Return a dictionary with the field name set by the id type.  Handy for
+    creating dictionaries to be converted to messages.
     """
     if isinstance(id, type(fedid())): return { 'fedid': id }
@@ -205 +165 @@
 
 def pack_soap(container, name, contents):
+    """
+    Convert the dictionary in contents into a tree of ZSI classes.
+
+    The holder classes are constructed from factories in container and assigned
+    to either the element or attribute name.  This is used to recursively
+    create the SOAP message.
+    """
     if getattr(contents, "__iter__", None) != None:
         obj = getattr(container, "new_%s" % name, None)()
@@ -220 +187 @@
         return obj
     else: return contents
+
+def unpack_soap(element):
+    """
+    Convert a tree of ZSI SOAP classes intro a hash.  The inverse of pack_soap
+
+    Elements or elements that are empty are ignored.
+    """
+    methods = [ m for m in dir(element) \
+            if m.startswith("get_element") or m.startswith("get_attribute")]
+    if len(methods) > 0:
+        rv = { }
+        for m in methods:
+            if m.startswith("get_element_"): n = m.replace("get_element_","",1)
+            else: n = m.replace("get_attribute_", "", 1)
+            sub = getattr(element, m)()
+            if sub != None:
+                rv[n] = unpack_soap(sub)
+        return rv
+    elif getattr(element, "__iter__", None) != None:
+        return [unpack_soap(e) for e in element]
+    else: 
+        return element;