Simplify

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 20651f62259a6e36d04d3b591bfa58e34dbbbf41..890ba1eed61779325664b1dd65745b83d1f84665 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -12,7 +12,7 @@ class OldRelation < ActiveRecord::Base
   belongs_to :redaction
   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
 
   belongs_to :redaction
   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
 

-  has_many :old_members, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version], :order => :sequence_id
+  has_many :old_members, -> { order(:sequence_id) }, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version]

   has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version]
   
   validates_associated :changeset
   has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version]
   
   validates_associated :changeset


@@ -93,17 +93,36 @@ class OldRelation < ActiveRecord::Base
     return doc
   end
 
     return doc
   end
 

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

     el1 = XML::Node.new 'relation'
     el1['id'] = self.relation_id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1 = XML::Node.new 'relation'
     el1['id'] = self.relation_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['changeset'] = self.changeset_id.to_s
     el1['version'] = self.version.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 not user_display_name_cache[user_id].nil?
+      el1['user'] = user_display_name_cache[user_id]
+      el1['uid'] = user_id.to_s
+    end
+    
+    el1['redacted'] = self.redaction.id.to_s if self.redacted?

     
     self.old_members.each do |member|
       e = XML::Node.new 'member'
     
     self.old_members.each do |member|
       e = XML::Node.new 'member'


@@ -112,13 +131,14 @@ class OldRelation < ActiveRecord::Base
       e['role'] = member.member_role.to_s
       el1 << e
     end
       e['role'] = member.member_role.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

+

     return el1
   end
 
     return el1
   end