summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2013-07-16 17:45:08 +0200
committerChristoph Helma <helma@in-silico.ch>2013-07-16 17:45:08 +0200
commite8a08ccdbac142b3f5b7ba2de9c03cbaa549121b (patch)
tree5494650d19dbffa78431e7ef1677144d6b5c2a2f
parentffbde8e5c691f8a2f6f0d8039f8c98469a8bc631 (diff)
subjectid handled by RestClientWrapper
-rw-r--r--helper.rb4
-rw-r--r--test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/helper.rb b/helper.rb
index 8bf049a..722c830 100644
--- a/helper.rb
+++ b/helper.rb
@@ -94,7 +94,7 @@ module OpenTox
metadata[RDF.type] = [ RDF::OT.NominalFeature, RDF::OT.StringFeature, RDF::OT.Feature ] # only nominal type for mixed cases
metadata[RDF::OT.acceptValue] = values
end
- feature = OpenTox::Feature.find_or_create metadata, @subjectid
+ feature = OpenTox::Feature.find_or_create metadata
features << feature unless feature.nil?
ntriples << "<#{feature.uri}> <#{RDF.type}> <#{RDF::OT.Feature}>."
ntriples << "<#{feature.uri}> <#{RDF::OLO.index}> #{i} ."
@@ -252,7 +252,7 @@ module OpenTox
end
def parse_put
- task = OpenTox::Task.run "Dataset upload", @uri, @subjectid do
+ task = OpenTox::Task.run "Dataset upload", @uri do
case @content_type
when "text/plain", "text/turtle", "application/rdf+xml" # no conversion needed
when "text/csv"
diff --git a/test.rb b/test.rb
index 6f91719..99925fd 100644
--- a/test.rb
+++ b/test.rb
@@ -4,7 +4,7 @@ module OpenTox
class Application < Service
post '/dataset/test/error_in_task/?' do
- task = OpenTox::Task.run("error_in_task", @uri, @subjectid) do |task|
+ task = OpenTox::Task.run("error_in_task", @uri) do |task|
sleep 1
internal_server_error "error_in_task_message"
end