evergreen_holdings 0.1.8 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bc48757194a624a320a66952894f1fb06feb2d3
-  data.tar.gz: bc39854e6d931c380a7996b8c998268917254bf7
+  metadata.gz: da13869aee1d6030dc730f20f662d3bbae682f1b
+  data.tar.gz: efbf034638ed3b6b301934de474f1dc1365bcfcb
 SHA512:
-  metadata.gz: cf9824129e3a2aaaa7c4f58a3e2534f014b9d33ddb9bf0f7ad8950324849b22522f29574b2e7e53056595ce1f3dbb130957eb1aa2d7248371bfc21919b66c9bf
-  data.tar.gz: d701f9dc7a595241544540e1cdb714a2b78be515adfa4bf476f257c27476b555a1cd614e208a507159f9052240693fbfdb4b47e9a993ca3f3843cfee4c0e8dfe
+  metadata.gz: 8a874195ffa5f2c7b0a202cecf66121d487d8eca4f60cf8ba0536f258040cc9a58d50dda5d6b4f62d6dcb17ce93a46654cdc3e3b0b6b81d0f0ca16872839ef6b
+  data.tar.gz: 9557150bed33a4e14d189e1ee2cd0e8f6048ca44d63cd289bb10e32547e315ed7b2a5c2ad8efc73d346b1179dca1d5d52686a951e06c6e66ee6c62f443b98138

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
@@ -42,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
@@ -53,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
@@ -77,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
@@ -99,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'
@@ -107,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
@@ -132,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
@@ -158,14 +180,22 @@ module EvergreenHoldings
             @raw_data.each do |vol|
                 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], owning_lib: item['__p'][5]
+			i = 0
+                        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
@@ -195,7 +225,7 @@ module EvergreenHoldings
     # A physical copy of an item
     class Item
         attr_accessor :location, :status, :owning_lib
-        attr_reader :barcode, :call_number
+        attr_reader :barcode, :call_number, :due_date
         def initialize data = {}
             data.each do |k,v|
                 instance_variable_set("@#{k}", v) unless v.nil?

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: evergreen_holdings
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.3.1
 platform: ruby
 authors:
 - Jane Sandberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   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: {}
@@ -67,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A ruby gem for getting information about copy availability from Evergreen