summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2014-10-21 10:55:33 +0200
committermguetlein <martin.guetlein@gmail.com>2014-10-21 10:55:33 +0200
commit7ffc7fe9a449a0e8632c2d27e6767b3858196352 (patch)
tree8046f87e0a47a5fa2ec3006f14f483cfcbf47dbd
parent0ce2d6d89b20a82702cf09044e9bd2c816bde129 (diff)
add optional size param to compound image creation
-rw-r--r--application.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/application.rb b/application.rb
index 6066f93..770157c 100644
--- a/application.rb
+++ b/application.rb
@@ -19,8 +19,9 @@ module OpenTox
helpers do
# Convert identifier from OpenBabel input_format to OpenBabel output_format
- def obconversion(identifier,input_format,output_format)
+ def obconversion(identifier,input_format,output_format,option=nil)
obconversion = OpenBabel::OBConversion.new
+ obconversion.set_options(option, OpenBabel::OBConversion::OUTOPTIONS) if option
obmol = OpenBabel::OBMol.new
obconversion.set_in_and_out_formats input_format, output_format
obconversion.read_string obmol, identifier
@@ -52,7 +53,7 @@ module OpenTox
get %r{/compound/(.+)/image} do |inchi| # catches all remaining get requests
response['Content-Type'] = 'image/png'
- obconversion @inchi, "inchi", "_png2"
+ obconversion @inchi, "inchi", "_png2", (params["size"] ? 'p"'+params["size"]+'"' : nil)
end
# Get compound representation
@@ -73,7 +74,7 @@ module OpenTox
else
bad_request_error "Unsupported MIME type '#{@accept}.", uri unless FORMATS.keys.include? @accept
return @inchi if @accept == "chemical/x-inchi"
- obconversion @inchi, "inchi", FORMATS[@accept]
+ obconversion @inchi, "inchi", FORMATS[@accept], (params["size"] ? 'p"'+params["size"]+'"' : nil)
end
end