diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-03-03 12:57:43 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-03-03 12:57:43 +0100 |
| commit | 8b46f5a4f389d7cd54f6e8b38025d275f9d3ed1b (patch) | |
| tree | 3d786b2f371db0f097abf11438def17beac820cf /report | |
| parent | 5f243f1e9e0a8e12cd8a2267bcec3140d21bf445 (diff) | |
| parent | d5378ac285f200a9a75b52030856c77f4697325f (diff) | |
Merge branch 'development' of github.com:helma/opentox-validation into development
Conflicts:
application.rb
example.rb
report/report_persistance.rb
Diffstat (limited to 'report')
| -rw-r--r-- | report/environment.rb | 10 | ||||
| -rw-r--r-- | report/report_test.rb | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/report/environment.rb b/report/environment.rb index 714cebe..04221de 100644 --- a/report/environment.rb +++ b/report/environment.rb @@ -8,11 +8,11 @@ gem 'ruby-plot', '= 0.0.2' unless ActiveRecord::Base.connected? ActiveRecord::Base.establish_connection( - :adapter => @@config[:database][:adapter], - :host => @@config[:database][:host], - :database => @@config[:database][:database], - :username => @@config[:database][:username], - :password => @@config[:database][:password] + :adapter => CONFIG[:database][:adapter], + :host => CONFIG[:database][:host], + :database => CONFIG[:database][:database], + :username => CONFIG[:database][:username], + :password => CONFIG[:database][:password] ) ActiveRecord::Base.logger = Logger.new("/dev/null") end diff --git a/report/report_test.rb b/report/report_test.rb index 1c838bf..2920fd3 100644 --- a/report/report_test.rb +++ b/report/report_test.rb @@ -119,12 +119,12 @@ end #class Reports::ReportServiceTest < Test::Unit::TestCase # include Lib::TestUtil # -# WS_VAL = @@config[:services]["opentox-validation"] -# WS_DATA=@@config[:services]["opentox-dataset"] +# WS_VAL = CONFIG[:services]["opentox-validation"] +# WS_DATA=CONFIG[:services]["opentox-dataset"] # FILE=File.new("data/hamster_carcinogenicity.owl","r") # -# WS_CLASS_ALG=File.join(@@config[:services]["opentox-algorithm"],"lazar") -# WS_FEATURE_ALG=File.join(@@config[:services]["opentox-algorithm"],"fminer") +# WS_CLASS_ALG=File.join(CONFIG[:services]["opentox-algorithm"],"lazar") +# WS_FEATURE_ALG=File.join(CONFIG[:services]["opentox-algorithm"],"fminer") # # #WS_CLASS_ALG_2="localhost:4008/algorithm" # #WS_FEATURE_ALG_2=nil @@ -334,4 +334,4 @@ end # # end # -#end
\ No newline at end of file +#end |