lib/data_import.rb in parlement-0.6 vs lib/data_import.rb in parlement-0.7

@@ -3,11 +3,11 @@
 require 'iconv'
 require 'config/environment'
 
 dir = 'db/ROOT'
 
-ICONV = Iconv.new('UTF-8', 'ISO-8859-15')    
+ICONV = Iconv.new 'UTF-8', 'ISO-8859-15'
 
 def inputDir(directory)
 	Dir.glob(directory+'/*.txt') do |file|
 		dir = directory+'/'+file
 		inputFile File.basename(directory), file
@@ -23,32 +23,28 @@
 		end
 	end
 end
 
 def inputFile(d, fileName)
-	puts 'Loading: '+fileName
+	puts 'Loading: '+File.basename(fileName).gsub(/.txt/, '')
 
-	elt = Elt.find_by_id(File.basename(fileName).gsub(/.txt/, ''))
+	elt = Elt.find_by_id File.basename(fileName).gsub(/.txt/, '')
 
-	file = File.new(fileName)
-
-	if elt == nil
-		elt = Elt.new
-		elt.id = File.basename(fileName).gsub(/.txt/, '')
-		elt.created_on = nil
+	unless elt
+		elt = Elt.new :id => File.basename(fileName).gsub(/.txt/, ''), :created_on => nil
 	end
 
-	if elt.created_on == nil or elt.created_on < file.mtime
+	file = File.new fileName
+
+	if !elt.created_on or elt.created_on < file.mtime
 		elt.mail = nil
 
 		elt.parent_id = d
 		elt.created_on = file.mtime
 		puts elt.created_on.class
 		elt.subject = ICONV.iconv(file.gets.strip)
 		elt.body = format(ICONV.iconv(file.gets('\n')))
-		print "subject: "+elt.subject
-		#puts "body: "+elt.body
-		puts " (created_on: "+elt.created_on.to_s+")"
+		puts "subject: #{elt.subject} (created_on: #{elt.created_on.to_s})"
 		elt.save
 	end
 end
 
 inputDir dir