libis-services 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c6005df56e91ea7b9806570aefb5a024bc01a4
-  data.tar.gz: 4ab1b7d063c4f2aaf10143aca268051c176e56da
+  metadata.gz: 1939b9a4c0048b76d3d44dc3a002085ad7f39e28
+  data.tar.gz: 68fa2f7271055a8433dba8f832af917551c249d9
 SHA512:
-  metadata.gz: d1d1080408037cc6725bcd78a3001269f733f8d8b06e7b8b32ad926c68425662f0050460da1233575787eb512eca4798ac371cf697fad1e60fcbe8c926a7b87e
-  data.tar.gz: d41b1ef29ba1a94f66ab93c135d3383be513c6fde2180ab85998e096dc6174bfc5fef93014ce8c96be71b5c568f8670c398a2c251954c7dfd377f1f8c16ba041
+  metadata.gz: c57e4e644a234e526ffaa316114194df3fc17284e76e52c68e748d2e0d6821b856d12d110a5df40b33ccc711b1a5cc46e7e351d3a1c36bc763e469e5d33ddefd
+  data.tar.gz: 3aa269554726807010b99a8273fd9d02db1b9486acb86ea24cd35034e3fe5bc1782a28033c9b99d9d32230a6a74bbb5b7db9ddbbc19454fc7e54a965aed50ddb

data/lib/libis/services/alma/sru_service.rb

@@ -15,22 +15,30 @@ module Libis
         end
 
         def search(field, value, library = '32KUL_LIBIS_NETWORK')
+
           result = get library, version: '1.2', operation: 'searchRetrieve', recordSchema: 'marcxml',
                        query: "#{field}=#{value}"
 
-          unless result['//diag:diagnostic'].blank?
-            raise Libis::Services::ServiceError, "#{result['/searchRetrieveResponse/diag:diagnostic/diag:message']}"
-          end
+          if result.is_a?(Libis::Tools::XmlDocument)
+
+            unless result['//diag:diagnostic'].blank?
+              raise Libis::Services::ServiceError, "#{result['/searchRetrieveResponse/diag:diagnostic/diag:message']}"
+            end
 
-          result.xpath('//record').map do |record|
-            Libis::Tools::XmlDocument.parse(record.to_s)
+            return result.xpath('//record').map do |record|
+              Libis::Tools::XmlDocument.parse(record.to_s)
+            end
           end
+
+          raise Libis::Services::ServiceError, "#{result[:error_type]} - #{result[:error_name]}" if result[:error_type]
+          raise Libis::Services::ServiceError, "Unexpected reply: '#{result.to_s}' (#{result.class})"
+
         end
 
         protected
 
         def result_parser(response)
-          Libis::Tools::XmlDocument.parse(response)
+          Libis::Tools::XmlDocument.parse(response) rescue response
         end
 
       end

data/lib/libis/services/primo/limo.rb

@@ -15,17 +15,25 @@ module Libis
         end
 
         def get_marc(alma_id)
-          get 'primo_library/libweb/jqprimo/helpers/record_helper.jsp', id: "#{alma_id}.xml"
+          result = get "primo_library/libweb/jqp/record/#{alma_id}.xml"
+          return result if result.is_a?(Libis::Tools::XmlDocument)
+
+          raise Libis::Services::ServiceError, "#{result[:error_type]} - #{result[:error_name]}" if result[:error_type]
+          raise Libis::Services::ServiceError, "Unexpected reply: '#{result.to_s}' (#{result.class})"
         end
 
         def get_pnx(alma_id)
-          get 'primo_library/libweb/jqprimo/helpers/record_helper.jsp', id: "#{alma_id}.pnx"
+          result = get "primo_library/libweb/jqp/record/#{alma_id}.pnx"
+          return result if result.is_a?(Libis::Tools::XmlDocument)
+
+          raise Libis::Services::ServiceError, "#{result[:error_type]} - #{result[:error_name]}" if result[:error_type]
+          raise Libis::Services::ServiceError, "Unexpected reply: '#{result.to_s}' (#{result.class})"
         end
 
         protected
 
         def result_parser(response)
-          Libis::Tools::XmlDocument.parse(response)
+          Libis::Tools::XmlDocument.parse(response) rescue response
         end
       end
     end

data/lib/libis/services/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Services
-    VERSION = '0.1.3'
+    VERSION = '0.1.5'
   end
 end

data/spec/alma_service_spec.rb

@@ -8,14 +8,14 @@ describe 'Alma' do
 
   let(:record) {
     {
-        leader: '01206nas  2200337u  4500',
+        leader: '01205nas a2200337u  4500',
         controlfield: ['9930800070101471', '20151015113543.0', '881205c19679999be  r|p||     0|||a|dut c'],
         datafield: [
             {
                 subfield: '(BeLVLBS)003080007LBS01-Aleph',
                 :@tag => '035', :@ind1 => ' ', :@ind2 => ' '
             }, {
-                subfield: 'Kerk en leven. Bisdom Antwerpen (0991).',
+                subfield: 'Kerk en leven. Bisdom Antwerpen (0991)',
                 :@tag => '245', :@ind1 => '0', :@ind2 => '0'
             }, {
                 subfield: 'K & L',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-services
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -316,3 +316,4 @@ test_files:
 - spec/rosetta_producer_spec.rb
 - spec/rosetta_sip_spec.rb
 - spec/spec_helper.rb
+has_rdoc: