Closes #1350 through updating amf_controller to use the newer closed_at method of...

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 6e1b364d4794dbfef7ebeca2166e354078f1c604..589005d3c16775325e72b50485a026746b94a755 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -45,83 +45,84 @@ class AmfController < ApplicationController
   # ** FIXME: refactor to reduce duplication of code across read/write
   
   def amf_read
   # ** FIXME: refactor to reduce duplication of code across read/write
   
   def amf_read

-       req=StringIO.new(request.raw_post+0.chr)# Get POST data as request
-                                                                                       # (cf http://www.ruby-forum.com/topic/122163)
-       req.read(2)                                                             # Skip version indicator and client ID
-       results={}                                                              # Results of each body
+    req=StringIO.new(request.raw_post+0.chr)# Get POST data as request
+                              # (cf http://www.ruby-forum.com/topic/122163)
+    req.read(2)                                                                # Skip version indicator and client ID
+    results={}                                                         # Results of each body

 
 

-       # Parse request
+    # Parse request

 
 

-       headers=AMF.getint(req)                                 # Read number of headers
+    headers=AMF.getint(req)                                    # Read number of headers

 
 

-       headers.times do                                                # Read each header
-         name=AMF.getstring(req)                               #  |
-         req.getc                                                              #  | skip boolean
-         value=AMF.getvalue(req)                               #  |
-         header["name"]=value                                  #  |
-       end
+    headers.times do                                           # Read each header
+      name=AMF.getstring(req)                          #  |
+      req.getc                                                         #  | skip boolean
+      value=AMF.getvalue(req)                          #  |
+      header["name"]=value                                     #  |
+    end

 
 

-       bodies=AMF.getint(req)                                  # Read number of bodies
-       bodies.times do                                                 # Read each body
-         message=AMF.getstring(req)                    #  | get message name
-         index=AMF.getstring(req)                              #  | get index in response sequence
-         bytes=AMF.getlong(req)                                #  | get total size in bytes
-         args=AMF.getvalue(req)                                #  | get response (probably an array)
+    bodies=AMF.getint(req)                                     # Read number of bodies
+    bodies.times do                                                    # Read each body
+      message=AMF.getstring(req)                       #  | get message name
+      index=AMF.getstring(req)                         #  | get index in response sequence
+      bytes=AMF.getlong(req)                           #  | get total size in bytes
+      args=AMF.getvalue(req)                           #  | get response (probably an array)

       logger.info "Executing AMF #{message}:#{index}"
 
       logger.info "Executing AMF #{message}:#{index}"
 

-         case message
-               when 'getpresets';                      results[index]=AMF.putdata(index,getpresets())
-               when 'whichways';                       results[index]=AMF.putdata(index,whichways(*args))
-               when 'whichways_deleted';       results[index]=AMF.putdata(index,whichways_deleted(*args))
-               when 'getway';                          results[index]=AMF.putdata(index,getway(args[0].to_i))
-               when 'getrelation';                     results[index]=AMF.putdata(index,getrelation(args[0].to_i))
-               when 'getway_old';                      results[index]=AMF.putdata(index,getway_old(args[0].to_i,args[1].to_i))
-               when 'getway_history';          results[index]=AMF.putdata(index,getway_history(args[0].to_i))
-               when 'getnode_history';         results[index]=AMF.putdata(index,getnode_history(args[0].to_i))
-               when 'findgpx';                         results[index]=AMF.putdata(index,findgpx(*args))
-               when 'findrelations';           results[index]=AMF.putdata(index,findrelations(*args))
-               when 'getpoi';                          results[index]=AMF.putdata(index,getpoi(*args))
-         end
-       end
+      case message
+        when 'getpresets';                     results[index]=AMF.putdata(index,getpresets())
+        when 'whichways';                      results[index]=AMF.putdata(index,whichways(*args))
+        when 'whichways_deleted';      results[index]=AMF.putdata(index,whichways_deleted(*args))
+        when 'getway';                         results[index]=AMF.putdata(index,getway(args[0].to_i))
+        when 'getrelation';                    results[index]=AMF.putdata(index,getrelation(args[0].to_i))
+        when 'getway_old';                     results[index]=AMF.putdata(index,getway_old(args[0].to_i,args[1].to_i))
+        when 'getway_history';         results[index]=AMF.putdata(index,getway_history(args[0].to_i))
+        when 'getnode_history';                results[index]=AMF.putdata(index,getnode_history(args[0].to_i))
+        when 'findgpx';                                results[index]=AMF.putdata(index,findgpx(*args))
+        when 'findrelations';          results[index]=AMF.putdata(index,findrelations(*args))
+        when 'getpoi';                         results[index]=AMF.putdata(index,getpoi(*args))
+      end
+    end

     logger.info("encoding AMF results")
     sendresponse(results)
   end
 
   def amf_write
     logger.info("encoding AMF results")
     sendresponse(results)
   end
 
   def amf_write

-       req=StringIO.new(request.raw_post+0.chr)
-       req.read(2)
-       results={}
-       renumberednodes={}                                              # Shared across repeated putways
-       renumberedways={}                                               # Shared across repeated putways
-
-       headers=AMF.getint(req)                                 # Read number of headers
-       headers.times do                                                # Read each header
-         name=AMF.getstring(req)                               #  |
-         req.getc                                                              #  | skip boolean
-         value=AMF.getvalue(req)                               #  |
-         header["name"]=value                                  #  |
-       end
+    req=StringIO.new(request.raw_post+0.chr)
+    req.read(2)
+    results={}
+    renumberednodes={}                                         # Shared across repeated putways
+    renumberedways={}                                          # Shared across repeated putways
+
+    headers=AMF.getint(req)                                    # Read number of headers
+    headers.times do                                           # Read each header
+      name=AMF.getstring(req)                          #  |
+      req.getc                                                         #  | skip boolean
+      value=AMF.getvalue(req)                          #  |
+      header["name"]=value                                     #  |
+    end

 
 

-       bodies=AMF.getint(req)                                  # Read number of bodies
-       bodies.times do                                                 # Read each body
-         message=AMF.getstring(req)                    #  | get message name
-         index=AMF.getstring(req)                              #  | get index in response sequence
-         bytes=AMF.getlong(req)                                #  | get total size in bytes
-         args=AMF.getvalue(req)                                #  | get response (probably an array)
-
-         case message
-               when 'putway';                          r=putway(renumberednodes,*args)
-                                                                       renumberednodes=r[3]
-                                                                       if r[1] != r[2]
-                                                                         renumberedways[r[1]] = r[2]
-                                                                       end
-                                                                       results[index]=AMF.putdata(index,r)
-               when 'putrelation';                     results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
-               when 'deleteway';                       results[index]=AMF.putdata(index,deleteway(*args))
-               when 'putpoi';                          results[index]=AMF.putdata(index,putpoi(*args))
-               when 'startchangeset';          results[index]=AMF.putdata(index,startchangeset(*args))
-         end
-       end
+    bodies=AMF.getint(req)                                     # Read number of bodies
+    bodies.times do                                                    # Read each body
+      message=AMF.getstring(req)                       #  | get message name
+      index=AMF.getstring(req)                         #  | get index in response sequence
+      bytes=AMF.getlong(req)                           #  | get total size in bytes
+      args=AMF.getvalue(req)                           #  | get response (probably an array)
+
+      case message
+        when 'putway';                         
+          r=putway(renumberednodes,*args)
+          renumberednodes=r[3]
+          if r[1] != r[2]
+            renumberedways[r[1]] = r[2]
+          end
+          results[index]=AMF.putdata(index,r)
+        when 'putrelation';                    results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
+        when 'deleteway';                      results[index]=AMF.putdata(index,deleteway(*args))
+        when 'putpoi';                         results[index]=AMF.putdata(index,putpoi(*args))
+        when 'startchangeset';         results[index]=AMF.putdata(index,startchangeset(*args))
+      end
+    end

     sendresponse(results)
   end
 
     sendresponse(results)
   end
 


@@ -130,35 +131,37 @@ class AmfController < ApplicationController
   # Start new changeset
   
   def startchangeset(usertoken, cstags, closeid, closecomment)
   # Start new changeset
   
   def startchangeset(usertoken, cstags, closeid, closecomment)

-       uid = getuserid(usertoken)
-       if !uid then return -1,"You are not logged in, so Potlatch can't write any changes to the database." end
-
-       # close previous changeset and add comment
-       if closeid
-         cs = Changeset.find(closeid)
-         cs.open = false
-         if closecomment.empty?
-               cs.save!
-         else
-           cs.tags['comment']=closecomment
-           cs.save_with_tags!
-         end
-       end
+    uid = getuserid(usertoken)
+    if !uid then return -1,"You are not logged in, so Potlatch can't write any changes to the database." end
+
+    # close previous changeset and add comment
+    if closeid
+      cs = Changeset.find(closeid)
+      cs.set_closed_time_now
+      if closecomment.empty?
+        cs.save!
+      else
+        cs.tags['comment']=closecomment
+        cs.save_with_tags!
+      end
+    end

        
        

-       # open a new changeset
-       cs = Changeset.new
-       cs.tags = cstags
-       cs.user_id = uid
-       cs.created_at = Time.now
-       cs.save_with_tags!
-       return [0,cs.id]
+    # open a new changeset
+    cs = Changeset.new
+    cs.tags = cstags
+    cs.user_id = uid
+    # Don't like the next two lines. These need to be abstracted to the model more/better
+    cs.created_at = Time.now
+    cs.closed_at = Time.new + Changeset::IDLE_TIMEOUT
+    cs.save_with_tags!
+    return [0,cs.id]

   end
 
   # Return presets (default tags, localisation etc.):
   # uses POTLATCH_PRESETS global, set up in OSM::Potlatch.
 
   def getpresets() #:doc:
   end
 
   # Return presets (default tags, localisation etc.):
   # uses POTLATCH_PRESETS global, set up in OSM::Potlatch.
 
   def getpresets() #:doc:

-       return POTLATCH_PRESETS
+    return POTLATCH_PRESETS

   end
 
   # Find all the ways, POI nodes (i.e. not part of ways), and relations
   end
 
   # Find all the ways, POI nodes (i.e. not part of ways), and relations


@@ -166,8 +169,8 @@ class AmfController < ApplicationController
   # are IDs only. 
 
   def whichways(xmin, ymin, xmax, ymax) #:doc:
   # are IDs only. 
 
   def whichways(xmin, ymin, xmax, ymax) #:doc:

-       xmin -= 0.01; ymin -= 0.01
-       xmax += 0.01; ymax += 0.01
+    xmin -= 0.01; ymin -= 0.01
+    xmax += 0.01; ymax += 0.01

     
     # check boundary is sane and area within defined
     # see /config/application.yml
     
     # check boundary is sane and area within defined
     # see /config/application.yml


@@ -177,37 +180,37 @@ class AmfController < ApplicationController
       return [-2,"Sorry - I can't get the map for that area."]
     end
 
       return [-2,"Sorry - I can't get the map for that area."]
     end
 

-       if POTLATCH_USE_SQL then
-         ways = sql_find_ways_in_area(xmin, ymin, xmax, ymax)
-         points = sql_find_pois_in_area(xmin, ymin, xmax, ymax)
-         relations = sql_find_relations_in_area_and_ways(xmin, ymin, xmax, ymax, ways.collect {|x| x[0]})
-       else
-         # find the way ids in an area
-         nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_nodes.visible = ?", true], :include => :ways)
-         ways = nodes_in_area.collect { |node| 
-               node.ways.collect { |w| [w.id,w.version] }.flatten
-         }.uniq
-         ways.delete([])
-
-         # find the node ids in an area that aren't part of ways
-         nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? }
-         points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags] }
-
-         # find the relations used by those nodes and ways
-         relations = Relation.find_for_nodes(nodes_in_area.collect { |n| n.id }, :conditions => {:visible => true}) +
+    if POTLATCH_USE_SQL then
+      ways = sql_find_ways_in_area(xmin, ymin, xmax, ymax)
+      points = sql_find_pois_in_area(xmin, ymin, xmax, ymax)
+      relations = sql_find_relations_in_area_and_ways(xmin, ymin, xmax, ymax, ways.collect {|x| x[0]})
+    else
+      # find the way ids in an area
+      nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_nodes.visible = ?", true], :include => :ways)
+      ways = nodes_in_area.collect { |node| 
+        node.ways.collect { |w| [w.id,w.version] }.flatten
+      }.uniq
+      ways.delete([])
+
+      # find the node ids in an area that aren't part of ways
+      nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? }
+      points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags] }
+
+      # find the relations used by those nodes and ways
+      relations = Relation.find_for_nodes(nodes_in_area.collect { |n| n.id }, :conditions => {:visible => true}) +

                   Relation.find_for_ways(ways.collect { |w| w[0] }, :conditions => {:visible => true})
                   Relation.find_for_ways(ways.collect { |w| w[0] }, :conditions => {:visible => true})

-         relations = relations.collect { |relation| [relation.id,relation.version] }.uniq
-       end
+      relations = relations.collect { |relation| [relation.id,relation.version] }.uniq
+    end

 
 

-       [0,ways, points, relations]
+    [0,ways, points, relations]

   end
 
   # Find deleted ways in current bounding box (similar to whichways, but ways
   # with a deleted node only - not POIs or relations).
 
   def whichways_deleted(xmin, ymin, xmax, ymax) #:doc:
   end
 
   # Find deleted ways in current bounding box (similar to whichways, but ways
   # with a deleted node only - not POIs or relations).
 
   def whichways_deleted(xmin, ymin, xmax, ymax) #:doc:

-       xmin -= 0.01; ymin -= 0.01
-       xmax += 0.01; ymax += 0.01
+    xmin -= 0.01; ymin -= 0.01
+    xmax += 0.01; ymax += 0.01

 
     # check boundary is sane and area within defined
     # see /config/application.yml
 
     # check boundary is sane and area within defined
     # see /config/application.yml


@@ -217,43 +220,43 @@ class AmfController < ApplicationController
       return [-2,"Sorry - I can't get the map for that area."]
     end
 
       return [-2,"Sorry - I can't get the map for that area."]
     end
 

-       nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history)
-       way_ids = nodes_in_area.collect { |node| node.ways_via_history_ids }.flatten.uniq
+    nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history)
+    way_ids = nodes_in_area.collect { |node| node.ways_via_history_ids }.flatten.uniq

 
 

-       [0,way_ids]
+    [0,way_ids]

   end
 
   # Get a way including nodes and tags.
   # Returns the way id, a Potlatch-style array of points, a hash of tags, and the version number.
 
   def getway(wayid) #:doc:
   end
 
   # Get a way including nodes and tags.
   # Returns the way id, a Potlatch-style array of points, a hash of tags, and the version number.
 
   def getway(wayid) #:doc:

-       if POTLATCH_USE_SQL then
-         points = sql_get_nodes_in_way(wayid)
-         tags = sql_get_tags_in_way(wayid)
-         version = sql_get_way_version(wayid)
-       else
-         # Ideally we would do ":include => :nodes" here but if we do that
-         # then rails only seems to return the first copy of a node when a
-         # way includes a node more than once
-      begin
-           way = Way.find(wayid)
-      rescue ActiveRecord::RecordNotFound
-        return [wayid,[],{}]
+    if POTLATCH_USE_SQL then
+      points = sql_get_nodes_in_way(wayid)
+      tags = sql_get_tags_in_way(wayid)
+      version = sql_get_way_version(wayid)
+      else
+        # Ideally we would do ":include => :nodes" here but if we do that
+        # then rails only seems to return the first copy of a node when a
+        # way includes a node more than once
+        begin
+          way = Way.find(wayid)
+        rescue ActiveRecord::RecordNotFound
+          return [wayid,[],{}]
+        end
+
+        # check case where way has been deleted or doesn't exist
+        return [wayid,[],{}] if way.nil? or !way.visible
+
+        points = way.nodes.collect do |node|
+        nodetags=node.tags
+        nodetags.delete('created_by')
+        [node.lon, node.lat, node.id, nodetags]

       end
       end

+      tags = way.tags
+      version = way.version
+    end

 
 

-      # check case where way has been deleted or doesn't exist
-      return [wayid,[],{}] if way.nil? or !way.visible
-
-         points = way.nodes.collect do |node|
-               nodetags=node.tags
-               nodetags.delete('created_by')
-               [node.lon, node.lat, node.id, nodetags]
-         end
-         tags = way.tags
-         version = way.version
-       end
-
-       [wayid, points, tags, version]
+    [wayid, points, tags, version]

   end
 
   # Get an old version of a way, and all constituent nodes.
   end
 
   # Get an old version of a way, and all constituent nodes.


@@ -272,20 +275,20 @@ class AmfController < ApplicationController
   # 5. is this the current, visible version? (boolean)
 
   def getway_old(id, version) #:doc:
   # 5. is this the current, visible version? (boolean)
 
   def getway_old(id, version) #:doc:

-       if version < 0
-         old_way = OldWay.find(:first, :conditions => ['visible = ? AND id = ?', true, id], :order => 'version DESC')
-         points = old_way.get_nodes_undelete unless old_way.nil?
-       else
-         old_way = OldWay.find(:first, :conditions => ['id = ? AND version = ?', id, version])
-         points = old_way.get_nodes_revert unless old_way.nil?
-       end
+    if version < 0
+      old_way = OldWay.find(:first, :conditions => ['visible = ? AND id = ?', true, id], :order => 'version DESC')
+      points = old_way.get_nodes_undelete unless old_way.nil?
+    else
+      old_way = OldWay.find(:first, :conditions => ['id = ? AND version = ?', id, version])
+      points = old_way.get_nodes_revert unless old_way.nil?
+    end

 
     if old_way.nil?
       return [-1, id, [], {}, -1,0]
     else
 
     if old_way.nil?
       return [-1, id, [], {}, -1,0]
     else

-         curway=Way.find(id)
-         old_way.tags['history'] = "Retrieved from v#{old_way.version}"
-         return [0, id, points, old_way.tags, old_way.version, (curway.version==old_way.version and curway.visible)]
+      curway=Way.find(id)
+      old_way.tags['history'] = "Retrieved from v#{old_way.version}"
+      return [0, id, points, old_way.tags, old_way.version, (curway.version==old_way.version and curway.visible)]

     end
   end
   
     end
   end
   


@@ -294,14 +297,14 @@ class AmfController < ApplicationController
 
   def getway_history(wayid) #:doc:
     begin
 
   def getway_history(wayid) #:doc:
     begin

-         history = Way.find(wayid).old_ways.reverse.collect do |old_way|
+      history = Way.find(wayid).old_ways.reverse.collect do |old_way|

         user_object = old_way.changeset.user
         user_object = old_way.changeset.user

-           user = user_object.data_public? ? user_object.display_name : 'anonymous'
-           uid  = user_object.data_public? ? user_object.id : 0
-           [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid]
-         end
+        user = user_object.data_public? ? user_object.display_name : 'anonymous'
+        uid  = user_object.data_public? ? user_object.id : 0
+        [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid]
+      end

 
 

-         return ['way',wayid,history]
+      return ['way',wayid,history]

     rescue ActiveRecord::RecordNotFound
       return ['way', wayid, []]
     end
     rescue ActiveRecord::RecordNotFound
       return ['way', wayid, []]
     end


@@ -314,12 +317,12 @@ class AmfController < ApplicationController
     begin
          history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
         user_object = old_node.changeset.user
     begin
          history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
         user_object = old_node.changeset.user

-           user = user_object.data_public? ? user_object.display_name : 'anonymous'
-           uid  = user_object.data_public? ? user_object.id : 0
-           [old_node.version, old_node.timestamp.strftime("%d %b %Y, %H:%M"), old_node.visible ? 1 : 0, user, uid]
-         end
+        user = user_object.data_public? ? user_object.display_name : 'anonymous'
+        uid  = user_object.data_public? ? user_object.id : 0
+        [old_node.version, old_node.timestamp.strftime("%d %b %Y, %H:%M"), old_node.visible ? 1 : 0, user, uid]
+      end

 
 

-         return ['node',nodeid,history]
+      return ['node',nodeid,history]

     rescue ActiveRecord::RecordNotFound
       return ['node', nodeid, []]
     end
     rescue ActiveRecord::RecordNotFound
       return ['node', nodeid, []]
     end


@@ -329,21 +332,21 @@ class AmfController < ApplicationController
   # Returns array listing GPXs, each one comprising id, name and description.
   
   def findgpx(searchterm, usertoken)
   # Returns array listing GPXs, each one comprising id, name and description.
   
   def findgpx(searchterm, usertoken)

-       uid = getuserid(usertoken)
-       if !uid then return -1,"You must be logged in to search for GPX traces." end
-
-       gpxs = []
-       if searchterm.to_i>0 then
-         gpx = Trace.find(searchterm.to_i, :conditions => ["visible=? AND (public=? OR user_id=?)",true,true,uid] )
-         if gpx then
-           gpxs.push([gpx.id, gpx.name, gpx.description])
-         end
-       else
-         Trace.find(:all, :limit => 21, :conditions => ["visible=? AND (public=? OR user_id=?) AND MATCH(name) AGAINST (?)",true,true,uid,searchterm] ).each do |gpx|
-               gpxs.push([gpx.id, gpx.name, gpx.description])
+    uid = getuserid(usertoken)
+    if !uid then return -1,"You must be logged in to search for GPX traces." end
+
+    gpxs = []
+    if searchterm.to_i>0 then
+      gpx = Trace.find(searchterm.to_i, :conditions => ["visible=? AND (public=? OR user_id=?)",true,true,uid] )
+      if gpx then
+        gpxs.push([gpx.id, gpx.name, gpx.description])
+      end
+    else
+      Trace.find(:all, :limit => 21, :conditions => ["visible=? AND (public=? OR user_id=?) AND MATCH(name) AGAINST (?)",true,true,uid,searchterm] ).each do |gpx|
+      gpxs.push([gpx.id, gpx.name, gpx.description])

          end
        end
          end
        end

-       gpxs
+    gpxs

   end
 
   # Get a relation with all tags and members.
   end
 
   # Get a relation with all tags and members.


@@ -355,33 +358,33 @@ class AmfController < ApplicationController
   
   def getrelation(relid) #:doc:
     begin
   
   def getrelation(relid) #:doc:
     begin

-         rel = Relation.find(relid)
+      rel = Relation.find(relid)

     rescue ActiveRecord::RecordNotFound
       return [relid, {}, []]
     end
 
     return [relid, {}, [], nil] if rel.nil? or !rel.visible
     rescue ActiveRecord::RecordNotFound
       return [relid, {}, []]
     end
 
     return [relid, {}, [], nil] if rel.nil? or !rel.visible

-       [relid, rel.tags, rel.members, rel.version]
+    [relid, rel.tags, rel.members, rel.version]

   end
 
   # Find relations with specified name/id.
   # Returns array of relations, each in same form as getrelation.
   
   def findrelations(searchterm)
   end
 
   # Find relations with specified name/id.
   # Returns array of relations, each in same form as getrelation.
   
   def findrelations(searchterm)

-       rels = []
-       if searchterm.to_i>0 then
-         rel = Relation.find(searchterm.to_i)
-         if rel and rel.visible then
-           rels.push([rel.id, rel.tags, rel.members])
-         end
-       else
-         RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
-               if t.relation.visible then
+    rels = []
+    if searchterm.to_i>0 then
+      rel = Relation.find(searchterm.to_i)
+      if rel and rel.visible then
+        rels.push([rel.id, rel.tags, rel.members])
+      end
+    else
+      RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
+      if t.relation.visible then

              rels.push([t.relation.id, t.relation.tags, t.relation.members])
            end
          end
        end
              rels.push([t.relation.id, t.relation.tags, t.relation.members])
            end
          end
        end

-       rels
+    rels

   end
 
   # Save a relation.
   end
 
   # Save a relation.


@@ -391,50 +394,50 @@ class AmfController < ApplicationController
   # 2. new relation id.
 
   def putrelation(renumberednodes, renumberedways, usertoken, changeset, relid, tags, members, visible) #:doc:
   # 2. new relation id.
 
   def putrelation(renumberednodes, renumberedways, usertoken, changeset, relid, tags, members, visible) #:doc:

-       uid = getuserid(usertoken)
-       if !uid then return -1,"You are not logged in, so the relation could not be saved." end
-
-       relid = relid.to_i
-       visible = (visible.to_i != 0)
-
-       # create a new relation, or find the existing one
-       if relid <= 0
-         rel = Relation.new
-         rel.version = 0
-       else
-         rel = Relation.find(relid)
-       end
+    uid = getuserid(usertoken)
+    if !uid then return -1,"You are not logged in, so the relation could not be saved." end

 
 

-       # check the members are all positive, and correctly type
-       typedmembers = []
-       members.each do |m|
-         mid = m[1].to_i
-         if mid < 0
-               mid = renumberednodes[mid] if m[0] == 'node'
-               mid = renumberedways[mid] if m[0] == 'way'
-         end
+    relid = relid.to_i
+    visible = (visible.to_i != 0)
+
+    # create a new relation, or find the existing one
+    if relid <= 0
+      rel = Relation.new
+      rel.version = 0
+    else
+      rel = Relation.find(relid)
+    end
+
+    # check the members are all positive, and correctly type
+    typedmembers = []
+    members.each do |m|
+      mid = m[1].to_i
+      if mid < 0
+        mid = renumberednodes[mid] if m[0] == 'node'
+        mid = renumberedways[mid] if m[0] == 'way'
+      end

       if mid
       if mid

-           typedmembers << [m[0], mid, m[2]]
-         end
-       end
+        typedmembers << [m[0], mid, m[2]]
+      end
+    end

 
 

-       # assign new contents
-       rel.members = typedmembers
-       rel.tags = tags
-       rel.visible = visible
-       rel.changeset_id = changeset
+    # assign new contents
+    rel.members = typedmembers
+    rel.tags = tags
+    rel.visible = visible
+    rel.changeset_id = changeset

 
 

-       # check it then save it
-       # BUG: the following is commented out because it always fails on my
-       #  install. I think it's a Rails bug.
+    # check it then save it
+    # BUG: the following is commented out because it always fails on my
+    #  install. I think it's a Rails bug.

 
 

-       #if !rel.preconditions_ok?
-       #  return -2, "Relation preconditions failed"
-       #else
-         rel.save_with_history!
-       #end
+    #if !rel.preconditions_ok?
+    #  return -2, "Relation preconditions failed"
+    #else
+    rel.save_with_history!
+    #end

 
 

-       [0, relid, rel.id]
+    [0, relid, rel.id]

   end
 
   # Save a way to the database, including all nodes. Any nodes in the previous
   end
 
   # Save a way to the database, including all nodes. Any nodes in the previous


@@ -449,98 +452,98 @@ class AmfController < ApplicationController
 
   def putway(renumberednodes, usertoken, changeset, originalway, points, attributes) #:doc:
 
 
   def putway(renumberednodes, usertoken, changeset, originalway, points, attributes) #:doc:
 

-       # -- Initialise and carry out checks
+    # -- Initialise and carry out checks

        
        

-       uid = getuserid(usertoken)
-       if !uid then return -1,"You are not logged in, so the way could not be saved." end
+    uid = getuserid(usertoken)
+    if !uid then return -1,"You are not logged in, so the way could not be saved." end

 
 

-       originalway = originalway.to_i
+    originalway = originalway.to_i

 
 

-       points.each do |a|
-         if a[2] == 0 or a[2].nil? then return -2,"Server error - node with id 0 found in way #{originalway}." end
-         if a[1] == 90 then return -2,"Server error - node with lat -90 found in way #{originalway}." end
-       end
+    points.each do |a|
+      if a[2] == 0 or a[2].nil? then return -2,"Server error - node with id 0 found in way #{originalway}." end
+      if a[1] == 90 then return -2,"Server error - node with lat -90 found in way #{originalway}." end
+    end

 
 

-       if points.length < 2 then return -2,"Server error - way is only #{points.length} points long." end
+    if points.length < 2 then return -2,"Server error - way is only #{points.length} points long." end

 
 

-       # -- Get unique nodes
+    # -- Get unique nodes

 
 

-       if originalway < 0
-         way = Way.new
-         way.version = 0       # otherwise +=1 breaks
-         uniques = []
-       else
-         way = Way.find(originalway)
-         uniques = way.unshared_node_ids
-       end
+    if originalway < 0
+      way = Way.new
+      way.version = 0  # otherwise +=1 breaks
+      uniques = []
+    else
+      way = Way.find(originalway)
+      uniques = way.unshared_node_ids
+    end

 
 

-       # -- Compare nodes and save changes to any that have changed
-
-       nodes = []
-
-       points.each do |n|
-         lon = n[0].to_f
-         lat = n[1].to_f
-         id = n[2].to_i
-         savenode = false
-
-         if renumberednodes[id]
-           id = renumberednodes[id]
-         elsif id < 0
-               # Create new node
-               node = Node.new
-               node.version = 0        # otherwise +=1 breaks
-               savenode = true
-         else
-               node = Node.find(id)
-               nodetags=node.tags
-               nodetags.delete('created_by')
-               if !fpcomp(lat, node.lat) or !fpcomp(lon, node.lon) or
-                  n[4] != nodetags or !node.visible?
-                 savenode = true
-               end
-         end
+    # -- Compare nodes and save changes to any that have changed
+
+    nodes = []
+
+    points.each do |n|
+      lon = n[0].to_f
+      lat = n[1].to_f
+      id = n[2].to_i
+      savenode = false
+
+      if renumberednodes[id]
+        id = renumberednodes[id]
+      elsif id < 0
+        # Create new node
+        node = Node.new
+        node.version = 0       # otherwise +=1 breaks
+        savenode = true
+      else
+        node = Node.find(id)
+        nodetags=node.tags
+        nodetags.delete('created_by')
+        if !fpcomp(lat, node.lat) or !fpcomp(lon, node.lon) or
+           n[4] != nodetags or !node.visible?
+          savenode = true
+        end
+      end

 
 

-         if savenode
-               node.changeset_id = changeset
-           node.lat = lat
+      if savenode
+        node.changeset_id = changeset
+        node.lat = lat

         node.lon = lon
         node.lon = lon

-           node.tags = n[4]
-           node.visible = true
-           node.save_with_history!
-
-               if id != node.id
-                 renumberednodes[id] = node.id
-                 id = node.id
-           end
-         end
+        node.tags = n[4]
+        node.visible = true
+        node.save_with_history!
+
+        if id != node.id
+          renumberednodes[id] = node.id
+          id = node.id
+        end
+      end

 
 

-         uniques = uniques - [id]
-         nodes.push(id)
-       end
+      uniques = uniques - [id]
+      nodes.push(id)
+    end

 
 

-       # -- Delete any unique nodes
+    # -- Delete any unique nodes

        
        

-       uniques.each do |n|
-         deleteitemrelations(n, 'node')
+    uniques.each do |n|
+      deleteitemrelations(n, 'node')

 
 

-         node = Node.find(n)
-         node.changeset_id = changeset
-         node.visible = false
-         node.save_with_history!
-       end
+      node = Node.find(n)
+      node.changeset_id = changeset
+      node.visible = false
+      node.save_with_history!
+    end

 
 

-       # -- Save revised way
+    # -- Save revised way

 
 

-       if way.tags!=attributes or way.nds!=nodes or !way.visible?
-         way.tags = attributes
-         way.nds = nodes
-         way.changeset_id = changeset
-         way.visible = true
-         way.save_with_history!
-       end
+    if way.tags!=attributes or way.nds!=nodes or !way.visible?
+      way.tags = attributes
+      way.nds = nodes
+      way.changeset_id = changeset
+      way.visible = true
+      way.save_with_history!
+    end

 
 

-       [0, originalway, way.id, renumberednodes, way.version]
+    [0, originalway, way.id, renumberednodes, way.version]

   end
 
   # Save POI to the database.
   end
 
   # Save POI to the database.


@@ -552,32 +555,32 @@ class AmfController < ApplicationController
   # 3. version.
 
   def putpoi(usertoken, changeset, id, lon, lat, tags, visible) #:doc:
   # 3. version.
 
   def putpoi(usertoken, changeset, id, lon, lat, tags, visible) #:doc:

-       uid = getuserid(usertoken)
-       if !uid then return -1,"You are not logged in, so the point could not be saved." end
+    uid = getuserid(usertoken)
+    if !uid then return -1,"You are not logged in, so the point could not be saved." end

 
 

-       id = id.to_i
-       visible = (visible.to_i == 1)
+    id = id.to_i
+    visible = (visible.to_i == 1)

 
 

-       if id > 0 then
-         node = Node.find(id)
+    if id > 0 then
+      node = Node.find(id)

 
 

-         if !visible then
-           unless node.ways.empty? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end
-           deleteitemrelations(id, 'node')
-         end
-       else
-         node = Node.new
-         node.version = 0
-       end
+      if !visible then
+        unless node.ways.empty? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end
+        deleteitemrelations(id, 'node')
+      end
+    else
+      node = Node.new
+      node.version = 0
+    end

 
 

-       node.changeset_id = changeset
-       node.lat = lat
-       node.lon = lon
-       node.tags = tags
-       node.visible = visible
-       node.save_with_history!
+    node.changeset_id = changeset
+    node.lat = lat
+    node.lon = lon
+    node.tags = tags
+    node.visible = visible
+    node.save_with_history!

 
 

-       [0, id, node.id, node.version]
+    [0, id, node.id, node.version]

   end
 
   # Read POI from database
   end
 
   # Read POI from database


@@ -586,38 +589,38 @@ class AmfController < ApplicationController
   # Returns array of id, long, lat, hash of tags, version.
 
   def getpoi(id,version) #:doc:
   # Returns array of id, long, lat, hash of tags, version.
 
   def getpoi(id,version) #:doc:

-       if version>0 then
-         n = OldNode.find(id, :conditions=>['version=?',version])
-       else
-         n = Node.find(id)
-       end
+    if version>0 then
+        n = OldNode.find(id, :conditions=>['version=?',version])
+    else
+      n = Node.find(id)
+    end

 
 

-       if n
-         return [n.id, n.lon, n.lat, n.tags, n.version]
-       else
-         return [nil, nil, nil, {}, nil]
-       end
+    if n
+      return [n.id, n.lon, n.lat, n.tags, n.version]
+    else
+      return [nil, nil, nil, {}, nil]
+    end

   end
 
   # Delete way and all constituent nodes. Also removes from any relations.
   # Returns 0 (success), unchanged way id.
 
   def deleteway(usertoken, changeset_id, way_id) #:doc:
   end
 
   # Delete way and all constituent nodes. Also removes from any relations.
   # Returns 0 (success), unchanged way id.
 
   def deleteway(usertoken, changeset_id, way_id) #:doc:

-       if !getuserid(usertoken) then return -1,"You are not logged in, so the way could not be deleted." end
+    if !getuserid(usertoken) then return -1,"You are not logged in, so the way could not be deleted." end

 
 

-       way_id = way_id.to_i
+    way_id = way_id.to_i

 
 

-       # FIXME: would be good not to make two history entries when removing
-       #                two nodes from the same relation
-       way = Way.find(way_id)
-       way.unshared_node_ids.each do |n|
-         deleteitemrelations(n, 'node')
-       end
-       deleteitemrelations(way_id, 'way')
+    # FIXME: would be good not to make two history entries when removing
+    #           two nodes from the same relation
+    way = Way.find(way_id)
+    way.unshared_node_ids.each do |n|
+      deleteitemrelations(n, 'node')
+    end
+    deleteitemrelations(way_id, 'way')

 
 

-       way.delete_with_relations_and_nodes_and_history(changeset_id.to_i)
+    way.delete_with_relations_and_nodes_and_history(changeset_id.to_i)

 
 

-       [0, way_id]
+    [0, way_id]

   end
 
 
   end
 
 


@@ -627,59 +630,59 @@ class AmfController < ApplicationController
   # Remove a node or way from all relations
 
   def deleteitemrelations(objid, type) #:doc:
   # Remove a node or way from all relations
 
   def deleteitemrelations(objid, type) #:doc:

-       relations = RelationMember.find(:all, 
+    relations = RelationMember.find(:all, 

                                                                        :conditions => ['member_type = ? and member_id = ?', type, objid], 
                                                                        :include => :relation).collect { |rm| rm.relation }.uniq
 
                                                                        :conditions => ['member_type = ? and member_id = ?', type, objid], 
                                                                        :include => :relation).collect { |rm| rm.relation }.uniq
 

-       relations.each do |rel|
-         rel.members.delete_if { |x| x[0] == type and x[1] == objid }
-         rel.save_with_history!
-       end
+    relations.each do |rel|
+      rel.members.delete_if { |x| x[0] == type and x[1] == objid }
+      rel.save_with_history!
+    end

   end
 
   # Break out node tags into a hash
   # (should become obsolete as of API 0.6)
 
   def tagstring_to_hash(a) #:doc:
   end
 
   # Break out node tags into a hash
   # (should become obsolete as of API 0.6)
 
   def tagstring_to_hash(a) #:doc:

-       tags={}
-       Tags.split(a) do |k, v|
-         tags[k]=v
-       end
-       tags
+    tags={}
+    Tags.split(a) do |k, v|
+      tags[k]=v
+    end
+    tags

   end
 
   # Authenticate token
   # (can also be of form user:pass)
 
   def getuserid(token) #:doc:
   end
 
   # Authenticate token
   # (can also be of form user:pass)
 
   def getuserid(token) #:doc:

-       if (token =~ /^(.+)\:(.+)$/) then
-         user = User.authenticate(:username => $1, :password => $2)
-       else
-         user = User.authenticate(:token => token)
-       end
+    if (token =~ /^(.+)\:(.+)$/) then
+      user = User.authenticate(:username => $1, :password => $2)
+    else
+      user = User.authenticate(:token => token)
+    end

 
 

-       return user ? user.id : nil;
+    return user ? user.id : nil;

   end
 
   # Compare two floating-point numbers to within 0.0000001
 
   def fpcomp(a,b) #:doc:
   end
 
   # Compare two floating-point numbers to within 0.0000001
 
   def fpcomp(a,b) #:doc:

-       return ((a/0.0000001).round==(b/0.0000001).round)
+    return ((a/0.0000001).round==(b/0.0000001).round)

   end
 
   # Send AMF response
   
   def sendresponse(results)
   end
 
   # Send AMF response
   
   def sendresponse(results)

-       a,b=results.length.divmod(256)
-       render :content_type => "application/x-amf", :text => proc { |response, output| 
-         # ** move amf writing loop into here - 
-         # basically we read the messages in first (into an array of some sort),
-         # then iterate through that array within here, and do all the AMF writing
-         output.write 0.chr+0.chr+0.chr+0.chr+a.chr+b.chr
-         results.each do |k,v|
-               output.write(v)
-         end
-       }
+    a,b=results.length.divmod(256)
+    render :content_type => "application/x-amf", :text => proc { |response, output| 
+      # ** move amf writing loop into here - 
+      # basically we read the messages in first (into an array of some sort),
+      # then iterate through that array within here, and do all the AMF writing
+      output.write 0.chr+0.chr+0.chr+0.chr+a.chr+b.chr
+      results.each do |k,v|
+        output.write(v)
+      end
+    }

   end
 
 
   end
 
 


@@ -687,88 +690,88 @@ class AmfController < ApplicationController
   # Alternative SQL queries for getway/whichways
 
   def sql_find_ways_in_area(xmin,ymin,xmax,ymax)
   # Alternative SQL queries for getway/whichways
 
   def sql_find_ways_in_area(xmin,ymin,xmax,ymax)

-       sql=<<-EOF
-  SELECT DISTINCT current_ways.id AS wayid,current_ways.version AS version
-               FROM current_way_nodes
-  INNER JOIN current_nodes ON current_nodes.id=current_way_nodes.node_id
-  INNER JOIN current_ways  ON current_ways.id =current_way_nodes.id
-          WHERE current_nodes.visible=TRUE 
-                AND current_ways.visible=TRUE 
-                AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")}
-       EOF
-       return ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['wayid'].to_i,a['version'].to_i] }
+    sql=<<-EOF
+    SELECT DISTINCT current_ways.id AS wayid,current_ways.version AS version
+      FROM current_way_nodes
+    INNER JOIN current_nodes ON current_nodes.id=current_way_nodes.node_id
+    INNER JOIN current_ways  ON current_ways.id =current_way_nodes.id
+       WHERE current_nodes.visible=TRUE 
+       AND current_ways.visible=TRUE 
+       AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")}
+    EOF
+    return ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['wayid'].to_i,a['version'].to_i] }

   end
        
   def sql_find_pois_in_area(xmin,ymin,xmax,ymax)
   end
        
   def sql_find_pois_in_area(xmin,ymin,xmax,ymax)

-       pois=[]
-       sql=<<-EOF
+    pois=[]
+    sql=<<-EOF

                  SELECT current_nodes.id,current_nodes.latitude*0.0000001 AS lat,current_nodes.longitude*0.0000001 AS lon,current_nodes.version 
                        FROM current_nodes 
                  SELECT current_nodes.id,current_nodes.latitude*0.0000001 AS lat,current_nodes.longitude*0.0000001 AS lon,current_nodes.version 
                        FROM current_nodes 

- LEFT OUTER JOIN current_way_nodes cwn ON cwn.node_id=current_nodes.id 
+       LEFT OUTER JOIN current_way_nodes cwn ON cwn.node_id=current_nodes.id 

                   WHERE current_nodes.visible=TRUE
                         AND cwn.id IS NULL
                         AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")}
                   WHERE current_nodes.visible=TRUE
                         AND cwn.id IS NULL
                         AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")}

-       EOF
-       ActiveRecord::Base.connection.select_all(sql).each do |row|
-         poitags={}
-         ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n|
-               poitags[n['k']]=n['v']
-         end
-         pois << [row['id'].to_i, row['lon'].to_f, row['lat'].to_f, poitags, row['version'].to_i]
-       end
-       pois
+    EOF
+    ActiveRecord::Base.connection.select_all(sql).each do |row|
+      poitags={}
+      ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n|
+        poitags[n['k']]=n['v']
+      end
+      pois << [row['id'].to_i, row['lon'].to_f, row['lat'].to_f, poitags, row['version'].to_i]
+    end
+    pois

   end
        
   def sql_find_relations_in_area_and_ways(xmin,ymin,xmax,ymax,way_ids)
   end
        
   def sql_find_relations_in_area_and_ways(xmin,ymin,xmax,ymax,way_ids)

-       # ** It would be more Potlatchy to get relations for nodes within ways
-       #    during 'getway', not here
-       sql=<<-EOF
-         SELECT DISTINCT cr.id AS relid,cr.version AS version 
-               FROM current_relations cr
-  INNER JOIN current_relation_members crm ON crm.id=cr.id 
-  INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='node' 
-          WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "cn.")}
-       EOF
-       unless way_ids.empty?
-         sql+=<<-EOF
-          UNION
-         SELECT DISTINCT cr.id AS relid,cr.version AS version
-               FROM current_relations cr
-  INNER JOIN current_relation_members crm ON crm.id=cr.id
-          WHERE crm.member_type='way' 
-                AND crm.member_id IN (#{way_ids.join(',')})
-         EOF
-       end
-       return ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['relid'].to_i,a['version'].to_i] }
+    # ** It would be more Potlatchy to get relations for nodes within ways
+    #    during 'getway', not here
+    sql=<<-EOF
+      SELECT DISTINCT cr.id AS relid,cr.version AS version 
+      FROM current_relations cr
+      INNER JOIN current_relation_members crm ON crm.id=cr.id 
+      INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='node' 
+       WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "cn.")}
+      EOF
+    unless way_ids.empty?
+      sql+=<<-EOF
+       UNION
+        SELECT DISTINCT cr.id AS relid,cr.version AS version
+        FROM current_relations cr
+        INNER JOIN current_relation_members crm ON crm.id=cr.id
+         WHERE crm.member_type='way' 
+         AND crm.member_id IN (#{way_ids.join(',')})
+        EOF
+    end
+    return ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['relid'].to_i,a['version'].to_i] }

   end
        
   def sql_get_nodes_in_way(wayid)
   end
        
   def sql_get_nodes_in_way(wayid)

-       points=[]
-       sql=<<-EOF
-               SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id 
-                 FROM current_way_nodes,current_nodes 
-                WHERE current_way_nodes.id=#{wayid.to_i} 
+    points=[]
+    sql=<<-EOF
+      SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id 
+      FROM current_way_nodes,current_nodes 
+       WHERE current_way_nodes.id=#{wayid.to_i} 

                   AND current_way_nodes.node_id=current_nodes.id 
                   AND current_nodes.visible=TRUE
                   AND current_way_nodes.node_id=current_nodes.id 
                   AND current_nodes.visible=TRUE

-         ORDER BY sequence_id
+      ORDER BY sequence_id

          EOF
          EOF

-       ActiveRecord::Base.connection.select_all(sql).each do |row|
-         nodetags={}
-         ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n|
-               nodetags[n['k']]=n['v']
-         end
-         nodetags.delete('created_by')
-         points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags]
-       end
-       points
+    ActiveRecord::Base.connection.select_all(sql).each do |row|
+      nodetags={}
+      ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n|
+        nodetags[n['k']]=n['v']
+      end
+      nodetags.delete('created_by')
+      points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags]
+    end
+    points

   end
        
   def sql_get_tags_in_way(wayid)
   end
        
   def sql_get_tags_in_way(wayid)

-       tags={}
-       ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_way_tags WHERE id=#{wayid.to_i}").each do |row|
-         tags[row['k']]=row['v']
-       end
-       tags
+    tags={}
+    ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_way_tags WHERE id=#{wayid.to_i}").each do |row|
+      tags[row['k']]=row['v']
+    end
+    tags

   end
 
   def sql_get_way_version(wayid)
   end
 
   def sql_get_way_version(wayid)


@@ -776,7 +779,3 @@ class AmfController < ApplicationController
   end
 end
 
   end
 end
 

-# Local Variables:
-# indent-tabs-mode: t
-# tab-width: 4
-# End:

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 181c827b35a91e49657db56941c58e318c76507a..ca19fba308f067733822619f95835bb23c03a993 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -56,7 +56,7 @@ class ChangesetController < ApplicationController
     # to close the changeset, we'll just set its closed_at time to
     # now. this might not be enough if there are concurrency issues, 
     # but we'll have to wait and see.
     # to close the changeset, we'll just set its closed_at time to
     # now. this might not be enough if there are concurrency issues, 
     # but we'll have to wait and see.

-    changeset.closed_at = DateTime.now
+    changeset.set_closed_time_now

 
     changeset.save!
     render :nothing => true
 
     changeset.save!
     render :nothing => true

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index f67d2118d4382215c7b28460a993a6153f7de98e..a65e3aebcfa4635dca8f257dc7d3f67c6596a0cc 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -25,7 +25,7 @@ class Changeset < ActiveRecord::Base
   MAX_TIME_OPEN = 1
 
   # idle timeout increment, one hour as a rational number of days.
   MAX_TIME_OPEN = 1
 
   # idle timeout increment, one hour as a rational number of days.

-  IDLE_TIMEOUT = Rational(1,24)
+  IDLE_TIMEOUT = 1.hour #Rational(1,24)

 
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at 
 
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at 


@@ -39,6 +39,10 @@ class Changeset < ActiveRecord::Base
     return ((closed_at > DateTime.now) and (num_changes <= MAX_ELEMENTS))
   end
 
     return ((closed_at > DateTime.now) and (num_changes <= MAX_ELEMENTS))
   end
 

+  def set_closed_time_now
+    closed_at = DateTime.now
+  end
+  

   def self.from_xml(xml, create=false)
     begin
       p = XML::Parser.new
   def self.from_xml(xml, create=false)
     begin
       p = XML::Parser.new

diff --git a/app/views/browse/_common_details.rhtml b/app/views/browse/_common_details.rhtml
index 1f9f9ffe677ed5609b1bef337c978a62dd96c4b5..71a9dd3145726476b610e3e3f044136c034e0506 100644 (file)
--- a/app/views/browse/_common_details.rhtml
+++ b/app/views/browse/_common_details.rhtml
@@ -17,7 +17,7 @@
 
 <tr>
   <th>In changeset:</th>
 
 <tr>
   <th>In changeset:</th>

-  <td><%= link_to common_details.changeset_id, :action => :changeset %></td>
+  <td><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></td>

 </tr>
 
 <% unless common_details.tags_as_hash.empty? %>
 </tr>
 
 <% unless common_details.tags_as_hash.empty? %>