evergreen_holdings 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f1ded6a6dc9a553da283e9ed64dfb04c6334d0bd8b7259cc18fc00ac76f713e
-  data.tar.gz: 037d0726e922e58b20bcffe0daaa8fcbdbcfe1e8973109d69e18ff75e761a1c9
+  metadata.gz: 3f3cf8a83e3df42e8fa423883564558c82c18dfb716a449509450aeb9bcea8ab
+  data.tar.gz: 6085f268fb39a45ab2d136b1a32cce74b7f68ef46fa19b481b7b47bceffabfbd
 SHA512:
-  metadata.gz: 798f5c3213570fdaee11a90382469be3466165b5c96bf850fa9ab5d2eadfed1dde9859e28a2e9665201839e5aec67b2337b780aa4493ffbe6336608b849306cc
-  data.tar.gz: 0aa44ee1fcb9f66ff00df1a2cce7b79fbda8becee930a6559829292f0ca6ee686bd415efe2accff16f390d936f50b9c87f83cc901a67720d549f44de09d098a3
+  metadata.gz: b92e0c37217d1c54297f9eda1767f095b717e2f52b25258135ac72a67a40040c8aedf8659adf00d19da078d7b4e930258fe3e776bbcd3a2545d5b8153f32a41e
+  data.tar.gz: b6c2361c0be07a46eeefc02ebecd3a6fe329d726b46336a8ff592c156dc9b7b96cf1a737ef025deac0c4d6311d4e0e552fb354e60ace394ceb8e9b78a30db4cd

data/lib/evergreen_holdings.rb

@@ -1,6 +1,8 @@
 require 'net/http'
 require 'json'
 require 'evergreen_holdings/errors'
+require 'nokogiri'
+require 'open-uri'
 
 OSRF_PATH = '/osrf-gateway-v1'
 
@@ -12,11 +14,13 @@ module EvergreenHoldings
         #
         # Usage: `conn = EvergreenHoldings::Connection.new 'http://gapines.org'`
         def initialize evergreen_domain
+            @evergreen_domain = evergreen_domain
             @gateway = URI evergreen_domain+OSRF_PATH
+            fetch_idl_order
             unless fetch_statuses
                 raise CouldNotConnectToEvergreenError
             end
-	    fetch_ou_tree
+            fetch_ou_tree
         end
 
         # Fetch holdings data from the Evergreen server
@@ -25,9 +29,6 @@ module EvergreenHoldings
         # Usage: `stat = conn.get_holdings 23405`
         # If you just want holdings at a specific org_unit: `my_connection.get_holdings 23405, org_unit: 5`
         def get_holdings tcn, options = {}
-            if tcn.nil? || tcn.empty?
-                raise NoCatalogIdProvidedError
-            end
             if options.key?(:org_unit)
                 if options[:descendants]
                     params = "format=json&input_format=json&service=open-ils.cat&method=open-ils.cat.asset.copy_tree.retrieve&param=auth_token_not_needed_for_this_call&param=#{tcn}"
@@ -45,7 +46,7 @@ module EvergreenHoldings
             @gateway.query = params
 
             res = send_query
-            return Status.new res.body, self if res
+            return Status.new res.body, @idl_order, self if res
         end
 
 	# Given an ID, returns a human-readable name
@@ -56,7 +57,7 @@ module EvergreenHoldings
             if res
                 data = JSON.parse(res.body)['payload'][0]
                 unless data.key? 'stacktrace'
-                    return data['__p'][4]
+                    return data['__p'][@idl_order[:acpl]['name']]
                 end
             end
             return id
@@ -80,13 +81,14 @@ module EvergreenHoldings
 	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]
+            id = o[@idl_order[:aou]['id']]
+	    @org_units[id] = {}
+	    @org_units[id][:name] = o[@idl_order[:aou]['name']]
+	    if o[@idl_order[:aou]['parent_ou']]
+	        @org_units[id][:parent] = o[@idl_order[:aou]['parent_ou']]
+	        add_ou_descendants id, o[@idl_order[:aou]['parent_ou']]
             end
-	    o[0].each do |p|
+	    o[@idl_order[:aou]['children']].each do |p|
 	        take_info_from_ou_tree p['__p']
 	    end 
 	end
@@ -102,6 +104,22 @@ module EvergreenHoldings
             return nil
         end
 
+        def fetch_idl_order
+            @idl_order = {}
+
+            idl = Nokogiri::XML(open(@evergreen_domain + '/reports/fm_IDL.xml'))
+
+            [:acn, :acp, :acpl, :aou, :ccs, :circ].each do |idl_class|
+                i = 0
+                @idl_order[idl_class] = {}
+                fields = idl.xpath("//idl:class[@id='#{idl_class}']/idl:fields/idl:field", 'idl' => 'http://opensrf.org/spec/IDL/base/v1')
+                fields.each do |field|
+                    @idl_order[idl_class][field['name']] = i
+                    i = i + 1
+                end
+            end
+        end
+
         def fetch_statuses
             @possible_item_statuses = []
             params = 'format=json&input_format=json&service=open-ils.search&method=open-ils.search.config.copy_status.retrieve.all'
@@ -110,7 +128,7 @@ module EvergreenHoldings
             if res
                 stats = JSON.parse(res.body)['payload'][0]
                 stats.each do |stat|
-                    @possible_item_statuses[stat['__p'][1]] = stat['__p'][2]
+                    @possible_item_statuses[stat['__p'][@idl_order[:ccs]['id']]] = stat['__p'][@idl_order[:ccs]['name']]
                 end
                 return true if stats.size > 0
             end
@@ -135,7 +153,8 @@ module EvergreenHoldings
     # Status objects represent all the holdings attached to a specific tcn
     class Status
         attr_reader :copies, :libraries
-        def initialize json_data, connection = nil
+        def initialize json_data, idl_order, connection = nil
+            @idl_order = idl_order
             @connection = connection
             @raw_data = JSON.parse(json_data)['payload'][0]
             extract_copies
@@ -162,14 +181,21 @@ module EvergreenHoldings
                 if vol['__p'][0].size > 0
                     vol['__p'][0].each do |item|
 			i = 0
-                        unless item['__p'][35].is_a? Array
-				@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]
+                        item_info = {
+                            barcode: item['__p'][@idl_order[:acp]['barcode']],
+                            call_number: vol['__p'][@idl_order[:acn]['label']],
+                            location: item['__p'][@idl_order[:acp]['location']],
+                            status: item['__p'][@idl_order[:acp]['status']],
+                            owning_lib: item['__p'][@idl_order[:acp]['circ_lib']],
+                        }
+                        unless item['__p'][@idl_order[:acp]['circulations']].is_a? Array
+				@copies.push Item.new item_info
                         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], owning_lib: item['__p'][5]
+                                    item_info[:due_date] = item['__p'][@idl_order[:acp]['circulations']][0]['__p'][@idl_order[:circ]['due_date']]
                             rescue
-				    @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
+	                    @copies.push Item.new item_info
                         end
                     end
                 end

data/lib/evergreen_holdings/errors.rb

@@ -1,4 +1,2 @@
 class CouldNotConnectToEvergreenError < StandardError
 end
-class NoCatalogIdProvidedError < StandardError
-end

metadata

@@ -1,33 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: evergreen_holdings
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jane Sandberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.4
+  name: nokogiri
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.4
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   name: minitest
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
   name: coveralls
@@ -35,7 +49,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
 description: Access holdings information from Evergreen ILS
@@ -47,7 +61,7 @@ files:
 - lib/evergreen_holdings.rb
 - lib/evergreen_holdings/errors.rb
 - test/evergreen_holdings_test.rb
-homepage:
+homepage: https://github.com/sandbergja/evergreen_holdings_gem
 licenses:
 - MIT
 metadata: {}