Extra check that nodes/segments in ways are visible

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index b104688d38a58632cbadf75779a14eb1a3208e96..cc29c09e52422f90c167fb89734a5067de384bc1 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -2,16 +2,24 @@ class NodeController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
   require 'xml/libxml'
 
   before_filter :authorize

+  after_filter :compress_output

 
 

-  def create
+  def create\r
+    response.headers["Content-Type"] = 'text/xml'

     if request.put?
     if request.put?

-      node = Node.from_xml(request.raw_post, true)
+      node = nil
+      begin
+        node = Node.from_xml(request.raw_post, true)
+      rescue
+        render :text => "XML didn't parse", :status => 400 # if we got here the doc didnt parse
+        return
+      end

 
       if node
         node.user_id = @user.id
 
       if node
         node.user_id = @user.id

+        node.visible = 1

         if node.save_with_history
         if node.save_with_history

-
-          render :text => node.id
+          render :text => node.id.to_s

         else
           render :nothing => true, :status => 500
         end
         else
           render :nothing => true, :status => 500
         end


@@ -27,8 +35,9 @@ class NodeController < ApplicationController
   end
 
   def rest
   end
 
   def rest

+    response.headers["Content-Type"] = 'text/xml'

     unless Node.exists?(params[:id])
     unless Node.exists?(params[:id])

-      render :nothing => true, :status => 400
+      render :nothing => true, :status => 404

       return
     end
 
       return
     end
 


@@ -37,6 +46,16 @@ class NodeController < ApplicationController
     case request.method
 
     when :get
     case request.method
 
     when :get

+      unless node
+        render :nothing => true, :status => 500
+        return
+      end
+
+      unless node.visible
+        render :nothing => true, :status => 410
+        return
+      end
+

       render :text => node.to_xml.to_s
       return
 
       render :text => node.to_xml.to_s
       return
 


@@ -68,4 +87,19 @@ class NodeController < ApplicationController
     end
 
   end
     end
 
   end

+
+  def nodes
+    response.headers["Content-Type"] = 'text/xml'
+    ids = params['nodes'].split(',').collect {|n| n.to_i }
+    if ids.length > 0
+      nodelist = Node.find(ids)
+      doc = get_xml_doc
+      nodelist.each do |node|
+        doc.root << node.to_xml_node
+      end 
+      render :text => doc.to_s
+    else
+      render :nothing => true, :status => 400
+    end
+  end

 end
 end