Merge changes from trunk 7673:8632.

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 247a699236c46bc76a9dc0e804051a1877709042..76eab8427b2c570cce79846887706eb6c10923b6 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,4 +1,6 @@
-class OldNode < GeoRecord
+class OldNode < ActiveRecord::Base
+  include GeoRecord
+
   set_table_name 'nodes'
   
   validates_presence_of :user_id, :timestamp
@@ -27,7 +29,6 @@ class OldNode < GeoRecord
     old_node.timestamp = node.timestamp
     old_node.user_id = node.user_id
     old_node.id = node.id
-    old_node.version = node.version
     return old_node
   end
 
@@ -38,7 +39,7 @@ class OldNode < GeoRecord
     el1['lon'] = self.lon.to_s
     el1['user'] = self.user.display_name if self.user.data_public?
 
-    self.tags.each do |k,v|
+    Tags.split(self.tags) do |k,v|
       el2 = XML::Node.new('tag')
       el2['k'] = k.to_s
       el2['v'] = v.to_s
@@ -47,41 +48,24 @@ class OldNode < GeoRecord
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    el1['version'] = self.version.to_s
     return el1
   end
-
-  def save_with_dependencies!
-    save!
-    #not sure whats going on here
-    clear_aggregation_cache
-    clear_association_cache
-    #ok from here
-    @attributes.update(OldNode.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
-   
-    self.tags.each do |k,v|
-      tag = OldNodeTag.new
-      tag.k = k
-      tag.v = v
-      tag.id = self.id
-      tag.version = self.version
-      tag.save!
+  
+  def tags_as_hash
+    hash = {}
+    Tags.split(self.tags) do |k,v|
+      hash[k] = v
     end
+    hash
   end
 
-  def tags
-    unless @tags
-        @tags = Hash.new
-        OldNodeTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag|
-            @tags[tag.k] = tag.v
-        end
-    end
-    @tags = Hash.new unless @tags
-    @tags
+  # Pretend we're not in any ways
+  def ways
+    return []
   end
 
-  def tags=(t)
-    @tags = t 
-  end 
-
+  # Pretend we're not in any relations
+  def containing_relation_members
+    return []
+  end
 end