*** csv_exporter.rb 2011-11-30 13:29:11.638242915 +0100 --- oddb.org/ext/export/src/csv_exporter.rb 2011-11-30 13:28:23.635540435 +0100 *************** *** 84,90 **** {} end keys.collect { |key| ! descr.fetch(key.to_s, '').to_s.gsub(/\r?\n/u, ' / ') } end def CsvExporter.defr(item, opts={}) --- 84,91 ---- {} end keys.collect { |key| ! #descr.fetch(key.to_s, '').to_s.gsub(/\r?\n/u, ' / ') ! descr.fetch(key.to_s, '').to_s.force_encoding('utf-8').gsub(/\r?\n/u, ' / ') } end def CsvExporter.defr(item, opts={}) *************** *** 94,100 **** self.collect_languages(DEFRIT, item) end def CsvExporter.dump(keys, item, fh, opts={}) ! CSV::Writer.generate(fh, ';') { |csv| csv << collect_data(keys, item, opts).flatten } end --- 95,102 ---- self.collect_languages(DEFRIT, item) end def CsvExporter.dump(keys, item, fh, opts={}) ! #CSV::Writer.generate(fh, ';') { |csv| ! CSV.open(fh.path, "w", {:col_sep => ';'}) { |csv| csv << collect_data(keys, item, opts).flatten } end