From 183ccb509592f4a9cf0c473c5a3ebcd957f7bb70 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Wed, 5 Jun 2013 19:41:42 +0200
Subject: rdf serialisation of modified objects fixed. DC.modified removed.

---
 lib/opentox.rb   |  4 ++--
 lib/overwrite.rb | 16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/opentox.rb b/lib/opentox.rb
index ac174f3..8817798 100644
--- a/lib/opentox.rb
+++ b/lib/opentox.rb
@@ -109,7 +109,7 @@ module OpenTox
   def put wait=true, mime_type="text/plain"
     bad_request_error "Mime type #{mime_type} is not supported. Please use 'text/plain' (default) or 'application/rdf+xml'." unless mime_type == "text/plain" or mime_type == "application/rdf+xml"
     @metadata[RDF::OT.created_at] = DateTime.now unless URI.accessible? @uri, @subjectid
-    @metadata[RDF::DC.modified] = DateTime.now
+    #@metadata[RDF::DC.modified] = DateTime.now
     case mime_type
     when 'text/plain'
       body = self.to_ntriples
@@ -131,7 +131,7 @@ module OpenTox
   end
   
   def create_rdf
-    @rdf = RDF::Graph.new if @rdf.empty? or URI.task?(@uri)
+    @rdf = RDF::Graph.new #if @rdf.empty? or URI.task?(@uri)
     @metadata[RDF.type] ||= eval("RDF::OT."+self.class.to_s.split('::').last)
     @metadata[RDF::DC.date] ||= DateTime.now
     @metadata.each do |predicate,values|
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
-- 
cgit v1.2.3