Improve blocking of characters not allowed in XML

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 9426b2d2327331e5e5ab7302ce5dc8c9851f89fc..90304acae4c1f9dadbaceaecc37475703648cbdd 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,6 +1,7 @@
 class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
+  include ObjectMetadata
 
   self.table_name = "nodes"
   self.primary_keys = "node_id", "version"
@@ -19,6 +20,8 @@ class OldNode < ActiveRecord::Base
   belongs_to :redaction
   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id"
 
+  has_many :old_tags, :class_name => 'OldNodeTag', :foreign_key => [:node_id, :version]
+
   def validate_position
     errors.add(:base, "Node is not in the world") unless in_world?
   end
@@ -42,32 +45,20 @@ class OldNode < ActiveRecord::Base
     return doc
   end
 
-  def to_xml_node
-    el1 = XML::Node.new 'node'
-    el1['id'] = self.node_id.to_s
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
+    el = XML::Node.new 'node'
+    el['id'] = self.node_id.to_s
 
-    self.tags.each do |k,v|
-      el2 = XML::Node.new('tag')
-      el2['k'] = k.to_s
-      el2['v'] = v.to_s
-      el1 << el2
-    end
-    el1['lat'] = self.lat.to_s
-    el1['lon'] = self.lon.to_s
-    
-    el1['changeset'] = self.changeset.id.to_s
-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
+    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
+
+    if self.visible?
+      el['lat'] = self.lat.to_s
+      el['lon'] = self.lon.to_s
     end
 
-    el1['visible'] = self.visible.to_s
-    el1['timestamp'] = self.timestamp.xmlschema
-    el1['version'] = self.version.to_s
-    
-    el1['redacted'] = self.redaction.id.to_s if self.redacted?
+    add_tags_to_xml_node(el, self.old_tags)
 
-    return el1
+    return el
   end
 
   def save_with_dependencies!
@@ -89,14 +80,7 @@ class OldNode < ActiveRecord::Base
   end
 
   def tags
-    unless @tags
-      @tags = Hash.new
-      OldNodeTag.where(:node_id => self.node_id, :version => self.version).each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags = Hash.new unless @tags
-    @tags
+    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]
   end
 
   def tags=(t)