voyager_api 0.3.10 → 0.3.11

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/lib/holdings/collection.rb

@@ -129,7 +129,7 @@ module Voyager
         holdings.each do |holding|
           if [:summary_holdings, :supplements, :indexes, :notes,
               :reproduction_note, :current_issues, :temp_locations,
-              :orders, :donor_info].any? { |key| !holding[key].empty?}
+              :orders, :donor_info, :urls].any? { |key| !holding[key].empty?}
             complexity = :complex
           end
         end
@@ -197,7 +197,7 @@ module Voyager
             end
             # add other elements to :copies array
             [:current_issues, :donor_info, :indexes, :notes, :orders, :reproduction_note, :supplements,
-              :summary_holdings, :temp_locations].each { |type| add_holdings_elements(out,holding,type,options[:message_type]) }
+              :summary_holdings, :temp_locations, :urls].each { |type| add_holdings_elements(out,holding,type,options[:message_type]) }
 
             entry[:copies] << out
 
@@ -246,6 +246,8 @@ module Voyager
           out[type] = "Library has: " + holding[type].join(' ') unless holding[type].empty?
         when :temp_locations
           out[type] = holding[type] unless holding[type].empty?
+        when :urls
+          out[type] = holding[type] unless holding[type].empty?
         else
         end
 

data/lib/holdings/record.rb

@@ -285,29 +285,51 @@ module Voyager
         urls = []
         
         tag856.each do |field|
+
+          ind1 = field.attr("ind1")
+          ind2 = field.attr("ind2")
           
-          # only process idicators 40
-          if field.attr("ind1") == '4' and field.attr("ind2") == '0'
-            
-            subu = field.at_css("slim|subfield[@code='u']")
-            subz = field.at_css("slim|subfield[@code='z']")
-            sub3 = field.at_css("slim|subfield[@code='3']")
- 
-            # only process if there is a url
-            if subu
+          subu = field.at_css("slim|subfield[@code='u']")
+          subz = field.at_css("slim|subfield[@code='z']")
+          sub3 = field.at_css("slim|subfield[@code='3']")
+           
+          # only process if there is a url
+          if subu
             
-              url = subu.content
+            url = subu.content
               
-              link_text = [sub3, subz].compact.collect { |subfield| subfield.content }
-
-              if link_text.empty?
-                link_text << url
-              end
+            link_text = [sub3, subz].compact.collect { |subfield| subfield.content }
+          
+            if link_text.empty?
+              link_text << url
+            end
               
-              urls << { :url => url, :link_text => link_text.join(' ') }
+            urls << { :ind1 => ind1, :ind2 => ind2, :url => url, :link_text => link_text.join(' ') }
             
-            end
-          end
+          end          
+          
+          # # only process idicators 40
+          # if field.attr("ind1") == '4' and field.attr("ind2") == '0'
+          #   
+          #   subu = field.at_css("slim|subfield[@code='u']")
+          #   subz = field.at_css("slim|subfield[@code='z']")
+          #   sub3 = field.at_css("slim|subfield[@code='3']")
+          #  
+          #   # only process if there is a url
+          #   if subu
+          #   
+          #     url = subu.content
+          #     
+          #     link_text = [sub3, subz].compact.collect { |subfield| subfield.content }
+          # 
+          #     if link_text.empty?
+          #       link_text << url
+          #     end
+          #     
+          #     urls << { :url => url, :link_text => link_text.join(' ') }
+          #   
+          #   end
+          # end
         end
         
         urls

data/test/fixtures/holdings_2320514.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ser:voyagerServiceData xmlns:ser="http://www.endinfosys.com/Voyager/serviceParameters"><ser:serviceData xsi:type="hol:holdingsCollectionType" xmlns:hol="http://www.endinfosys.com/Voyager/holdings" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><hol:holdingsRecord><hol:bibRecord bibId="2320514" dpsFlag="N"><hol:marcRecord><slim:leader xmlns:slim="http://www.loc.gov/MARC21/slim">00781cam a22002295u 4500</slim:leader><slim:controlfield tag="001" xmlns:slim="http://www.loc.gov/MARC21/slim">2320514</slim:controlfield><slim:controlfield tag="005" xmlns:slim="http://www.loc.gov/MARC21/slim">20100221104945.0</slim:controlfield><slim:controlfield tag="008" xmlns:slim="http://www.loc.gov/MARC21/slim">990714s1975||||nyu|||||||||||||| ||eng|d</slim:controlfield><slim:datafield ind2=" " ind1=" " tag="035" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">(OCoLC)78926206</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="035" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">(OCoLC)ocm78926206</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="035" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="9">APH8939CU</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="035" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">(NNC)2320514</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="040" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">NNC</slim:subfield><slim:subfield code="c">NNC</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="043" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">n-us-ny</slim:subfield></slim:datafield><slim:datafield ind2="4" ind1=" " tag="050" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">NA108.N4</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1="1" tag="110" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">New York (N.Y.).</slim:subfield><slim:subfield code="b">Landmarks Preservation Commission.</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1="1" tag="245" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Our Lady of Lourdes Roman Catholic Church, 467 West 142nd Street, Borough of Manhattan.</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="260" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">New York, N.Y. :</slim:subfield><slim:subfield code="b">The Commission,</slim:subfield><slim:subfield code="c">1975.</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="300" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">[6] p. ;</slim:subfield><slim:subfield code="c">36 cm.</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1="1" tag="490" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Designation list / Landmarks Preservation Commission ;</slim:subfield><slim:subfield code="v">2</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="590" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">"LP-0892."</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1="1" tag="810" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">New York (N.Y.).</slim:subfield><slim:subfield code="b">Landmarks Preservation Commission.</slim:subfield><slim:subfield code="t">Designation list ;</slim:subfield><slim:subfield code="v">2.</slim:subfield></slim:datafield></hol:marcRecord><hol:bibData name="databaseCode">LOCAL</hol:bibData><hol:bibData name="databaseName">Local Database</hol:bibData><hol:bibData name="createDate">2003-05-05 00:00:00</hol:bibData><hol:bibData name="updateDate">2010-02-21 10:49:45</hol:bibData><hol:bibData name="suppressInOpac">N</hol:bibData><hol:bibData name="exportOK">N</hol:bibData><hol:bibData name="exportOKDate" xsi:nil="true"/><hol:bibData name="exportOperatorId" xsi:nil="true"/><hol:bibData name="createLocation" xsi:nil="true"/><hol:bibData name="updateLocation" xsi:nil="true"/><hol:bibData name="exportOKLocation" xsi:nil="true"/><hol:bibData name="owningLibrary" id="1">COLUMBIA</hol:bibData></hol:bibRecord><hol:mfhdCollection><mfhd:mfhdRecord bibId="2320514" mfhdId="2800125" xmlns:mfhd="http://www.endinfosys.com/Voyager/mfhd"><mfhd:marcRecord><slim:leader xmlns:slim="http://www.loc.gov/MARC21/slim">00247nx  a2200109z  4500</slim:leader><slim:controlfield tag="001" xmlns:slim="http://www.loc.gov/MARC21/slim">2800125</slim:controlfield><slim:controlfield tag="004" xmlns:slim="http://www.loc.gov/MARC21/slim">2320514</slim:controlfield><slim:controlfield tag="005" xmlns:slim="http://www.loc.gov/MARC21/slim">20030429125527.0</slim:controlfield><slim:controlfield tag="008" xmlns:slim="http://www.loc.gov/MARC21/slim">0304292u    0   1001uu   0000000</slim:controlfield><slim:datafield ind2=" " ind1="1" tag="014" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">APH8939CU001</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1="0" tag="014" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="9">003416157</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1="8" tag="852" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="b">ave</slim:subfield><slim:subfield code="h">AA735 N4</slim:subfield><slim:subfield code="i">N4559 F v.17 LP-0892</slim:subfield></slim:datafield></mfhd:marcRecord><mfhd:mfhdData name="databaseCode">LOCAL</mfhd:mfhdData><mfhd:mfhdData name="databaseName">Local Database</mfhd:mfhdData><mfhd:mfhdData name="mfhdStubFlag">0</mfhd:mfhdData><mfhd:mfhdData name="createOperatorId">load</mfhd:mfhdData><mfhd:mfhdData name="updateOperatorId" xsi:nil="true"/><mfhd:mfhdData name="createDate">2003-05-06 00:00:00</mfhd:mfhdData><mfhd:mfhdData name="updateDate" xsi:nil="true"/><mfhd:mfhdData name="createLocation" xsi:nil="true"/><mfhd:mfhdData name="updateLocation" xsi:nil="true"/><mfhd:mfhdData name="suppressInOpac">N</mfhd:mfhdData><mfhd:mfhdData name="exportOK" xsi:nil="true"/><mfhd:mfhdData name="sourceModule" xsi:nil="true"/><mfhd:mfhdData name="callNumber">AA735 N4 N4559 F v.17 LP-0892</mfhd:mfhdData><mfhd:mfhdData name="locationCode" id="11">ave</mfhd:mfhdData><mfhd:mfhdData name="locationName" xsi:nil="true"/><mfhd:mfhdData name="locationDisplayName">Avery (Non-Circulating)</mfhd:mfhdData><mfhd:mfhdData name="locationSpineLabel">AVERY</mfhd:mfhdData><mfhd:mfhdData name="owningLibrary" id="1">COLUMBIA</mfhd:mfhdData><mfhd:itemCollection><item:itemCount xmlns:item="http://www.endinfosys.com/Voyager/item">0</item:itemCount><item:itemLocation xmlns:item="http://www.endinfosys.com/Voyager/item"><item:itemLocationData name="tmpLoc" xsi:nil="true"/><item:itemLocationData name="tempLocation">Avery (Non-Circulating)</item:itemLocationData><item:itemLocationData name="itemEnum" xsi:nil="true"/><item:itemLocationData name="itemChron" xsi:nil="true"/><item:itemLocationData name="itemYear" xsi:nil="true"/><item:itemLocationData name="itemCaption" xsi:nil="true"/><item:itemLocationData name="itemFreeText" xsi:nil="true"/><item:itemLocationData name="itemCopyNumber" xsi:nil="true"/></item:itemLocation></mfhd:itemCollection></mfhd:mfhdRecord><mfhd:mfhdRecord bibId="2320514" mfhdId="10089785" xmlns:mfhd="http://www.endinfosys.com/Voyager/mfhd"><mfhd:marcRecord><slim:leader xmlns:slim="http://www.loc.gov/MARC21/slim">00268nx  a22000974  4500</slim:leader><slim:controlfield tag="001" xmlns:slim="http://www.loc.gov/MARC21/slim">10089785</slim:controlfield><slim:controlfield tag="004" xmlns:slim="http://www.loc.gov/MARC21/slim">2320514</slim:controlfield><slim:controlfield tag="005" xmlns:slim="http://www.loc.gov/MARC21/slim">20090313144308.0</slim:controlfield><slim:controlfield tag="008" xmlns:slim="http://www.loc.gov/MARC21/slim">0903135f    8   4001bb   0901128</slim:controlfield><slim:datafield ind2=" " ind1="8" tag="852" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="b">lweb</slim:subfield><slim:subfield code="h">EBOOKS</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1="4" tag="856" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="u">http://www.neighborhoodpreservationcenter.org/db/bb_files/OUR-LADY-OF-LOURDES.pdf</slim:subfield></slim:datafield></mfhd:marcRecord><mfhd:mfhdData name="databaseCode">LOCAL</mfhd:mfhdData><mfhd:mfhdData name="databaseName">Local Database</mfhd:mfhdData><mfhd:mfhdData name="mfhdStubFlag">0</mfhd:mfhdData><mfhd:mfhdData name="createOperatorId">scmc3</mfhd:mfhdData><mfhd:mfhdData name="updateOperatorId" xsi:nil="true"/><mfhd:mfhdData name="createDate">2009-03-13 14:43:08</mfhd:mfhdData><mfhd:mfhdData name="updateDate" xsi:nil="true"/><mfhd:mfhdData name="createLocation">CATCUL</mfhd:mfhdData><mfhd:mfhdData name="updateLocation" xsi:nil="true"/><mfhd:mfhdData name="suppressInOpac">N</mfhd:mfhdData><mfhd:mfhdData name="exportOK">N</mfhd:mfhdData><mfhd:mfhdData name="sourceModule">C</mfhd:mfhdData><mfhd:mfhdData name="callNumber">EBOOKS</mfhd:mfhdData><mfhd:mfhdData name="locationCode" id="238">lweb</mfhd:mfhdData><mfhd:mfhdData name="locationName" xsi:nil="true"/><mfhd:mfhdData name="locationDisplayName">Online</mfhd:mfhdData><mfhd:mfhdData name="locationSpineLabel">lweb</mfhd:mfhdData><mfhd:mfhdData name="owningLibrary" id="1">COLUMBIA</mfhd:mfhdData><mfhd:itemCollection><item:itemCount xmlns:item="http://www.endinfosys.com/Voyager/item">0</item:itemCount><item:itemLocation xmlns:item="http://www.endinfosys.com/Voyager/item"><item:itemLocationData name="tmpLoc" xsi:nil="true"/><item:itemLocationData name="tempLocation">Online</item:itemLocationData><item:itemLocationData name="itemEnum" xsi:nil="true"/><item:itemLocationData name="itemChron" xsi:nil="true"/><item:itemLocationData name="itemYear" xsi:nil="true"/><item:itemLocationData name="itemCaption" xsi:nil="true"/><item:itemLocationData name="itemFreeText" xsi:nil="true"/><item:itemLocationData name="itemCopyNumber" xsi:nil="true"/></item:itemLocation></mfhd:itemCollection></mfhd:mfhdRecord></hol:mfhdCollection></hol:holdingsRecord></ser:serviceData></ser:voyagerServiceData>

data/test/holdings/test_collection_output.rb

@@ -63,6 +63,13 @@ class TestCollectionOutput < HoldingsTestCase
     output = coll.to_hash(:output_type => :condensed)
     assert_equal "Donor: Gift; Paul Levitz; 2012.", output[:condensed_holdings_full][0][:copies][0][:donor_info]
 
+    coll = load_fixture("holdings_2320514.xml")
+    output = coll.to_hash(:output_type => :condensed)
+    assert_equal "4", output[:condensed_holdings_full][1][:copies][0][:urls][0][:ind1]
+    assert_equal "0", output[:condensed_holdings_full][1][:copies][0][:urls][0][:ind2]
+    assert_equal "http://www.neighborhoodpreservationcenter.org/db/bb_files/OUR-LADY-OF-LOURDES.pdf", output[:condensed_holdings_full][1][:copies][0][:urls][0][:url]
+    assert_equal "http://www.neighborhoodpreservationcenter.org/db/bb_files/OUR-LADY-OF-LOURDES.pdf", output[:condensed_holdings_full][1][:copies][0][:urls][0][:link_text]
+
   end
   
   def test_condensed_holdings_output_brief

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voyager_api
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000Z
+date: 2013-10-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152813720 !ruby/object:Gem::Requirement
+  requirement: &2152748480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152813720
+  version_requirements: *2152748480
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152812840 !ruby/object:Gem::Requirement
+  requirement: &2152746940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152812840
+  version_requirements: *2152746940
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &2152812160 !ruby/object:Gem::Requirement
+  requirement: &2152745980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152812160
+  version_requirements: *2152745980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152811040 !ruby/object:Gem::Requirement
+  requirement: &2152744920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152811040
+  version_requirements: *2152744920
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152810340 !ruby/object:Gem::Requirement
+  requirement: &2152743140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152810340
+  version_requirements: *2152743140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152809680 !ruby/object:Gem::Requirement
+  requirement: &2152741220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152809680
+  version_requirements: *2152741220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152809040 !ruby/object:Gem::Requirement
+  requirement: &2152739640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152809040
+  version_requirements: *2152739640
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152808460 !ruby/object:Gem::Requirement
+  requirement: &2152738080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152808460
+  version_requirements: *2152738080
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2152807840 !ruby/object:Gem::Requirement
+  requirement: &2152736360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152807840
+  version_requirements: *2152736360
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2152807180 !ruby/object:Gem::Requirement
+  requirement: &2152734440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152807180
+  version_requirements: *2152734440
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152806420 !ruby/object:Gem::Requirement
+  requirement: &2152732580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152806420
+  version_requirements: *2152732580
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2152805480 !ruby/object:Gem::Requirement
+  requirement: &2152729640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152805480
+  version_requirements: *2152729640
 description: ! 'Middleware gem for Voyager 7 API calls, specificially holdings information '
 email: github@jamesstuart.org
 executables: []
@@ -178,6 +178,7 @@ files:
 - test/fixtures/holdings_1558940.xml
 - test/fixtures/holdings_1717646.xml
 - test/fixtures/holdings_2120018.xml
+- test/fixtures/holdings_2320514.xml
 - test/fixtures/holdings_2606957.xml
 - test/fixtures/holdings_289196.xml
 - test/fixtures/holdings_299492.xml
@@ -241,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3727957672873813244
+      hash: -3985555000346502000
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: