use render proc to write out results, see if that makes things faster

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index a783ea9e6989c7a4429d5195e715d2a268e26802..6815470b8f19771599266e906b6e0da1fd88fcf5 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,200 +1,108 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 class NodeController < ApplicationController
   require 'xml/libxml'

-  
+

   before_filter :authorize
   before_filter :authorize

+  after_filter :compress_output

 
   def create
 
   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
-
-        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
-
+    response.headers["Content-Type"] = 'text/xml'
+    if request.put?
+      node = Node.from_xml(request.raw_post, true)
+
+      if node
+        node.user_id = @user.id
+        node.visible = 1
+        if node.save_with_history
+          render :text => node.id.to_s

         else
         else

-          exit BAD_REQUEST
+          render :nothing => true, :status => 500

         end
         end

-      end
-      exit HTTP_INTERNAL_SERVER_ERROR
-
+        return

 
 

+      else
+        render :nothing => true, :status => 400 # if we got here the doc didnt parse
+        return
+      end

     end
     end

-  end

 
 

+    render :nothing => true, :status => 500 # something went very wrong
+  end

 
   def rest
 
   def rest

+    response.headers["Content-Type"] = 'text/xml'
+    unless Node.exists?(params[:id])
+      render :nothing => true, :status => 404
+      return
+    end

 
 

-    #
-    # POST ???
-    #
+    node = Node.find(params[:id])

 
 

-    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
+    case request.method

 
 

-      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
+    when :get
+      unless node
+        render :nothing => true, :status => 500
+        return
+      end

 
 

-        tags = []
-        pt.elements.each('tag') do |tag|
-          tags << [tag.attributes['k'],tag.attributes['v']]
-        end
+      unless node.visible
+        render :nothing => true, :status => 410
+        return
+      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
+      render :text => node.to_xml.to_s
+      return

 
 

+    when :delete
+      if node.visible
+        if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
+          render :nothing => true, :status => HTTP_PRECONDITION_FAILED

         else
         else

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

         end
         end

+      else
+        render :nothing => true, :status => 410

       end
       end

-      exit HTTP_INTERNAL_SERVER_ERROR

 
 

-    end
+    when :put
+      new_node = Node.from_xml(request.raw_post)

 
 

-    #
-    # 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
-    end
+      if new_node
+        node.timestamp = Time.now
+        node.user_id = @user.id

 
 

-    #
-    # 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
+        node.latitude = new_node.latitude 
+        node.longitude = new_node.longitude
+        node.tags = new_node.tags
+
+        if node.id == new_node.id and node.save_with_history
+          render :nothing => true

         else
         else

-          exit HTTP_NOT_FOUND
+          render :nothing => true, :status => 500

         end
       else
         end
       else

-        exit BAD_REQUEST
-
+        render :nothing => true, :status => 400 # if we got here the doc didnt parse

       end
       end

-
-
+      return

     end
 
     end
 

-

   end
 
   end
 

-  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
+  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

-

 end
 end