Improve highlighting of changesets in the changeset list

[rails.git] / lib / daemons / gpx_import.rb

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 07f4cd6a4c4e8fade28e1cf9c0aec65198d389f4..8250a67f55b8b1897ba90f9a8f938ce1f6348910 100755 (executable)
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -12,7 +12,7 @@ logger = ActiveRecord::Base.logger
 while(true) do
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
 while(true) do
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 

-  Trace.find(:all, :conditions => "inserted = 0 and visible = 1", :order => "id").each do |trace|
+  Trace.find(:all, :conditions => { :inserted => false, :visible => true }, :order => "id").each do |trace|

     Signal.trap("TERM") do 
       terminated = true
     end
     Signal.trap("TERM") do 
       terminated = true
     end


@@ -23,14 +23,14 @@ while(true) do
       if gpx.actual_points > 0
         Notifier::deliver_gpx_success(trace, gpx.actual_points)
       else
       if gpx.actual_points > 0
         Notifier::deliver_gpx_success(trace, gpx.actual_points)
       else

-        trace.destroy

         Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
         Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')

+        trace.destroy

       end
     rescue Exception => ex
       logger.info ex.to_s
       ex.backtrace.each {|l| logger.info l }
       end
     rescue Exception => ex
       logger.info ex.to_s
       ex.backtrace.each {|l| logger.info l }

-      trace.destroy

       Notifier::deliver_gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n"))
       Notifier::deliver_gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n"))

+      trace.destroy

     end
 
     Signal.trap("TERM", "DEFAULT")
     end
 
     Signal.trap("TERM", "DEFAULT")


@@ -38,7 +38,7 @@ while(true) do
     exit if terminated
   end
 
     exit if terminated
   end
 

-  Trace.find(:all, :conditions => "visible = 0", :order => "id").each do |trace|
+  Trace.find(:all, :conditions => { :visible => false }, :order => "id").each do |trace|

     Signal.trap("TERM") do 
       terminated = true
     end
     Signal.trap("TERM") do 
       terminated = true
     end