Railsify relation selection (aka ripping out the f***in SQL).

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 464849157b90504aa7f25722be0dcb85fbabf931..891b89731ec2062071b06f5605e7442ec971b3f2 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
@@ -36,7 +38,14 @@ class OldNode < GeoRecord
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
     el1['user'] = self.user.display_name if self.user.data_public?
-    Node.split_tags(el1, self.tags)
+
+    Tags.split(self.tags) do |k,v|
+      el2 = XML::Node.new('tag')
+      el2['k'] = k.to_s
+      el2['v'] = v.to_s
+      el1 << el2
+    end
+
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     return el1