split_node_tags:

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 5a8e03ef170ca49880524c3541f6598f47d29137..17521428ea260cc9bab6defcdcc9457958968f70 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -96,35 +96,27 @@ class Node < GeoRecord
 
   def save_with_history!
     t = Time.now
 
   def save_with_history!
     t = Time.now

-
-    Node.transaction do 
-      # apply timestamp to the new node
+    Node.transaction do
+      self.version += 1

       self.timestamp = t
       self.save!
       self.timestamp = t
       self.save!

-    end

 
 

-    # Create a NodeTag
-    NodeTag.transaction do 
+      # Create a NodeTag

       tags = self.tags
       tags = self.tags

-

       NodeTag.delete_all(['id = ?', self.id])
       NodeTag.delete_all(['id = ?', self.id])

-
-      sequence_id = 1

       tags.each do |k,v|
       tags.each do |k,v|

-        tag = NodeTag.new
-        tag.k = k 
-        tag.v = v 
-        tag.id = self.id
-        tag.sequence_id = sequence_id
-        tag.save!
-        sequence_id += 1
+       tag = NodeTag.new
+       tag.k = k 
+       tag.v = v 
+       tag.id = self.id
+       tag.save!

       end 
       end 

-    end 
-    # Create an OldNode
-    old_node = OldNode.from_node(self)
-    old_node.timestamp = t
-    old_node.save_with_dependencies!

 
 

+      # Create an OldNode
+      old_node = OldNode.from_node(self)
+      old_node.timestamp = t
+      old_node.save_with_dependencies!
+    end

   end
 
   def to_xml
   end
 
   def to_xml