summaryrefslogtreecommitdiff
path: root/lib/error.rb
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-03-21 09:32:18 +0100
committerrautenberg <rautenberg@in-silico.ch>2012-03-21 09:32:18 +0100
commit8013002d2256a2e86982c2d0ef8358ad30bc9252 (patch)
tree6e25e5d92ca29cd46213d593db14d5538630d5e1 /lib/error.rb
parenta6d1725caa7d350f2526ea82af3478a12a34f93d (diff)
parentfc990e6dae8af7cfdf7d12b4e1d9ccd3b557418a (diff)
Merge branch 'development' of github.com:opentox/opentox-client into development
Diffstat (limited to 'lib/error.rb')
-rw-r--r--lib/error.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/error.rb b/lib/error.rb
index cc87f47..e12f140 100644
--- a/lib/error.rb
+++ b/lib/error.rb
@@ -45,8 +45,7 @@ module OpenTox
OpenTox.const_set klass,c
# define global methods for raising errors, eg. bad_request_error
- Object.send(:define_method, klass.underscore.to_sym) do |message|
- defined?(@uri) ? uri = @uri : uri=nil
+ Object.send(:define_method, klass.underscore.to_sym) do |message,uri=nil|
raise c, message, uri
end
end
@@ -65,7 +64,6 @@ module OpenTox
class ErrorReport
def initialize http_code, error
@http_code = http_code
- #@report = report#.to_yaml
@report = {}
@report[RDF::OT.actor] = error.uri.to_s
@report[RDF::OT.message] = error.message.to_s
@@ -95,6 +93,7 @@ module OpenTox
# TODO: not used for turtle
# http://rdf.rubyforge.org/RDF/Writer.html#
writer.prefix :ot, RDF::URI('http://www.opentox.org/api/1.2#')
+ writer.prefix :ot1_1, RDF::URI('http://www.opentox.org/api/1.1#')
subject = RDF::Node.new
@report.each do |predicate,object|
writer << [subject, predicate, object] if object