Ban (for now at least) searching of nodes, and searching for a key

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index e39a4ceb2f8ab05c56402ffd94e1a32bdef44975..9fb9b89405cdfbc8d0e0067a12d735c30a9707d1 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -232,7 +232,7 @@ class AmfController < ApplicationController
 
   def getway_old(args)
     RAILS_DEFAULT_LOGGER.info("  Message: getway_old (server is #{SERVER_URL})")
-       if SERVER_URL=="www.openstreetmap.org" then return -1,"Revert is not currently enabled on the OpenStreetMap server." end
+#      if SERVER_URL=="www.openstreetmap.org" then return -1,"Revert is not currently enabled on the OpenStreetMap server." end
        
     objname,wayid,version,baselong,basey,masterscale=args
     wayid = wayid.to_i
@@ -279,7 +279,7 @@ class AmfController < ApplicationController
        EOF
        histlist=ActiveRecord::Base.connection.select_all(sql)
        histlist.each { |row|
-               if row['data_public'] then user=row['display_name'] else user='anonymous' end
+               if row['data_public'].to_i==1 then user=row['display_name'] else user='anonymous' end
                history<<[row['version'],row['timestamp'],row['visible'],user]
        }
        [history]
@@ -409,7 +409,7 @@ class AmfController < ApplicationController
     ActiveRecord::Base.connection.update(sql)
 
        deleteuniquenoderelations(db_uqn,uid,db_now)
-    ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqn}")
+    ActiveRecord::Base.connection.execute("DROP TEMPORARY TABLE #{db_uqn}")
 
        #       6b. insert new version of route into way_nodes
 
@@ -541,7 +541,7 @@ class AmfController < ApplicationController
     ActiveRecord::Base.connection.update(sql)
 
        deleteuniquenoderelations(db_uqn,uid,db_now)
-    ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqn}")
+    ActiveRecord::Base.connection.execute("DROP TEMPORARY TABLE #{db_uqn}")
 
     # - delete way