aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorMarc Florisson2013-07-12 16:28:48 +0200
committerMarc Florisson2013-07-12 16:28:48 +0200
commit2bccbc4d0c4e732a2af744d975f35c9d8f7bfd28 (patch)
tree9444bb0b785b83b77191a08846465329edb59208 /app/models
parent33db1788b37784c54e3db0be9fccdeed384ede89 (diff)
downloadchouette-core-2bccbc4d0c4e732a2af744d975f35c9d8f7bfd28.tar.bz2
add kml export reporting, add journey_patterns in kml export
Diffstat (limited to 'app/models')
-rw-r--r--app/models/export.rb6
-rw-r--r--app/models/kml_export.rb2
2 files changed, 5 insertions, 3 deletions
diff --git a/app/models/export.rb b/app/models/export.rb
index 0c2f24cde..342e55738 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -69,12 +69,13 @@ class Export < ActiveRecord::Base
end
def export
+ result_severity = "ok"
FileUtils.mkdir_p root
begin
# delayed job may repeat call
ExportLogMessage.where(:export_id => self.id).delete_all
- log_messages.create :key => :started
+ log_messages.create :severity => "ok", :key => :started
exporter.export file, export_options
@@ -82,9 +83,10 @@ class Export < ActiveRecord::Base
rescue => e
Rails.logger.error "Export #{id} failed : #{e}, #{e.backtrace}"
update_attribute :status, "failed"
+ result_severity = "error"
end
- log_messages.create :key => status
+ log_messages.create :severity => result_severity, :key => status
end
@@references_types = [ Chouette::Line, Chouette::Network, Chouette::Company ]
diff --git a/app/models/kml_export.rb b/app/models/kml_export.rb
index 418c2ccc1..c450bd297 100644
--- a/app/models/kml_export.rb
+++ b/app/models/kml_export.rb
@@ -5,7 +5,7 @@ class KmlExport < Export
end
def exporter
- exporter ||= ::Chouette::Kml::Exporter.new(referential)
+ exporter ||= ::Chouette::Kml::Exporter.new(referential, self)
end
end