import_study.rb in brainmap-metamri-0.1.2

- old
+ new

@@ -25,11 +25,11 @@
 #
 # == Copyright
 #   Copyright (c) 2009 WADRC Imaging Core.
 #
 
-$:.unshift File.join(File.dirname(__FILE__),'..')
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'visit_raw_data_directory'
 require 'pathname'
 require 'logger'
 
@@ -63,11 +63,11 @@
   :esprit_2 =>     { :dir => '/Data/vtrak1/raw/esprit/9month',
                      :logfile => 'esprit.9month.scan.log',
                      :filter => /^esp3/,
                      :codename => 'carlsson.esprit.visit2.9month' 
   },
-  :gallagher_pd => { :dir => '/Data/vtrak1/raw/gallagher_pd',
+  :gallagher_pd => { :dir => '/Data/vtrak1/raw/gallagher.pd',
                      :logfile => 'gallagher.scan.log',
                      :filter => /^pd..._/,
                      :codename => 'gallagher.pd.visit1' 
   },
   :pib_pilot =>    { :dir => '/Data/vtrak1/raw/pib_pilot_mri',
@@ -93,11 +93,11 @@
   :tbi1000_2 =>    { :dir => '/Data/vtrak1/raw/tbi_1000',
                      :logfile => 'tbi1000.visit2.scan.log',
                      :filter => /^tbi..._2/,
                      :codename => 'johnson.tbi1000.visit2' 
   },
-  :tbi1000_3 =>    { :dir => '/Data/vtrak1/raw/tbi_aware',
+  :tbi1000_3 =>    { :dir => '/Data/vtrak1/raw/johnson.tbi.aware.visit3',
                      :logfile => 'tbiaware.visit3.scan.log',
                      :filter => /^tbi..._3$/,
                      :codename => 'johnson.tbiaware.visit3' 
   },
   :tbiva =>        { :dir => '/Data/vtrak1/raw/johnson.tbi-va.visit1',
@@ -139,11 +139,11 @@
       v.scan
       v.db_insert!(dbfile)
     rescue Exception => e
       puts "There was a problem scanning a dataset in #{visitdir}... skipping."
       puts "Exception message: #{e.message}"
-      LOG.error "There was a problem scanning a dataset in #{visitdir}... skipping."
-      LOG.error "Exception message: #{e.message}"
+      log.error "There was a problem scanning a dataset in #{visitdir}... skipping."
+      log.error "Exception message: #{e.message}"
     ensure
       v = nil
     end
   end
 end