From 0ca380fc80332e38fe9c230ad60486e3dfef9df3 Mon Sep 17 00:00:00 2001
From: rautenberg <rautenberg@in-silico.ch>
Date: Thu, 2 May 2013 11:09:05 +0200
Subject: fix AA issues

---
 lib/opentox.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/opentox.rb')

diff --git a/lib/opentox.rb b/lib/opentox.rb
index 040b0df..78a6923 100644
--- a/lib/opentox.rb
+++ b/lib/opentox.rb
@@ -25,7 +25,7 @@ module OpenTox
   # Object metadata (lazy loading)
   # @return [Hash] Object metadata
   def metadata force_update=false
-    if (@metadata.nil? or @metadata.empty? or force_update) and URI.accessible? @uri
+    if (@metadata.nil? or @metadata.empty? or force_update) and URI.accessible? @uri, @subjectid
       get if @rdf.nil? or @rdf.empty? or force_update 
       # return values as plain strings instead of RDF objects
       @metadata = @rdf.to_hash[RDF::URI.new(@uri)].inject({}) { |h, (predicate, values)| h[predicate] = values.collect{|v| v.to_s}; h }
@@ -52,7 +52,7 @@ module OpenTox
   # {http://opentox.org/dev/apis/api-1.2/interfaces OpenTox API}
   # @return [Hash] Object parameters
   def parameters force_update=false
-    if (@parameters.empty? or force_update) and URI.accessible? @uri
+    if (@parameters.empty? or force_update) and URI.accessible? @uri, @subjectid
       get if @rdf.empty? or force_update
       params = {}
       query = RDF::Query.new({
@@ -200,7 +200,7 @@ module OpenTox
       #@example fetching a model
       #  OpenTox::Model.find(<model-uri>) -> model-object
       def self.find uri, subjectid=nil
-        URI.accessible?(uri) ? self.new(uri, subjectid) : nil
+        URI.accessible?(uri, subjectid) ? self.new(uri, subjectid) : nil
       end
 
       def self.create metadata, subjectid=nil 
@@ -226,11 +226,11 @@ module OpenTox
           end
         end
         sparql <<  "}"
-        uris = RestClientWrapper.get(service_uri,{:query => sparql},{:accept => "text/uri-list", :subjectid => @subjectid}).split("\n")
+        uris = RestClientWrapper.get(service_uri,{:query => sparql},{:accept => "text/uri-list", :subjectid => subjectid}).split("\n")
         if uris.empty?
           self.create metadata, subjectid
         else
-          self.new uris.first
+          self.new uris.first, subjectid
         end
       end
 
-- 
cgit v1.2.3