diff options
| -rw-r--r-- | lib/dataset.rb | 2 | ||||
| -rw-r--r-- | lib/rest_client_wrapper.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/dataset.rb b/lib/dataset.rb index 0a2f770..2b5759e 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -293,7 +293,7 @@ module OpenTox else compounds.each do |c| features.each do |f| - unless @data_entries[c][f] + if @data_entries[c]==nil or @data_entries[c][f]==nil dataset.add(c,f,nil) else @data_entries[c][f].each do |v| diff --git a/lib/rest_client_wrapper.rb b/lib/rest_client_wrapper.rb index dac24dc..747a353 100644 --- a/lib/rest_client_wrapper.rb +++ b/lib/rest_client_wrapper.rb @@ -98,6 +98,8 @@ module OpenTox rescue RestClient::RequestTimeout => ex received_error ex.message, 408, nil, {:rest_uri => uri, :headers => headers, :payload => payload} + rescue Errno::ETIMEDOUT => ex + received_error ex.message, 408, nil, {:rest_uri => uri, :headers => headers, :payload => payload} rescue Errno::ECONNREFUSED => ex received_error ex.message, 500, nil, {:rest_uri => uri, :headers => headers, :payload => payload} rescue RestClient::ExceptionWithResponse => ex |