updates from hacking day

[rails.git] / app / models / segment.rb

diff --git a/app/models/segment.rb b/app/models/segment.rb
index 6a07e8cb1dad8d0f96a25d0331b4f77948c7584c..b6f60ec3f9dd9d2c181d229ff85c958fb2e15f31 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -73,12 +73,20 @@ class Segment < ActiveRecord::Base
     return doc
   end
 
-  def to_xml_node
+  def to_xml_node(user_display_name_cache  = nil)
     el1 = XML::Node.new 'segment'
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s
-    el1['user'] = self.user.display_name if self.user.data_public?
+    if user_display_name_cache and user_display_name_cache[self.user_id]
+      # use the cache if available
+    else
+      user_display_name_cache[self.user_id] = self.user.display_name
+    end
+    
+    #el1['user'] = self.user.display_name if self.user.data_public?
+    el1['user'] = user_display_name_cache[self.user_id]
+
     Segment.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema