summaryrefslogtreecommitdiff
path: root/lib/opentox-client.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2012-02-20 16:16:56 +0000
committerChristoph Helma <helma@in-silico.ch>2012-02-20 16:16:56 +0000
commitb6134b992fde8784c3556fbca32925e721700d32 (patch)
treefcbac8c01883209aa451282f37592ce4f5794038 /lib/opentox-client.rb
parent64135ae320998a836725786f95a4efd3b63f585c (diff)
task catches and reports errors (some dataset tests still fail)
Diffstat (limited to 'lib/opentox-client.rb')
-rw-r--r--lib/opentox-client.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/opentox-client.rb b/lib/opentox-client.rb
index c5c701b..fc6cbd1 100644
--- a/lib/opentox-client.rb
+++ b/lib/opentox-client.rb
@@ -5,9 +5,10 @@ require 'rdf/raptor'
require "rest-client"
require 'uri'
require 'yaml'
+require 'logger'
require File.join(File.dirname(__FILE__),"error.rb")
-require File.join(File.dirname(__FILE__),"logger.rb")
+require File.join(File.dirname(__FILE__),"otlogger.rb") # avoid require conflicts with logger
require File.join(File.dirname(__FILE__),"opentox.rb")
require File.join(File.dirname(__FILE__),"task.rb")
require File.join(File.dirname(__FILE__),"compound.rb")
-require File.join(File.dirname(__FILE__),"dataset.rb")
+#require File.join(File.dirname(__FILE__),"dataset.rb")