subjectids for load_metadata in algorithm.rb and list_policies_uris changes in A&A

2 files changed, 17 insertions, 10 deletions

diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index 167c964..54ca064 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -52,9 +52,9 @@ module OpenTox
       class BBRC
         include Fminer
         # Initialize bbrc algorithm
-        def initialize
+        def initialize(subjectid=nil)
           super File.join(CONFIG[:services]["opentox-algorithm"], "fminer/bbrc")
-          load_metadata
+          load_metadata(subjectid)
         end
       end
 
@@ -62,9 +62,9 @@ module OpenTox
       class LAST
         include Fminer
         # Initialize last algorithm
-        def initialize
+        def initialize(subjectid=nil)
           super File.join(CONFIG[:services]["opentox-algorithm"], "fminer/last")
-          load_metadata
+          load_metadata(subjectid)
         end
       end
 
@@ -74,9 +74,9 @@ module OpenTox
     class Lazar
       include Algorithm
       # Initialize lazar algorithm
-      def initialize
+      def initialize(subjectid=nil)
         super File.join(CONFIG[:services]["opentox-algorithm"], "lazar")
-        load_metadata
+        load_metadata(subjectid)
       end
     end
 
diff --git a/lib/authorization.rb b/lib/authorization.rb
index eab20df..d9f900b 100644
--- a/lib/authorization.rb
+++ b/lib/authorization.rb
@@ -137,16 +137,23 @@ module OpenTox
     # Lists policies alongside with affected uris
     # @param [String] subjectid
     # @return [Hash] keys: all policies of the subjectid owner, values: uris affected by those policies
-    def self.list_policy_uris( subjectid )
+    def self.list_policies_uris( subjectid )
       names = list_policies(subjectid)
       policies = {}
       names.each do |n|
-        p = OpenTox::Policies.new
-        p.load_xml( list_policy(n, subjectid) )
-        policies[n] = p.uris
+        policies[n] = list_policy_uris( n, subjectid )
       end
       policies
     end
+
+    # Lists policies alongside with affected uris
+    # @param [String] subjectid
+    # @return [Hash] keys: all policies of the subjectid owner, values: uris affected by those policies
+    def self.list_policy_uris( policy, subjectid )
+      p = OpenTox::Policies.new
+      p.load_xml( list_policy(policy, subjectid) )
+      p.uris
+    end
     
     #Returns the owner (who created the first policy) of an URI
     # @param [String, String]uri,subjectid