Undo commenting out code

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index ec4bb5136baaa79bf3ce560b017455f83844f7db..591389243df717698d462acece54942bb0ce7017 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -92,38 +92,50 @@ class OldWay < ActiveRecord::Base
     @tags = t
   end
 
     @tags = t
   end
 

-  def to_xml_node
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})

     el1 = XML::Node.new 'way'
     el1['id'] = self.way_id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1 = XML::Node.new 'way'
     el1['id'] = self.way_id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
-    end

     el1['version'] = self.version.to_s
     el1['version'] = self.version.to_s

-    el1['changeset'] = self.changeset.id.to_s
+    el1['changeset'] = self.changeset_id.to_s
+
+    if changeset_cache.key?(self.changeset_id)
+      # use the cache if available
+    else
+      changeset_cache[self.changeset_id] = self.changeset.user_id
+    end
+
+    user_id = changeset_cache[self.changeset_id]
+
+    if user_display_name_cache.key?(user_id)
+      # use the cache if available
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[user_id] = self.changeset.user.display_name
+    else
+      user_display_name_cache[user_id] = nil
+    end

 
 

-    if self.redacted?
-      el1['redacted'] = self.redaction.title
+    if not user_display_name_cache[user_id].nil?
+      el1['user'] = user_display_name_cache[user_id]
+      el1['uid'] = user_id.to_s

     end
     end

+
+    el1['redacted'] = self.redaction.id.to_s if self.redacted?

     
     

-    unless self.redacted? and (@user.nil? or not @user.moderator?)
-      # If a way is redacted and the user isn't a moderator, only show
-      # meta-data from this revision, but no real data.
-      self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
-        e = XML::Node.new 'nd'
-        e['ref'] = nd.node_id.to_s
-        el1 << e
-      end
+    self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
+      e = XML::Node.new 'nd'
+      e['ref'] = nd.node_id.to_s
+      el1 << e
+    end

       
       

-      self.old_tags.each do |tag|
-        e = XML::Node.new 'tag'
-        e['k'] = tag.k
-        e['v'] = tag.v
-        el1 << e
-      end
+    self.old_tags.each do |tag|
+      e = XML::Node.new 'tag'
+      e['k'] = tag.k
+      e['v'] = tag.v
+      el1 << e

     end
     end

+

     return el1
   end
 
     return el1
   end