diff options
author | Christoph Helma <helma@in-silico.ch> | 2012-02-28 17:13:20 +0000 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2012-02-28 17:13:20 +0000 |
commit | f40871b9b60ae706c0668c9ac4cfbfff866ce5dc (patch) | |
tree | e63e0a08523ea8ee07b933af2023cfd5f47f15a8 /lib/opentox.rb | |
parent | fa9069e13fb6b1c8bb4ebcdf82f1cf1c04ad71ca (diff) |
generic rest-client calls ignoring http errors from task services
Diffstat (limited to 'lib/opentox.rb')
-rw-r--r-- | lib/opentox.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/opentox.rb b/lib/opentox.rb index f81ae10..145aeb6 100644 --- a/lib/opentox.rb +++ b/lib/opentox.rb @@ -20,24 +20,16 @@ module OpenTox # Ruby interface - # override to read all error codes def metadata reload=true if reload or @metadata.empty? @metadata = {} - # ignore error codes from Task services (may contain eg 500 which causes exceptions in RestClient and RDF::Reader - # TODO: convert to RestClientWrapper kind_of?(OpenTox::Dataset) ? uri = File.join(@uri,"metadata") : uri = @uri - RestClient.get(uri) do |response, request, result| - #response = RestClientWrapper.get(@uri) #do |response, request, result| - $logger.warn "#{@uri} returned #{result}" unless response.code == 200 or response.code == 202 or URI.task? @uri - RDF::Reader.for(:rdfxml).new(response) do |reader| - reader.each_statement do |statement| - @metadata[statement.predicate] = statement.object if statement.subject == @uri - end + RDF::Reader.for(:rdfxml).new( RestClientWrapper.get(@uri) ) do |reader| + reader.each_statement do |statement| + @metadata[statement.predicate] = statement.object if statement.subject == @uri end end end - #puts @metadata.inspect @metadata end @@ -52,7 +44,7 @@ module OpenTox def get params={} params[:subjectid] ||= @subjectid params[:accept] ||= 'application/rdf+xml' - @response = RestClientWrapper.get @uri, params + @response = RestClientWrapper.get @uri, {}, params end def post payload={}, params={} |