nicer fix I think for nil / [] issue

[rails.git] / app / controllers / node_controller.rb

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index a783ea9e6989c7a4429d5195e715d2a268e26802..edc3675e58382fce0b8b5801a2e7180ab280cec2 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,200 +1,111 @@
+# The NodeController is the RESTful interface to Node objects
+

 class NodeController < ApplicationController
   require 'xml/libxml'
 class NodeController < ApplicationController
   require 'xml/libxml'

-  
-  before_filter :authorize
-
-  def create
-#    @node = Node.new
-#    @node.id = 1
-#    @node.latitude = 1
-#    @node.save
-
-    if request.putt?
-      @txt = resp.body
-    end
-  end
-
-  def dummy
-    if request.post?
-      userid = dao.useridfromcreds(r.user, r.get_basic_auth_pw)
-      doc = Document.new $stdin.read

 
 

-      doc.elements.each('osm/node') do |pt|
-        lat = pt.attributes['lat'].to_f
-        lon = pt.attributes['lon'].to_f
-        xmlnodeid = pt.attributes['id'].to_i
+  session :off
+  before_filter :authorize, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
+  after_filter :compress_output

 
 

-        tags = []
-        pt.elements.each('tag') do |tag|
-          tags << [tag.attributes['k'],tag.attributes['v']]
-        end
+  # Create a node from XML.
+  def create
+    if request.put?
+      node = Node.from_xml(request.raw_post, true)

 
 

-        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-
-        tags = '' unless tags
-        if xmlnodeid == nodeid && userid != 0
-          if nodeid == 0
-            new_node_id = dao.create_node(lat, lon, userid, tags)
-            if new_node_id
-              puts new_node_id
-              exit
-            else
-              exit HTTP_INTERNAL_SERVER_ERROR
-            end
-          else
-            node = dao.getnode(nodeid)
-            if node
-              #FIXME: need to check the node hasn't moved too much
-              if dao.update_node?(nodeid, userid, lat, lon, tags)
-                exit
-              else
-                exit HTTP_INTERNAL_SERVER_ERROR
-              end
-            else
-              exit HTTP_NOT_FOUND
-            end
-          end
+      if node
+        node.user_id = @user.id
+        node.visible = true
+        node.save_with_history!

 
 

-        else
-          exit BAD_REQUEST
-        end
+        render :text => node.id.to_s, :content_type => "text/plain"
+      else
+        render :nothing => true, :status => :bad_request

       end
       end

-      exit HTTP_INTERNAL_SERVER_ERROR
-
-
+    else
+      render :nothing => true, :status => :method_not_allowed

     end
   end
 
     end
   end
 

-
-  def rest
-
-    #
-    # POST ???
-    #
-
-    if request.post?
-      nodeid = r.args.match(/nodeid=([0-9]+)/).captures.first.to_i
-      userid = dao.useridfromcreds(r.user, r.get_basic_auth_pw)
-      doc = Document.new $stdin.read
-
-      doc.elements.each('osm/node') do |pt|
-        lat = pt.attributes['lat'].to_f
-        lon = pt.attributes['lon'].to_f
-        xmlnodeid = pt.attributes['id'].to_i
-
-        tags = []
-        pt.elements.each('tag') do |tag|
-          tags << [tag.attributes['k'],tag.attributes['v']]
-        end
-
-        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-
-        tags = '' unless tags
-        if xmlnodeid == nodeid && userid != 0
-          if nodeid == 0
-            new_node_id = dao.create_node(lat, lon, userid, tags)
-            if new_node_id
-              puts new_node_id
-              exit
-            else
-              exit HTTP_INTERNAL_SERVER_ERROR
-            end
-          else
-            node = dao.getnode(nodeid)
-            if node
-              #FIXME: need to check the node hasn't moved too much
-              if dao.update_node?(nodeid, userid, lat, lon, tags)
-                exit
-              else
-                exit HTTP_INTERNAL_SERVER_ERROR
-              end
-            else
-              exit HTTP_NOT_FOUND
-            end
-          end
-
-        else
-          exit BAD_REQUEST
-        end
+  # Dump the details on a node given in params[:id]
+  def read
+    begin
+      node = Node.find(params[:id])
+      if node.visible
+        response.headers['Last-Modified'] = node.timestamp.rfc822
+        render :text => node.to_xml.to_s, :content_type => "text/xml"
+       else
+        render :text => "", :status => :gone

       end
       end

-      exit HTTP_INTERNAL_SERVER_ERROR
-
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
     end

+  end

 
 

-    #
-    # GET ???
-    #
-
-    if request.get?
-      node = node.find(params[:id])
-      doc = Document.new
-      doc.encoding = "UTF-8"
-      root = Node.new 'osm'
-      root['version'] = '0.4'
-      root['generator'] = 'OpenStreetMap server'
-      doc.root = root
-      el1 = Node.new 'node'
-      el1['id'] = node.id.to_s
-      el1['lat'] = node.latitude.to_s
-      el1['lon'] = node.longitude.to_s
-      split_tags(el1, node.tags)
-      el1['visible'] = node.visible.to_s
-      el1['timestamp'] = node.timestamp
-      root << el1
-
-      render :text => doc.to_s, :template => false
+  # Update a node from given XML
+  def update
+    begin
+      node = Node.find(params[:id])
+      new_node = Node.from_xml(request.raw_post)
+
+      if new_node and new_node.id == node.id
+        node.user_id = @user.id
+        node.latitude = new_node.latitude 
+        node.longitude = new_node.longitude
+        node.tags = new_node.tags
+        node.visible = true
+        node.save_with_history!
+
+        render :nothing => true
+      else
+        render :nothing => true, :status => :bad_request
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
     end

+  end

 
 

-    #
-    # DELETE????
-    # 
-
-    if request.delete?
-      userid = dao.useridfromcreds(r.user, r.get_basic_auth_pw)
-      #cgi doesnt work with DELETE so extract manually:
-      nodeid = r.args.match(/nodeid=([0-9]+)/).captures.first.to_i
-
-      if userid > 0 && nodeid != 0
-        node = dao.getnode(nodeid)
-        if node
-          if node.visible  
-            if dao.delete_node?(nodeid, userid)
-              exit
-            else
-              exit HTTP_INTERNAL_SERVER_ERROR
-            end
-          else
-            exit HTTP_GONE
-          end
+  # Delete a node. Doesn't actually delete it, but retains its history in a wiki-like way.
+  # FIXME remove all the fricking SQL
+  def delete
+    begin
+      node = Node.find(params[:id])
+
+      if node.visible
+        if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", node.id ])
+          render :text => "", :status => :precondition_failed
+        elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", params[:id]])
+          render :text => "", :status => :precondition_failed

         else
         else

-          exit HTTP_NOT_FOUND
+          node.user_id = @user.id
+          node.visible = 0
+          node.save_with_history!
+
+          render :nothing => true

         end
       else
         end
       else

-        exit BAD_REQUEST
-
+        render :text => "", :status => :gone

       end
       end

-
-
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
     end

+  end

 
 

+  # WTF does this do?
+  def nodes
+    ids = params['nodes'].split(',').collect { |n| n.to_i }

 
 

-  end
+    if ids.length > 0
+      doc = OSM::API.new.get_xml_doc

 
 

-  private
-  def split_tags(el, tags)
-    tags.split(';').each do |tag|
-      parts = tag.split('=')
-      key = ''
-      val = ''
-      key = parts[0].strip unless parts[0].nil?
-      val = parts[1].strip unless parts[1].nil?
-      if key != '' && val != ''
-        el2 = Node.new('tag')
-        el2['k'] = key.to_s
-        el2['v'] = val.to_s
-        el << el2
-      end
+      Node.find(ids).each do |node|
+        doc.root << node.to_xml_node
+      end 
+
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :nothing => true, :status => :bad_request

     end
   end
     end
   end

-

 end
 end