summaryrefslogtreecommitdiff
path: root/lib/overwrite.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2013-06-05 19:41:42 +0200
committerChristoph Helma <helma@in-silico.ch>2013-06-05 19:41:42 +0200
commit183ccb509592f4a9cf0c473c5a3ebcd957f7bb70 (patch)
treeccf40c09d2831684da2e79badf56f667a8adabf1 /lib/overwrite.rb
parentb0bd56e80eedde63c9e679acb7bf5b522e7b7988 (diff)
rdf serialisation of modified objects fixed. DC.modified removed.
Diffstat (limited to 'lib/overwrite.rb')
-rw-r--r--lib/overwrite.rb16
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/overwrite.rb b/lib/overwrite.rb
index 6a71338..3317c79 100644
--- a/lib/overwrite.rb
+++ b/lib/overwrite.rb
@@ -77,11 +77,11 @@ module URI
end
def self.dataset? uri, subjectid=nil
- uri =~ /dataset/ and URI.accessible? uri, subjectid=nil
+ uri =~ /dataset/ and URI.accessible? uri, subjectid
end
def self.model? uri, subjectid=nil
- uri =~ /model/ and URI.accessible? uri, subjectid=nil
+ uri =~ /model/ and URI.accessible? uri, subjectid
end
def self.ssl? uri, subjectid=nil
@@ -92,17 +92,13 @@ module URI
def self.accessible?(uri, subjectid=nil)
parsed_uri = URI.parse(uri + (subjectid ? "?subjectid=#{CGI.escape subjectid}" : ""))
http_code = URI.task?(uri) ? 600 : 400
- unless (URI.ssl? uri) == true
- http = Net::HTTP.new(parsed_uri.host, parsed_uri.port)
- request = Net::HTTP::Head.new(parsed_uri.request_uri)
- http.request(request).code.to_i < http_code
- else
- http = Net::HTTP.new(parsed_uri.host, parsed_uri.port)
+ http = Net::HTTP.new(parsed_uri.host, parsed_uri.port)
+ if (URI.ssl? uri) == true
http.use_ssl = true
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- request = Net::HTTP::Head.new(parsed_uri.request_uri)
- http.request(request).code.to_i < http_code
end
+ request = Net::HTTP::Head.new(parsed_uri.request_uri)
+ http.request(request).code.to_i < http_code
rescue
false
end