lib/echi-converter.rb in echi-converter-0.0.3 vs lib/echi-converter.rb in echi-converter-0.0.4

@@ -1,11 +1,9 @@
 require 'rubygems'
 require 'active_record'
 require 'faster_csv'
 require 'net/ftp'
-#require 'net/ssh'
-#require 'net/sftp'
 require 'fileutils'
 
 class Logger
   #Change the logging format to include a timestamp
   def format_message(severity, timestamp, progname, msg)
@@ -108,11 +106,11 @@
     filenumber = dump_binary 'int', 4
     @log.debug "File_number " + filenumber.to_s
     fileversion = dump_binary 'int', 4
     @log.debug "Version " + fileversion.to_s
 
-    if @config["echi_process_log"] == "Yes"
+    if @config["echi_process_log"] == "Y"
       #Log the file
       echi_log = EchiLog.new
       echi_log.filename = filename
       echi_log.filenumber = filenumber
       echi_log.version = fileversion
@@ -158,11 +156,11 @@
     
     #Move the file to the processed directory
     destination_directory = @workingdirectory + '/../files/processed/'
     FileUtils.mv(echi_file, destination_directory)
     
-    if @config["echi_process_log"] == "Yes"
+    if @config["echi_process_log"] == "Y"
       #Finish logging the details on the file
       echi_log.records = record_cnt
       echi_log.processed_at = Time.now
       echi_log.save
     end
@@ -236,16 +234,16 @@
 end
 
 def process_ascii filename
   echi_file = @workingdirectory + "/../files/to_process/" + filename
   
-  if @config["echi_process_log"] == "Yes"
+  if @config["echi_process_log"] == "Y"
     #Log the file
     echi_log = EchiLog.new
     echi_log.filename = filename
-    echi_log.filenumber = filenumber
-    echi_log.version = fileversion
+    #echi_log.filenumber = filenumber
+    #echi_log.version = fileversion
   end
   
   record_cnt = 0
   FasterCSV.foreach(echi_file) do |row|
     if row != nil
@@ -273,10 +271,10 @@
       @log.debug '<====================STOP RECORD====================>'
       record_cnt += 1
     end
   end
   
-  if @config["echi_process_log"] == "Yes"
+  if @config["echi_process_log"] == "Y"
     #Finish logging the details on the file
     echi_log.records = record_cnt
     echi_log.processed_at = Time.now
     echi_log.save
   end