diff options
author | Andreas Maunz <andreas@maunz.de> | 2012-04-05 15:55:01 +0200 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2012-04-05 15:55:01 +0200 |
commit | 601425ffb7edc70bb27e8356b639248db7871823 (patch) | |
tree | 6440ce9f952cb72ea83015c0ff6a65f486dfd62e | |
parent | b5501ac01b336e6190e5c3e3f9401bc1f8aacdde (diff) | |
parent | 9514a4647127c18bfb40f0008055e7aabd5ba607 (diff) |
Merge branch 'jl' into pc_unified_from_jl
Conflicts:
lib/compound.rb
-rw-r--r-- | lib/compound.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/compound.rb b/lib/compound.rb index 87be5e3..770f1b5 100644 --- a/lib/compound.rb +++ b/lib/compound.rb @@ -242,14 +242,13 @@ module OpenTox # @param [String] Comma separated pc types # @param [String] Comma separated lib # @return [Hash] Hash with feature name as key and value as value - def lookup(feature_array,feature_dataset_uri,pc_type,lib) - ds = OpenTox::Dataset.find(feature_dataset_uri) - + def lookup(feature_array,feature_dataset_uri,pc_type,lib,subjectid=nil) + ds = OpenTox::Dataset.find(feature_dataset_uri,subjectid) #entry = ds.data_entries[self.uri] entry = nil ds.data_entries.each { |c_uri, values| if c_uri.split('/compound/').last == self.to_inchi - entry = ds.data_entries[self.uri] + entry = ds.data_entries[c_uri] break end } |