Put back the SOTM advert on the front page, updated for SOTM2008.

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index bb267dffbfd673ec3b53f0703ce46b348adf9dbf..a2b165e42716f5cfa7f095aa76654616274f95b5 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -38,15 +38,13 @@ class OldWay < ActiveRecord::Base
       tag.save!
     end
 
       tag.save!
     end
 

-    i = 1
+    sequence = 1

     self.nds.each do |n|
       nd = OldWayNode.new
     self.nds.each do |n|
       nd = OldWayNode.new

-      nd.id = self.id
+      nd.id = [self.id, self.version, sequence]

       nd.node_id = n
       nd.node_id = n

-      nd.sequence_id = i
-      nd.version = self.version

       nd.save!
       nd.save!

-      i += 1
+      sequence += 1

     end
   end
 
     end
   end
 


@@ -99,7 +97,7 @@ class OldWay < ActiveRecord::Base
     
     self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
       e = XML::Node.new 'nd'
     
     self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
       e = XML::Node.new 'nd'

-      e['id'] = nd.node_id.to_s
+      e['ref'] = nd.node_id.to_s

       el1 << e
     end
  
       el1 << e
     end