diff options
author | Christoph Helma <helma@in-silico.ch> | 2010-05-21 17:00:41 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2010-05-21 17:00:41 +0200 |
commit | 3edc298f614abf92653e289926a18884ce99385d (patch) | |
tree | 0c75bea5c587dfefe2193d772ed72298b91b6f04 | |
parent | 8cb7d202a4267998da24205a3ea5b04c3750f1b8 (diff) | |
parent | ec6f4feef98c86716cbfaab54b443c1e3bbecbcf (diff) |
Michas modifications merged
-rw-r--r-- | README | 8 | ||||
-rw-r--r-- | application.rb | 5 |
2 files changed, 9 insertions, 4 deletions
@@ -21,19 +21,19 @@ Examples: Get a list of all datasets: - curl http://webservices.in-silico.ch/test/dataset + curl http://webservices.in-silico.ch/dataset Upload a dataset: - curl -X POST -H "Content-Type:application/rdf+xml" --data-binary @{my_rdf_file} http://webservices.in-silico.ch/test/dataset + curl -X POST -H "Content-Type:application/rdf+xml" --data-binary @{my_rdf_file} http://webservices.in-silico.ch/dataset Get a dataset representation: - curl http://webservices.in-silico.ch/test/dataset/{id} + curl http://webservices.in-silico.ch/dataset/{id} Delete a dataset: - curl -X DELETE http://webservices.in-silico.ch/test/dataset/{id} + curl -X DELETE http://webservices.in-silico.ch/dataset/{id} Installation: http://wiki.github.com/helma/opentox-documentation/installation-of-opentox-webservices diff --git a/application.rb b/application.rb index 90a13ed..332c6be 100644 --- a/application.rb +++ b/application.rb @@ -1,7 +1,12 @@ require 'rubygems' +<<<<<<< HEAD:application.rb gem 'opentox-ruby-api-wrapper', '= 1.5.3' require 'opentox-ruby-api-wrapper' +======= +gem 'opentox-ruby-api-wrapper', '= 1.5.4' +require 'opentox-ruby-api-wrapper' +>>>>>>> development:application.rb LOGGER.progname = File.expand_path(__FILE__) |