Merge branch 'jl' into pc_unified_from_jl

Conflicts:
	lib/compound.rb

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
       }