solve merge conflicts (take new development version of fminer.rb)v2.1.0

1 files changed, 10 insertions, 10 deletions

diff --git a/similarity.rb b/similarity.rb
index 060bd2b..faf43f9 100644
--- a/similarity.rb
+++ b/similarity.rb
@@ -2,25 +2,25 @@ require File.join(File.dirname(__FILE__),'dataset.rb')
 
 helpers do
 def find
-# + charges are dropped
-uri = uri(params[:splat].first.gsub(/(InChI.*) (.*)/,'\1+\2')) # reinsert dropped '+' signs in InChIs
-halt 404, "Dataset \"#{uri}\" not found." unless @set = Dataset.find(uri)
+  # + charges are dropped
+  uri = uri(params[:splat].first.gsub(/(InChI.*) (.*)/,'\1+\2')) # reinsert dropped '+' signs in InChIs
+  raise OpenTox::NotFoundError.new "Dataset \"#{uri}\" not found." unless @set = Dataset.find(uri)
 end
 
 def uri(name)
-name = URI.encode(name)
-uri = File.join Dataset.base_uri, name
-end
+  name = URI.encode(name)
+  uri = File.join Dataset.base_uri, name
+  end
 end
 
 get '/tanimoto/dataset/*/dataset/*/?' do
-find
-@set.tanimoto(uri(params[:splat][1]))
+  find
+  @set.tanimoto(uri(params[:splat][1]))
 end
 
 get '/weighted_tanimoto/dataset/*/dataset/*/?' do
-find
-@set.weighted_tanimoto(uri(params[:splat][1]))
+  find
+  @set.weighted_tanimoto(uri(params[:splat][1]))
 end