summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Vorgrimmler <vorgrimmlerdavid@gmx.de>2012-06-20 17:39:39 +0200
committerDavid Vorgrimmler <vorgrimmlerdavid@gmx.de>2012-06-20 17:39:39 +0200
commitd6ce565578461dab17131584df3e1184f0340a8b (patch)
treec365839687c52332f856431ed1288cdfb2995633
parent16747873e9226920c8bbc9dced9799bbcb725196 (diff)
Added subjectid.
-rw-r--r--lib/algorithm.rb2
-rw-r--r--lib/compound.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index 00f7e4e..e2798b3 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -593,7 +593,7 @@ module OpenTox
# @param [Hash] required keys: compound, features, feature_dataset_uri, pc_type
# @return [Hash] Hash with matching Smarts and number of hits
def self.lookup(params)
- params[:compound].lookup(params[:features], params[:feature_dataset_uri],params[:pc_type], params[:lib],params[:subjectid])
+ params[:compound].lookup(params[:features], params[:feature_dataset_uri], params[:pc_type], params[:lib], params[:subjectid])
end
end
diff --git a/lib/compound.rb b/lib/compound.rb
index 3727c8c..e493278 100644
--- a/lib/compound.rb
+++ b/lib/compound.rb
@@ -261,7 +261,7 @@ module OpenTox
if entry.nil?
temp_ds = OpenTox::Dataset.create(CONFIG[:services]["opentox-dataset"],subjectid); temp_ds.add_compound(self.uri); temp_uri = temp_ds.save(subjectid)
uri = RestClientWrapper.post(File.join(CONFIG[:services]["opentox-algorithm"], "/pc/AllDescriptors"), {:dataset_uri => temp_uri, :pc_type => pc_type, :lib => lib, :subjectid => subjectid})
- ds = OpenTox::Dataset.find(uri)
+ ds = OpenTox::Dataset.find(uri, subjectid)
entry = ds.data_entries[self.uri]
ds.delete(subjectid)
temp_ds.delete(subjectid)