brainmap-metamri 0.1.2 → 0.1.3

data/bin/import_study.rb

@@ -15,7 +15,7 @@
 #      alz_1, alz_2, cms_wais, cms_uwmr, esprit_1, esprit_2, gallagher_pd, pib_pilot, ries_pilot, ries_1, 
 #      tbi1000_1, tbi1000_2, tbi1000_3, tbiva, wrap140
 #
-#   For help use: import_visit.rb -h
+#   For help use: import_study.rb -h
 #
 # == Options
 #   -h, --help          Displays help message
@@ -31,6 +31,7 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'visit_raw_data_directory'
 require 'pathname'
+require 'rdoc/usage'
 require 'logger'
 
 #:stopdoc:
@@ -45,6 +46,11 @@ STUDIES = {
                      :filter => /^alz..._2$/,
                      :codename => 'johnson.alz.visit2' 
   },
+  :bendlin_wmad => { :dir => '/Data/vtrak1/raw/bendlin_WMAD/ge3T_750_scanner',
+                     :logfile => 'bendline.wmad.scan.log',
+                     :filter => /^wmad/,
+                     :codename => 'bendlin.wmad.visit1' 
+  },
   :cms_wais =>     { :dir => '/Data/vtrak1/raw/cms/wais',
                      :logfile => 'cms.wais.scan.log',
                      :filter => /^pc/,
@@ -149,13 +155,16 @@ def import_study(study, dbfile)
   end
 end
 
-
-
-if __FILE__ == $0
+if File.basename(__FILE__) == File.basename($PROGRAM_NAME)
+  RDoc::usage() if (ARGV[0] == '-h' or ARGV.size != 2)
   study = STUDIES[ARGV[0].to_sym]
+  raise(IndexError, "Study Not Recognized.") if study.empty? 
   dbfile = ARGV[1]
-  import_study(study, dbfile)
+  raise(IOError, "DB File not writable or not existant") if File.writable(dbfile)
+  begin 
+    import_study(study, dbfile)
+  rescue IndexError, IOError => e
+    puts "There was an error importing study #{study}. #{e}"
+    raise e
+  end
 end
-
-
-

data/bin/import_visit.rb

@@ -64,10 +64,11 @@ end
 
 
 
-if __FILE__ == $0
-  RDoc::usage() if ARGV[0] == '-h'
+if File.basename(__FILE__) == File.basename($PROGRAM_NAME)
+  RDoc::usage() if (ARGV[0] == '-h' or ARGV.size != 3)
   raw_directory = ARGV[0]
   scan_procedure_codename = ARGV[1]
   database = ARGV[2]
+  raise(IOError, "Database #{database} not writable or doesn't exist.") unless File.writable?(database)
   import_visit(raw_directory, scan_procedure_codename, database)
-end
+end

data/metamri.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{metamri}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristopher J. Kosmatka"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brainmap-metamri
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kristopher J. Kosmatka
@@ -49,6 +49,7 @@ files:
 - metamri.gemspec
 has_rdoc: true
 homepage: http://github.com/brainmap/metamri
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: metamri
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Extraction of MRI metadata and insertion into compatible sqlite3 databases.