Make field names consistent with the account editing page.

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 820437fcefbe0211d66b70992437ad2e6a901626..4a5362bc161d486f4be84d4b7f2ef5432009dfb8 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -14,15 +14,26 @@ class OldWay < ActiveRecord::Base
   end
 
   def save_with_dependencies
-    t = Time.now
-    self.timestamp = t
-    self.save
-    
+
+    # dont touch this unless you really have figured out why it's called
+    # (Rails doesn't deal well with the old ways table (called 'ways') because
+    # it doesn't have a unique key. It knows how to insert and auto_increment
+    # id and get it back but we have that and we want to get the 'version' back
+    # we could add another column but thats a lot of data. No, set_primary_key
+    # doesn't work either.
+    save()
+    clear_aggregation_cache
+    clear_association_cache
+    @attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
+
+    # ok, you can touch from here on
+
     self.tags.each do |k,v|
       tag = OldWayTag.new
       tag.k = k
       tag.v = v
       tag.id = self.id
+      tag.version = self.version
       tag.save
     end
 
@@ -31,13 +42,9 @@ class OldWay < ActiveRecord::Base
       seg = OldWaySegment.new
       seg.id = self.id
       seg.segment_id = n
-      seg.sequence_id = i
+      seg.version = self.version
       seg.save
-      i += 1
     end
-
-    old_way = OldWay.from_way(self)
-    old_way.save
   end
 
   def segs
@@ -58,4 +65,36 @@ class OldWay < ActiveRecord::Base
     @tags = t
   end
 
+#  has_many :way_segments, :class_name => 'OldWaySegment', :foreign_key => 'id'
+#  has_many :way_tags, :class_name => 'OldWayTag', :foreign_key => 'id'
+
+  def old_segments
+    OldWaySegment.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
+  end
+
+  def old_tags
+    OldWayTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
+  end
+
+  def to_xml_node
+    el1 = XML::Node.new 'way'
+    el1['id'] = self.id.to_s
+    el1['visible'] = self.visible.to_s
+    el1['timestamp'] = self.timestamp.xmlschema
+    el1['user'] = self.user.display_name if self.user.data_public?
+    
+    self.old_segments.each do |seg| # FIXME need to make sure they come back in the right order
+      e = XML::Node.new 'seg'
+      e['id'] = seg.segment_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
+    return el1
+  end 
 end