diff options
| author | Christoph Helma <helma@in-silico.ch> | 2013-07-04 16:42:16 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2013-07-04 16:42:16 +0200 |
| commit | 1bc45e7d388b49a5041af48f9b7796bf8fce1823 (patch) | |
| tree | 27baf3699ab263d7456855b5e0e78a929d9e3674 | |
| parent | 0902d0fbd9eb929ad4056e1653ffb9521f23b518 (diff) | |
| parent | 592c210134dda9ecf9eb087a268553f92ba4d962 (diff) | |
Merge branch 'development' of github.com:opentox/compound into development
Conflicts:
application.rb
| -rw-r--r-- | application.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/application.rb b/application.rb index 225280f..b97ea65 100644 --- a/application.rb +++ b/application.rb @@ -11,7 +11,7 @@ module OpenTox "chemical/x-daylight-smiles" => "smi", "chemical/x-inchi" => "inchi", #"chemical/x-inchikey" => "inchikey", - # OpenBabel segfaults randomly durng inchikey calculation + # OpenBabel segfaults randomly during inchikey calculation "chemical/x-mdl-sdfile" => "sdf", "chemical/x-mdl-molfile" => "sdf", "image/png" => 'png', @@ -39,12 +39,11 @@ module OpenTox # for service check head "/compound/?" do - #$logger.debug "Compound service is running." end get "/compound/?" do - "Object listing not implemented, because compounds are not stored at the server.".to_html - #not_implemented_error "Object listing not implemented, because compounds are not stored at the server.", to("/compound") + #"Object listing not implemented, because compounds are not stored at the server.".to_html + not_implemented_error "Object listing not implemented, because compounds are not stored at the server.", to("/compound") end get '/compound/pc_descriptors.yaml' do @@ -62,7 +61,7 @@ module OpenTox # curl http://webservices.in-silico.ch/compound/InChI=1S/C6H6/c1-2-4-6-5-3-1/h1-6H # @example Get all known names # curl -H "Accept:text/plain" http://webservices.in-silico.ch/compound/InChI=1S/C6H6/c1-2-4-6-5-3-1/h1-6H - # @return [chemical/x-daylight-smiles, chemical/x-inchi, chemical/x-mdl-sdfile, chemical/x-mdl-molfile, text/plain, image/gif, image/png] Compound representation + # @return [chemical/x-daylight-smiles, chemical/x-inchi, chemical/x-mdl-sdfile, chemical/x-mdl-molfile, text/plain, image/png] Compound representation get %r{/compound/(.+)} do |inchi| # catches all remaining get requests pass if inchi =~ /.*\/pc/ # AM: pass on to PC descriptor calculation if @accept=~/html/ |