evergreen_holdings 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7bd896c3e40856d8808c22b539d06f6f3661c6
-  data.tar.gz: cfed2d99afdb1bf3f8ef7b241361691bf9fc1d8a
+  metadata.gz: 8dd3388514b1c9b46a0478dae03c6bbc8b96e496
+  data.tar.gz: 6e1296f90b066155369b8578e91f6505e7d43a1f
 SHA512:
-  metadata.gz: fd03b1a8e03e2b3d0cbc95fe9ccbf139859cdb366989f34d68bc375bb71d74868e8e367974ca3cf56e6bc4486054ed7a3e433be0c93857f5051552bd7a4a5b61
-  data.tar.gz: bf9397c714c0400c0050e9253d2d82204447e44c22466665243339d8e88d290efe14daeb75b20816206bcba9651ee5931618c7ca86b37124d488d17e6a02d678
+  metadata.gz: 7c5a4590219f7be4216794114f89405cb6badd6ec63710a469d33bd349b8d88d6eb22049c16c7883fb68a863ddb1125cbcfb0551ce1aca0a9dd80e20ca5bccf3
+  data.tar.gz: 1ea5680f515e5ad9e862d0813ec86c7dd81cf87fd2705d2fe01cd13e2343cc798d439d3da82b28336bccc7f20965c6244dc99da5e30fd4026b78804134ba513e

data/lib/evergreen_holdings.rb

@@ -15,6 +15,7 @@ module EvergreenHoldings
             unless fetch_statuses
                 raise CouldNotConnectToEvergreenError
             end
+	    fetch_ou_tree
         end
 
         # Fetch holdings data from the Evergreen server
@@ -34,6 +35,7 @@ module EvergreenHoldings
             return Status.new res.body, self if res
         end
 
+	# Given an ID, returns a human-readable name
         def location_name id
             params = "format=json&input_format=json&service=open-ils.circ&method=open-ils.circ.copy_location.retrieve&param=#{id}"
             @gateway.query = params
@@ -51,8 +53,32 @@ module EvergreenHoldings
             return @possible_item_statuses[id]
         end
 
+	def ou_name id
+            return @org_units[id][:name]
+        end
+
         private
 
+	def add_ou_descendants id, parent
+            (@org_units[parent][:descendants] ||= []) << id
+	    if @org_units[parent][:parent]
+	    add_ou_descendants id, @org_units[parent][:parent]
+	    end
+	end
+
+	def take_info_from_ou_tree o
+	    @org_units[o[3]] = {}
+	    @org_units[o[3]][:name] = o[6]
+	    if o[8]
+	        @org_units[o[3]][:parent] = o[8]
+	        add_ou_descendants o[3], o[8]
+            end
+	    o[0].each do |p|
+	        take_info_from_ou_tree p['__p']
+	    end 
+	end
+
+
         def send_query
             begin
                 res = Net::HTTP.get_response(@gateway)
@@ -78,6 +104,19 @@ module EvergreenHoldings
             return false
         end
 
+        def fetch_ou_tree
+            @org_units = {}
+	    params = 'format=json&input_format=json&service=open-ils.actor&method=open-ils.actor.org_tree.retrieve'
+            @gateway.query = params
+            res = send_query
+            if res
+                raw_orgs = JSON.parse(res.body)['payload'][0]['__p']
+		take_info_from_ou_tree raw_orgs
+                return true if @org_units.size > 0
+            end
+            return false
+        end
+
     end
 
     # Status objects represent all the holdings attached to a specific tcn
@@ -109,12 +148,14 @@ module EvergreenHoldings
                 if vol['__p'][0].size > 0
                     vol['__p'][0].each do |item|
                         unless item['__p'][35].nil?
-                            copies.push Item.new barcode: item['__p'][2], call_number: vol['__p'][7], location: item['__p'][24], status: item['__p'][28]
+				copies.push Item.new barcode: item['__p'][2], call_number: vol['__p'][7], location: item['__p'][24], status: item['__p'][28], owning_lib: item['__p'][5]
                         else
                             begin
-                                copies.push Item.new barcode: item['__p'][2], call_number: vol['__p'][7], due_date: item['__p'][35][0]['__p'][6], location: item['__p'][24], status: item['__p'][28]
+				    copies.push Item.new barcode: item['__p'][2], call_number: vol['__p'][7], due_date: item['__p'][35][0]['__p'][6], location: item['__p'][24], status: item['__p'][28], owning_lib: item['__p'][5]
                             rescue
-                                copies.push Item.new barcode: item['__p'][2], call_number: vol['__p'][7], location: item['__p'][24], status: item['__p'][28]
+				    puts item['__p'][5]
+				    puts @org_units
+				    copies.push Item.new barcode: item['__p'][2], call_number: vol['__p'][7], location: item['__p'][24], status: item['__p'][28], owning_lib: item['__p'][5]
                             end
                         end
                     end
@@ -131,6 +172,9 @@ module EvergreenHoldings
                 if copy.status.is_a? Numeric
                     copy.status = @connection.status_name copy.status
                 end
+                if copy.owning_lib.is_a? Numeric
+                    copy.owning_lib = @connection.ou_name copy.owning_lib
+                end
             end
         end
 
@@ -138,7 +182,7 @@ module EvergreenHoldings
 
     # A physical copy of an item
     class Item
-        attr_accessor :location, :status
+        attr_accessor :location, :status, :owning_lib
         attr_reader :barcode, :call_number
         def initialize data = {}
             data.each do |k,v|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evergreen_holdings
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jane Sandberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A ruby gem for getting information about copy availability from Evergreen