Changeset 639

Timestamp:

10/22/08 16:28:11 (5 years ago)

Author:

cbalan

Message:

ResourceTools?: - get_ancestors and get_children can support tree.

File:

• trunk/plugins/resourcetoolsplugin/tracresourcetools/relation/api.py (modified) (5 diffs)

trunk/plugins/resourcetoolsplugin/tracresourcetools/relation/api.py

@@ -39 +39 @@
                 yield related_resource
     
-    def get_ancestors(self, resource, req=None):
+    def get_ancestors(self, resource, req=None, tree=None):
         """Returns a list of ancestors.
         
@@ -46 +46 @@
         @return: Generator
         """
-        parent = resource
-        for counter in range(self.max_levels_lookup):
-            parent_description = self.resource_parent.get(parent, req=req).value
-            if not parent_description:
-                break
-            parent = self._normalize_resource(parent_description, resource.realm)
-            yield parent
+        if tree and tree.has_key(resource):
+            tree_node = tree[resource]
+            for counter in range(self.max_levels_lookup):
+                tree_node = tree_node.parent  
+                if not tree_node:
+                    break
+                yield tree_node.resource
+        else:
+            parent = resource
+            for counter in range(self.max_levels_lookup):
+                parent_description = self.resource_parent.get(parent, req=req).value
+                if not parent_description:
+                    break
+                parent = self._normalize_resource(parent_description, resource.realm)
+                yield parent
             
-    def get_children(self, resource):
+    def get_children(self, resource, tree=None):
         """Returns a list of child resources.
         
@@ -60 +68 @@
         @return: Generator
         """
-        rp_system = ResourcePropertySystem(self.env)
-        for search_criteria in [resource.realm+':'+resource.id, resource.id]:
-            for child_resource in rp_system.get_resources_with_properties(resource_parent = search_criteria):  
-                yield child_resource 
+        if tree and tree.has_key(resource):
+            for child_resource in tree[resource].children:
+                yield child_resource
+        else:
+            rp_system = ResourcePropertySystem(self.env)
+            for search_criteria in [resource.realm+':'+resource.id, resource.id]:
+                for child_resource in rp_system.get_resources_with_properties(resource_parent = search_criteria):  
+                    yield child_resource 
     
     def get_tree(self):
@@ -71 +83 @@
         """
         nodes = {}
-        _new_node = lambda x: nodes.setdefault(x, dict(resource=x,children=[]))
+        _get_node = lambda x: nodes.setdefault(x, ResourceTreeNode(x))
         for rp_model in ResourcePropertyModel.get_resource_properties(self.env, resource_properties=dict(resource_parent = self.resource_parent)):
-            node_parent_resource = self._normalize_resource(rp_model.value, rp_model.resource.parent.realm)
-            _new_node(node_parent_resource)['children'].append( _new_node(rp_model.resource.parent) )
+            node = _get_node(rp_model.resource.parent)
+            node_parent = _get_node(self._normalize_resource(rp_model.value, rp_model.resource.parent.realm))
+            node.parent = node_parent
+            node_parent.children.append(node)
         return nodes
+    
+    def get_cached_tree(self, req):
+        if 'resource_hierarchical_tree' not in req.callbacks:
+            req.callbacks['resource_hierarchical_tree'] = lambda req: self.get_tree()
+        return req.resource_hierarchical_tree
     
     # internals
@@ -81 +100 @@
         parts = resource_description.split(':', 1)
         if len(parts)==1:
-            parts = [default_realm]+parts
+            parts = [default_realm]+(parts[0]=='' and [None] or parts)
         return Resource(parts[0], parts[1])
+
+class ResourceTreeNode(object):
+    """Object representing a resource tree node."""
+    __slots__ = ('resource', 'parent', 'children')
+    def __init__(self, resource):
+        self.resource = resource
+        self.parent = None
+        self.children=[]