diff options
author | Christoph Helma <helma@in-silico.ch> | 2010-06-28 18:44:38 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2010-06-28 18:44:38 +0200 |
commit | 314c5dd18b7d70e7047b2a8754851392aa3444b8 (patch) | |
tree | e2e6e17627d49bec5f2b7f478ffe9f747a62d1f5 | |
parent | b90b350888603bb4fe070d64fe622aa9400a0c19 (diff) | |
parent | de5eb540a2c91d453e4adb24869fcaaac5180e4f (diff) |
Merge branch 'master' into development
-rw-r--r-- | application.rb | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | lazar.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/application.rb b/application.rb index e111673..304f8c0 100644 --- a/application.rb +++ b/application.rb @@ -1,5 +1,5 @@ require 'rubygems' -gem "opentox-ruby-api-wrapper", "= 1.5.6" +gem "opentox-ruby-api-wrapper", "= 1.5.7" require 'opentox-ruby-api-wrapper' LOGGER.progname = File.expand_path(__FILE__) @@ -18,7 +18,7 @@ require 'lazar.rb' get '/?' do # get index of models response['Content-Type'] = 'text/uri-list' - Model.all.collect{|m| m.uri}.join("\n") + "\n" + Model.all(params).collect{|m| m.uri}.join("\n") + "\n" end delete '/:id/?' do @@ -187,8 +187,8 @@ class Lazar < Model def to_owl data = YAML.load(yaml) - activity_dataset = YAML.load(RestClient.get(data.trainingDataset, :accept => 'application/x-yaml').body) - feature_dataset = YAML.load(RestClient.get(data.feature_dataset_uri, :accept => 'application/x-yaml').body) + activity_dataset = YAML.load(RestClient.get(data.trainingDataset, :accept => 'application/x-yaml').to_s) + feature_dataset = YAML.load(RestClient.get(data.feature_dataset_uri, :accept => 'application/x-yaml').to_s) owl = OpenTox::Owl.create 'Model', uri owl.set("creator","http://github.com/helma/opentox-model") owl.set("title","#{URI.decode(activity_dataset.title)} lazar classification") |