Split the rest action into sparate read, update and delete actions thus

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index e0086b51da766377c639195d06d9f3e4abbd13dc..1049b51b61d0735cb28d31986815df51c1d1005c 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -34,24 +34,26 @@ class AmfController < ApplicationController
       args=getvalue(req)                               #  | get response (probably an array)
 
       case message
       args=getvalue(req)                               #  | get response (probably an array)
 
       case message

-      when 'getpresets';       results[index]=putdata(index,getpresets)
-      when 'whichways';                results[index]=putdata(index,whichways(args))
-      when 'getway';           results[index]=putdata(index,getway(args))
-      when 'putway';           results[index]=putdata(index,putway(args))
-      when 'deleteway';                results[index]=putdata(index,deleteway(args))
+                 when 'getpresets';    results[index]=putdata(index,getpresets)
+                 when 'whichways';             results[index]=putdata(index,whichways(args))
+                 when 'getway';                results[index]=putdata(index,getway(args))
+                 when 'putway';                results[index]=putdata(index,putway(args))
+                 when 'deleteway';             results[index]=putdata(index,deleteway(args))

       end
     end
 
     # ------------------
     # Write out response
 
       end
     end
 
     # ------------------
     # Write out response
 

-    response.headers["Content-Type"]="application/x-amf"
+    RAILS_DEFAULT_LOGGER.info("  Response: start")

     a,b=results.length.divmod(256)
     a,b=results.length.divmod(256)

-    ans=0.chr+0.chr+0.chr+0.chr+a.chr+b.chr
-    results.each do |k,v|
-      ans+=v
-    end
-    render :text => ans
+       render :content_type => "application/x-amf", :text => proc { |response, output| 
+        output.write 0.chr+0.chr+0.chr+0.chr+a.chr+b.chr
+               results.each do |k,v|
+                 output.write(v)
+               end
+       }
+    RAILS_DEFAULT_LOGGER.info("  Response: end")

 
   end
 
 
   end
 


@@ -70,7 +72,7 @@ class AmfController < ApplicationController
     presettype=''
     presetcategory=''
 
     presettype=''
     presetcategory=''
 

-    ActiveRecord::Base.logger.info("  Message: getpresets")
+    RAILS_DEFAULT_LOGGER.info("  Message: getpresets")

 
     #          File.open("config/potlatch/presets.txt") do |file|
 
 
     #          File.open("config/potlatch/presets.txt") do |file|
 


@@ -175,7 +177,7 @@ EOF
     xmax = args[2].to_f+0.01
     ymax = args[3].to_f+0.01
 
     xmax = args[2].to_f+0.01
     ymax = args[3].to_f+0.01
 

-    ActiveRecord::Base.logger.info("  Message: whichways, bbox=#{xmin},#{ymin},#{xmax},#{ymax}")
+    RAILS_DEFAULT_LOGGER.info("  Message: whichways, bbox=#{xmin},#{ymin},#{xmax},#{ymax}")

 
     waylist=WaySegment.find_by_sql("SELECT DISTINCT current_way_segments.id AS wayid"+
        "  FROM current_way_segments,current_segments,current_nodes,current_ways "+
 
     waylist=WaySegment.find_by_sql("SELECT DISTINCT current_way_segments.id AS wayid"+
        "  FROM current_way_segments,current_segments,current_nodes,current_ways "+


@@ -215,7 +217,7 @@ EOF
     xmin = ymin = 999999
     xmax = ymax = -999999
 
     xmin = ymin = 999999
     xmax = ymax = -999999
 

-    ActiveRecord::Base.logger.info("  Message: getway, id=#{wayid}")
+    RAILS_DEFAULT_LOGGER.info("  Message: getway, id=#{wayid}")

 
     readwayquery(wayid).each {|row|
       xs1=long2coord(row['long1'].to_f,baselong,masterscale); ys1=lat2coord(row['lat1'].to_f,basey,masterscale)
 
     readwayquery(wayid).each {|row|
       xs1=long2coord(row['long1'].to_f,baselong,masterscale); ys1=lat2coord(row['lat1'].to_f,basey,masterscale)


@@ -251,7 +253,7 @@ EOF
     ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
     originalway=originalway.to_i
 
     ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
     originalway=originalway.to_i
 

-    ActiveRecord::Base.logger.info("  Message: putway, id=#{way}")
+    RAILS_DEFAULT_LOGGER.info("  Message: putway, id=#{originalway}")

 
     # -- 3.    read original way into memory
 
 
     # -- 3.    read original way into memory
 


@@ -419,7 +421,7 @@ EOF
   def deleteway(args)
     usertoken,way=args
 
   def deleteway(args)
     usertoken,way=args
 

-    ActiveRecord::Base.logger.info("  Message: deleteway, id=#{way}")
+    RAILS_DEFAULT_LOGGER.info("  Message: deleteway, id=#{way}")

 
     uid=getuserid(usertoken); if !uid then return end
        way=way.to_i
 
     uid=getuserid(usertoken); if !uid then return end
        way=way.to_i