diff options
| author | Zakaria BOUZIANE | 2014-09-15 09:27:13 +0200 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2014-09-15 09:27:13 +0200 |
| commit | 917e13fd1398dc246f2bda95e53ba3bab9794f44 (patch) | |
| tree | becc65439c5fef66166df0be01727fc6bb3267d1 /app/exporters | |
| parent | 686dd5c553c1df0260285fc0648fb152acfb15c5 (diff) | |
| parent | 7d44c95dbb514b6dd14151811a3ce7116d679722 (diff) | |
| download | chouette-core-917e13fd1398dc246f2bda95e53ba3bab9794f44.tar.bz2 | |
Merge branch 'sismo' of https://github.com/afimb/chouette2 into sismo
Diffstat (limited to 'app/exporters')
| -rw-r--r-- | app/exporters/chouette/hub/exporter.rb | 3 | ||||
| -rw-r--r-- | app/exporters/chouette/kml/exporter.rb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/exporters/chouette/hub/exporter.rb b/app/exporters/chouette/hub/exporter.rb index 96e125814..2d14d3a3b 100644 --- a/app/exporters/chouette/hub/exporter.rb +++ b/app/exporters/chouette/hub/exporter.rb @@ -1,4 +1,5 @@ class Chouette::Hub::Exporter + require "zip" attr_reader :referential attr_reader :hub_export, :lines, :routes, :journey_patterns @@ -174,7 +175,7 @@ class Chouette::Hub::Exporter end - ::Zip::ZipFile.open(zip_file_path, ::Zip::ZipFile::CREATE) do |zipfile| + ::Zip::File.open(zip_file_path, ::Zip::File::CREATE) do |zipfile| Dir[File.join(temp_dir, '*.TXT')].each do |f| #Rails.logger.error("Adding File #{File.basename(f)}") zipfile.add(File.basename(f), f) diff --git a/app/exporters/chouette/kml/exporter.rb b/app/exporters/chouette/kml/exporter.rb index 06af4bc2f..5b6170edc 100644 --- a/app/exporters/chouette/kml/exporter.rb +++ b/app/exporters/chouette/kml/exporter.rb @@ -1,5 +1,7 @@ class Chouette::Kml::Exporter + require 'zip' + attr_reader :referential attr_reader :kml_export, :lines, :routes, :journey_patterns @@ -103,7 +105,7 @@ class Chouette::Kml::Exporter end - ::Zip::ZipFile.open(zip_file_path, ::Zip::ZipFile::CREATE) do |zipfile| + ::Zip::File.open(zip_file_path, ::Zip::File::CREATE) do |zipfile| Dir[File.join(temp_dir, '*.kml')].each do |f| zipfile.add(File.basename(f), f) end |