[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...

[shuennek at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	shuennek at sourceware.org	2006-08-10 23:06:43

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.38&r2=1.39

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/08/10 16:50:40	1.38
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/08/10 23:06:42	1.39
@@ -979,7 +979,7 @@
   rc_map = {}
   if parent != None:
     rc_map['parent'] = parent
-  rc_map['resource_name'] = child.getName()
+  rc_map['name'] = child.getName()
   if child.isRefObject() == True:
     rc_map['ref_object'] = True
     rc_map['type'] = child.getObj().getResourceType()
@@ -987,13 +987,18 @@
     rc_map['type'] = child.getResourceType()
 
   rc_map['indent_ctr'] = indent_ctr
+  indent_str = '_'
+  i = indent_ctr
+  while i>0:
+    indent_str += '__'
+    i -= 1
+  rc_map['indent_str'] = indent_str
+    
   #Note: Final version needs all resource attrs
-  attrs = child.getAttributes()
-  attr_keys = attrs.keys()
-  for key in attr_keys:
-    rc_map[key] = attrs[key]
+  rc_map['attrs'] = child.getAttributes()
 
   new_indent_ctr = indent_ctr + 1
+
   resource_list.append(rc_map)
   kids = child.getChildren()
   for kid in kids: