Merge branch 'master' into development

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
diff --git a/lazar.rb b/lazar.rb
index eff6e67..0fa3794 100644..100755
--- a/lazar.rb
+++ b/lazar.rb
@@ -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")