From 5d5688fbe43806af8523e5481715b5969feeab60 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Tue, 6 Oct 2009 10:39:43 +0200 Subject: Passes tests in opentox-test --- lib/feature.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib/feature.rb') diff --git a/lib/feature.rb b/lib/feature.rb index 8b0839f..a3ba333 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -9,31 +9,33 @@ module OpenTox if params[:uri] @uri = params[:uri] items = URI.split(@uri)[5].split(/\//) - @name = items[2] + @name = items[1] @values = {} - i = 4 + i = 2 while i < items.size @values[items[i]] = items[i+1] i += 2 end else @name = params[:name] - #@name = URI.encode(URI.decode(params[:name])) - @values = params[:values] - @uri = File.join(@@config[:services]["opentox-dataset"],"feature",path) + @values = {} + params.each do |k,v| + @values[k] = v unless k.to_s == 'name' + end + @uri = File.join(@@config[:services]["opentox-feature"],path) end end def values_path path = '' @values.each do |k,v| - path += '/' + URI.encode(k.to_s) + '/' + URI.encode(v.to_s) + path = File.join path, URI.encode(k.to_s), URI.encode(v.to_s) end path end def path - File.join(@name,values_path) + File.join(URI.encode(@name),values_path) end def value(property) -- cgit v1.2.3