voyager_api 0.3.7 → 0.3.8

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/holdings/collection.rb

@@ -3,7 +3,7 @@ module Voyager
     class Collection
       attr_reader :records, :xml
 
-      DEFAULT_OPAC_URL = "http://sapote.cc.columbia.edu:7014/vxws/GetHoldingsService"
+      DEFAULT_OPAC_URL = "http://vetiver.cc.columbia.edu:7014/vxws/GetHoldingsService"
 
       # Invoke GetHoldingsService
       def self.new_from_opac(bibid, conn = nil, url = DEFAULT_OPAC_URL)
@@ -13,10 +13,17 @@ module Voyager
 
       # Convert raw xml from GetHoldingsService to xml record object
       def initialize(raw_xml)
-        @xml = load_and_namespace_xml(raw_xml)
+        raise "Voyager::Holdings::Collection got nil/empty raw_xml" unless raw_xml
+
+        # transform raw_xml String into Nokogiri XML Document
+        xml = Nokogiri::XML(raw_xml)
+        raise "Voyager::Holdings::Collection retrieved nil/invalid XML" unless xml and xml.root
+
+        # transform raw_xml String into Nokogiri XML Document
+        @xml = add_xml_namespaces(xml)
         parse_xml
       end
-      
+
       # Generate output hash from Record class instances
       def to_hash(options = {})
         options.reverse_merge!(:output_type => :raw, :content_type => :full, :message_type => :long_message)
@@ -30,11 +37,11 @@ module Voyager
         #   if :content_type == :full
         #     :message_type --> :short_message | :long_message (default)
         #   
-        
+
         raise ":output_type not defined" unless options[:output_type] == :raw || options[:output_type] == :condensed
         raise ":content_type not defined" unless options[:content_type] == :full || options[:content_type] == :brief
         raise ":message_type not defined" unless options[:message_type] == :long_message || options[:message_type] == :short_message
-        
+
         output = {}
 
         case options[:output_type]
@@ -50,16 +57,15 @@ module Voyager
             output[:condensed_holdings_brief] = condense_holdings(holdings,options)
           end
         end
-          
+
         output
 
       end
 
       private
 
-      # Create xml record object with searchable namespaces
-      def load_and_namespace_xml(raw_xml)
-        xml = Nokogiri::XML(raw_xml)
+      # Add searchable namespaces to xml object
+      def add_xml_namespaces(xml)
         xml.root.add_namespace_definition("hol", "http://www.endinfosys.com/Voyager/holdings")
         xml.root.add_namespace_definition("mfhd", "http://www.endinfosys.com/Voyager/mfhd")
         xml.root.add_namespace_definition("item", "http://www.endinfosys.com/Voyager/item")
@@ -69,6 +75,12 @@ module Voyager
 
       # Collect Record class instances for each mfhd:mfhdRecord node in xml record objext
       def parse_xml
+        # First, look for any service messages - raise them as an error
+        if first_ser_message = @xml.at_xpath('//ser:messages/ser:message')
+          # just throw as Rails default StandardError, with details in the message
+          raise "#{first_ser_message.attr('errorCode')} #{first_ser_message.content}"
+        end
+
         leader = @xml.at_css("hol|bibRecord>hol|marcRecord>slim|leader").content
         @records = @xml.css("hol|mfhdCollection>mfhd|mfhdRecord").collect do |record_node|
           Record.new(record_node,leader)
@@ -80,13 +92,13 @@ module Voyager
       # -- remove document delivery options if there is an available offsite copy
       # -- remove borrowdirect and ill options if there is an available non-reserve, circulating copy
       def adjust_services(records)
-        
+
         # set flags
         offsite_copy = "N"
         available_copy = "N"
-        records.each do |record| 
+        records.each do |record|
           offsite_copy = "Y" if record.services.include?('offsite')
-          if record.item_status[:status] == 'available' 
+          if record.item_status[:status] == 'available'
             available_copy = "Y" unless record.location_name.match(/Reserve|Non\-Circ/)
           end
         end
@@ -97,11 +109,11 @@ module Voyager
           record.services.delete('borrow_direct') if available_copy == "Y"
           record.services.delete('ill') if available_copy == "Y"
         end
-        
+
       end
 
       def condense_holdings(holdings,options)
-        
+
         # processing varies depending on complexity
         complexity = determine_complexity(holdings)
         process_holdings(holdings,complexity,options)
@@ -128,10 +140,10 @@ module Voyager
 
       def process_holdings(holdings,complexity,options)
 
-        entries = [] 
+        entries = []
         holdings.each do |holding|
           # test for location and call number
-          entry = entries.find { |entry| entry[:location_name] == holding[:location_name] && 
+          entry = entries.find { |entry| entry[:location_name] == holding[:location_name] &&
             entry[:call_number] == holding[:call_number] }
 
           unless entry
@@ -188,13 +200,13 @@ module Voyager
               :summary_holdings, :temp_locations].each { |type| add_holdings_elements(out,holding,type,options[:message_type]) }
 
             entry[:copies] << out
-            
+
           end
 
           entry[:services] << holding[:services]
 
         end
-        
+
         # get overall status of each location entry
         entries.each { |entry| determine_overall_status(entry) }
 
@@ -206,7 +218,7 @@ module Voyager
       end
 
       def add_holdings_elements(out,holding,type,message_type)
-        
+
         case type
         when :current_issues
           out[type] = "Current Issues: " + holding[type].join('; ') unless holding[type].empty?
@@ -215,7 +227,7 @@ module Voyager
             messages = holding[type].each.collect { |info| info[:message] }
             out[type] = "Donor: " + messages.join('; ')
             codes = holding[type].each.collect { |info| info[:code] }
-            out[:donor_info_code] = codes.join(' - ')            
+            out[:donor_info_code] = codes.join(' - ')
           end
         when :indexes
           out[type] = "Indexes: " + holding[type].join(' ') unless holding[type].empty?
@@ -236,11 +248,11 @@ module Voyager
           out[type] = holding[type] unless holding[type].empty?
         else
         end
-        
+
       end
 
       def determine_overall_status(entry)
-        
+
         a = 0   # available
         s = 0   # some available
         n = 0   # not available
@@ -292,7 +304,7 @@ module Voyager
       end
 
       def output_condensed_holdings(entries,type)
-        
+
         case type
         when :full
           entries
@@ -305,7 +317,7 @@ module Voyager
               :services => entry[:services] }
           end
         end
-        
+
       end
 
     end

data/lib/holdings/record.rb

@@ -213,12 +213,14 @@ module Voyager
         tag867 = marc.css("slim|datafield[@tag='867']")
         
         return [] unless tag867
-        
-        supplements = tag867.collect do |field|
-          field.at_css("slim|subfield[@code='a']")
+
+        supplements = []
+        tag867.each do |field|
+          subs = field.css("slim|subfield").collect { |subfield| subfield.content if subfield.attr("code").match(/[az]/)}
+            supplements << subs.join(" ").strip unless subs.empty?
         end
-        
-        supplements.compact.collect { |subfield| subfield.content }
+
+        supplements
         
       end
       
@@ -236,11 +238,13 @@ module Voyager
         
         return [] unless tag868
         
-        indexes = tag868.collect do |field|
-          field.at_css("slim|subfield[@code='a']")
+        indexes = []
+        tag868.each do |field|
+          subs = field.css("slim|subfield").collect { |subfield| subfield.content if subfield.attr("code").match(/[az]/)}
+            indexes << subs.join(" ").strip unless subs.empty?
         end
-        
-        indexes.compact.collect { |subfield| subfield.content }
+
+        indexes
         
       end
       

data/lib/voyager_connection.rb

@@ -8,7 +8,7 @@ module Voyager
       @cookie_path = options[:cookie_path]
 
       set_cookie_path if @cookie_path
-      
+
 
     end
 
@@ -19,11 +19,11 @@ module Voyager
       return request
     end
 
-    def clean_session!(server = "http://sapote.cc.columbia.edu:7014")
+    def clean_session!(server = "http://vetiver.cc.columbia.edu:7014")
       @http_client.get_content(server + "/vxws/SessionCleanupService")
-     
+
     end
-    
+
     private
 
 
@@ -33,8 +33,8 @@ module Voyager
       FileUtils.mkdir_p(cookie_directory) unless File.exists?(cookie_directory)
 
       @http_client.set_cookie_store(@cookie_path)
-      
-      
+
+
     end
   end
 end

data/test/fixtures/holdings_2120018.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="2120018" dpsFlag="N"><hol:marcRecord><slim:leader xmlns:slim="http://www.loc.gov/MARC21/slim">00891mas a22003011  4500</slim:leader><slim:controlfield tag="001" xmlns:slim="http://www.loc.gov/MARC21/slim">2120018</slim:controlfield><slim:controlfield tag="005" xmlns:slim="http://www.loc.gov/MARC21/slim">20100219074209.0</slim:controlfield><slim:controlfield tag="008" xmlns:slim="http://www.loc.gov/MARC21/slim">900328u1879uuuufr ar    c    0    0fre d</slim:controlfield><slim:datafield ind2=" " ind1=" " tag="035" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">(OCoLC)504235520</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="035" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">(OCoLC)ocn504235520</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="035" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="9">ANF8070CU</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="035" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">(NNC)2120018</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="2" tag="111" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Salon (Exhibition : Paris, France)</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1="1" tag="245" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Catalogue illustré ...</slim:subfield><slim:subfield code="b">[sections de peinture et de sculpture]</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="250" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">"Nouvelle édition"</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="260" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Paris,</slim:subfield><slim:subfield code="c">1882-</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="300" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">v.</slim:subfield><slim:subfield code="b">illus., plates.</slim:subfield><slim:subfield code="c">23 cm.</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="310" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Annual</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1="0" tag="362" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">année 1-    1879-</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="500" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Title varies slightly.</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="500" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">1901 -   under the Société des artistes français.</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="500" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">1879 is "nouvelle édition"</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1=" " tag="650" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Art</slim:subfield><slim:subfield code="v">Exhibitions.</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1=" " tag="650" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Painting</slim:subfield><slim:subfield code="v">Exhibitions.</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1=" " tag="650" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Sculpture</slim:subfield><slim:subfield code="v">Exhibitions.</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="900" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">AUTH</slim:subfield></slim:datafield><slim:datafield ind2=" " ind1=" " tag="965" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">RECON</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-19 07:42:09</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="2120018" mfhdId="2580600" xmlns:mfhd="http://www.endinfosys.com/Voyager/mfhd"><mfhd:marcRecord><slim:leader xmlns:slim="http://www.loc.gov/MARC21/slim">00411cy  a22001214  4500</slim:leader><slim:controlfield tag="001" xmlns:slim="http://www.loc.gov/MARC21/slim">2580600</slim:controlfield><slim:controlfield tag="004" xmlns:slim="http://www.loc.gov/MARC21/slim">2120018</slim:controlfield><slim:controlfield tag="005" xmlns:slim="http://www.loc.gov/MARC21/slim">20130716143304.0</slim:controlfield><slim:controlfield tag="008" xmlns:slim="http://www.loc.gov/MARC21/slim">980417||    |   |   |||||       </slim:controlfield><slim:datafield ind2=" " ind1="1" tag="014" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">ANF8070CU001</slim:subfield></slim:datafield><slim:datafield ind2="1" ind1="8" tag="852" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="b">far</slim:subfield><slim:subfield code="h">N5069</slim:subfield><slim:subfield code="i">P211</slim:subfield></slim:datafield><slim:datafield ind2="1" ind1="4" tag="866" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="8">0</slim:subfield><slim:subfield code="a">année 1 (1879)-année 11 (1889), année 14 (1892)-année 15 (1893), année 18 (1896)-année 19 (1897), année 23 (1901)-année 36 (1914)</slim:subfield></slim:datafield><slim:datafield ind2="1" ind1="4" tag="867" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="8">0</slim:subfield><slim:subfield code="a">1880-1881</slim:subfield><slim:subfield code="z">bound in 1 v.</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">bb2316</mfhd:mfhdData><mfhd:mfhdData name="createDate">2003-05-06 00:00:00</mfhd:mfhdData><mfhd:mfhdData name="updateDate">2013-07-16 14:33:04</mfhd:mfhdData><mfhd:mfhdData name="createLocation" xsi:nil="true"/><mfhd:mfhdData name="updateLocation">CATCUL</mfhd:mfhdData><mfhd:mfhdData name="suppressInOpac">N</mfhd:mfhdData><mfhd:mfhdData name="exportOK" xsi:nil="true"/><mfhd:mfhdData name="sourceModule">C</mfhd:mfhdData><mfhd:mfhdData name="callNumber">N5069 P211</mfhd:mfhdData><mfhd:mfhdData name="locationCode" id="131">far</mfhd:mfhdData><mfhd:mfhdData name="locationName" xsi:nil="true"/><mfhd:mfhdData name="locationDisplayName">Avery Classics (Non-Circulating)</mfhd:mfhdData><mfhd:mfhdData name="locationSpineLabel">far</mfhd:mfhdData><mfhd:mfhdData name="owningLibrary" id="1">COLUMBIA</mfhd:mfhdData><mfhd:itemCollection><item:itemCount xmlns:item="http://www.endinfosys.com/Voyager/item">30</item:itemCount><item:itemRecord xmlns:item="http://www.endinfosys.com/Voyager/item"><item:itemData name="statusCode">1</item:itemData><item:itemData name="statusDate" xsi:nil="true"/><item:itemData name="holdLocation" xsi:nil="true"/><item:itemData name="requestCount">0</item:itemData><item:itemData name="patronGroupCode" xsi:nil="true"/><item:itemData name="lastName" xsi:nil="true"/><item:itemData name="firstName" xsi:nil="true"/><item:itemData name="todaysDate">2013-07-31 11:41:35</item:itemData><item:itemData name="enumeration" xsi:nil="true"/><item:itemData name="chronology" xsi:nil="true"/><item:itemData name="year" xsi:nil="true"/><item:itemData name="caption" xsi:nil="true"/><item:itemData name="text" xsi:nil="true"/><item:itemData name="copyNumber" xsi:nil="true"/><item:itemData name="callNumber"/></item:itemRecord><item:itemLocation xmlns:item="http://www.endinfosys.com/Voyager/item"><item:itemLocationData name="tmpLoc" xsi:nil="true"/><item:itemLocationData name="tempLocation">Avery Classics (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="2120018" mfhdId="13450046" xmlns:mfhd="http://www.endinfosys.com/Voyager/mfhd"><mfhd:marcRecord><slim:leader xmlns:slim="http://www.loc.gov/MARC21/slim">00210cy  a22000974  4500</slim:leader><slim:controlfield tag="001" xmlns:slim="http://www.loc.gov/MARC21/slim">13450046</slim:controlfield><slim:controlfield tag="004" xmlns:slim="http://www.loc.gov/MARC21/slim">2120018</slim:controlfield><slim:controlfield tag="005" xmlns:slim="http://www.loc.gov/MARC21/slim">20130716143024.0</slim:controlfield><slim:controlfield tag="008" xmlns:slim="http://www.loc.gov/MARC21/slim">1307162p    8   2001aa   0901128</slim:controlfield><slim:datafield ind2="1" ind1="8" tag="852" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="b">far</slim:subfield><slim:subfield code="h">N5069</slim:subfield><slim:subfield code="i">P211</slim:subfield></slim:datafield><slim:datafield ind2="1" ind1="4" tag="866" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="8">0</slim:subfield><slim:subfield code="a">année 2 (1880)</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">bb2316</mfhd:mfhdData><mfhd:mfhdData name="updateOperatorId">bb2316</mfhd:mfhdData><mfhd:mfhdData name="createDate">2013-07-16 14:05:00</mfhd:mfhdData><mfhd:mfhdData name="updateDate">2013-07-16 14:30:24</mfhd:mfhdData><mfhd:mfhdData name="createLocation">CATCUL</mfhd:mfhdData><mfhd:mfhdData name="updateLocation">CATCUL</mfhd:mfhdData><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">N5069 P211</mfhd:mfhdData><mfhd:mfhdData name="locationCode" id="131">far</mfhd:mfhdData><mfhd:mfhdData name="locationName" xsi:nil="true"/><mfhd:mfhdData name="locationDisplayName">Avery Classics (Non-Circulating)</mfhd:mfhdData><mfhd:mfhdData name="locationSpineLabel">far</mfhd:mfhdData><mfhd:mfhdData name="owningLibrary" id="1">COLUMBIA</mfhd:mfhdData><mfhd:itemCollection><item:itemCount xmlns:item="http://www.endinfosys.com/Voyager/item">1</item:itemCount><item:itemRecord xmlns:item="http://www.endinfosys.com/Voyager/item"><item:itemData name="statusCode">1</item:itemData><item:itemData name="statusDate" xsi:nil="true"/><item:itemData name="holdLocation" xsi:nil="true"/><item:itemData name="requestCount">0</item:itemData><item:itemData name="patronGroupCode" xsi:nil="true"/><item:itemData name="lastName" xsi:nil="true"/><item:itemData name="firstName" xsi:nil="true"/><item:itemData name="todaysDate">2013-07-31 11:41:35</item:itemData><item:itemData name="enumeration" xsi:nil="true"/><item:itemData name="chronology" xsi:nil="true"/><item:itemData name="year" xsi:nil="true"/><item:itemData name="caption" xsi:nil="true"/><item:itemData name="text" xsi:nil="true"/><item:itemData name="copyNumber" xsi:nil="true"/><item:itemData name="callNumber"/></item:itemRecord><item:itemLocation xmlns:item="http://www.endinfosys.com/Voyager/item"><item:itemLocationData name="tmpLoc" xsi:nil="true"/><item:itemLocationData name="tempLocation">Avery Classics (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></hol:mfhdCollection></hol:holdingsRecord></ser:serviceData></ser:voyagerServiceData>

data/test/fixtures/holdings_8891001_3.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="8891001" dpsFlag="N"><hol:marcRecord><slim:leader xmlns:slim="http://www.loc.gov/MARC21/slim">00161cam a2200073 i 4500</slim:leader><slim:controlfield tag="001" xmlns:slim="http://www.loc.gov/MARC21/slim">8891001</slim:controlfield><slim:controlfield tag="005" xmlns:slim="http://www.loc.gov/MARC21/slim">20130731130319.0</slim:controlfield><slim:controlfield tag="008" xmlns:slim="http://www.loc.gov/MARC21/slim">110801b        ilua          000 0 eng  </slim:controlfield><slim:datafield ind2="0" ind1="0" tag="245" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">GJBtest record 5</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">2011-08-01 15:51:13</hol:bibData><hol:bibData name="updateDate">2013-07-31 13:03:19</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">CATCUL</hol:bibData><hol:bibData name="updateLocation">CATCUL</hol:bibData><hol:bibData name="exportOKLocation" xsi:nil="true"/><hol:bibData name="owningLibrary" id="1">COLUMBIA</hol:bibData></hol:bibRecord><hol:mfhdCollection><mfhd:mfhdRecord bibId="8891001" mfhdId="11964457" xmlns:mfhd="http://www.endinfosys.com/Voyager/mfhd"><mfhd:marcRecord><slim:leader xmlns:slim="http://www.loc.gov/MARC21/slim">00431cx  a22001334  4500</slim:leader><slim:controlfield tag="001" xmlns:slim="http://www.loc.gov/MARC21/slim">11964457</slim:controlfield><slim:controlfield tag="004" xmlns:slim="http://www.loc.gov/MARC21/slim">8891001</slim:controlfield><slim:controlfield tag="005" xmlns:slim="http://www.loc.gov/MARC21/slim">20130731130138.0</slim:controlfield><slim:controlfield tag="008" xmlns:slim="http://www.loc.gov/MARC21/slim">1108014u    8   1001uu   0901128</slim:controlfield><slim:datafield ind2=" " ind1=" " tag="843" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Microfilm.</slim:subfield><slim:subfield code="m">1950-1963.</slim:subfield><slim:subfield code="b">Webster, N.Y. :</slim:subfield><slim:subfield code="c">Photographic Sciences Corp.,</slim:subfield><slim:subfield code="d">1974-</slim:subfield><slim:subfield code="e">2 microfilm reels ; 35 mm.</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1="1" tag="852" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="b">bus</slim:subfield><slim:subfield code="h">GB500</slim:subfield><slim:subfield code="i">.G65</slim:subfield><slim:subfield code="l">Shelving title</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1="4" tag="856" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="3">Part 1</slim:subfield><slim:subfield code="u">http://www.columbia.edu</slim:subfield><slim:subfield code="z">Full text</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1="4" tag="867" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Supplement</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1="4" tag="868" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="a">Index</slim:subfield><slim:subfield code="z">with note.</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">bertchume</mfhd:mfhdData><mfhd:mfhdData name="updateOperatorId">bertchume</mfhd:mfhdData><mfhd:mfhdData name="createDate">2011-08-01 15:53:08</mfhd:mfhdData><mfhd:mfhdData name="updateDate">2013-07-31 13:01:38</mfhd:mfhdData><mfhd:mfhdData name="createLocation">CATCUL</mfhd:mfhdData><mfhd:mfhdData name="updateLocation">CATCUL</mfhd:mfhdData><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">GB500 .G65</mfhd:mfhdData><mfhd:mfhdData name="locationCode" id="48">bus</mfhd:mfhdData><mfhd:mfhdData name="locationName" xsi:nil="true"/><mfhd:mfhdData name="locationDisplayName">Business</mfhd:mfhdData><mfhd:mfhdData name="locationSpineLabel">BUSINESS</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">Business</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="8891001" mfhdId="11970625" xmlns:mfhd="http://www.endinfosys.com/Voyager/mfhd"><mfhd:marcRecord><slim:leader xmlns:slim="http://www.loc.gov/MARC21/slim">00350nx  a22001334  4500</slim:leader><slim:controlfield tag="001" xmlns:slim="http://www.loc.gov/MARC21/slim">11970625</slim:controlfield><slim:controlfield tag="004" xmlns:slim="http://www.loc.gov/MARC21/slim">8891001</slim:controlfield><slim:controlfield tag="005" xmlns:slim="http://www.loc.gov/MARC21/slim">20110802122150.0</slim:controlfield><slim:controlfield tag="008" xmlns:slim="http://www.loc.gov/MARC21/slim">1108024u    8   1001uu   0901128</slim:controlfield><slim:datafield ind2=" " ind1=" " tag="852" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="b">lweb</slim:subfield><slim:subfield code="h">EBOOK</slim:subfield></slim:datafield><slim:datafield ind2="1" ind1="4" tag="856" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="h">ttp://www.google.com</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.columbia.edu</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://libraries.columbia.edu</slim:subfield><slim:subfield code="z">Library Website</slim:subfield></slim:datafield><slim:datafield ind2="0" ind1="4" tag="856" xmlns:slim="http://www.loc.gov/MARC21/slim"><slim:subfield code="3">Part 1</slim:subfield><slim:subfield code="u">http://website 1</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">bertchume</mfhd:mfhdData><mfhd:mfhdData name="updateOperatorId" xsi:nil="true"/><mfhd:mfhdData name="createDate">2011-08-02 12:21:50</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">EBOOK</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_record.rb

@@ -93,12 +93,20 @@ class TestHoldings < HoldingsTestCase
     record = load_fixture("holdings_8891001.xml").records.first
     assert_kind_of Array, record.supplements
     assert_equal 'Supplement', record.supplements[0], '867 fields'
+
+    record = load_fixture("holdings_2120018.xml").records.first
+    assert_kind_of Array, record.supplements
+    assert_equal '1880-1881 bound in 1 v.', record.supplements[0], '867 fields'
   end
   
   def test_indexes
     record = load_fixture("holdings_8891001.xml").records.first
     assert_kind_of Array, record.indexes
     assert_equal 'Index', record.indexes[0], '868 fields'
+
+    record = load_fixture("holdings_8891001_3.xml").records.first
+    assert_kind_of Array, record.indexes
+    assert_equal 'Index with note.', record.indexes[0], '868 fields'
   end
   
   def test_reproduction_note

data/test/test_voyager_api.rb

@@ -1,4 +1,28 @@
 require 'helper'
 
 class TestVoyagerApi < MiniTest::Unit::TestCase
+
+  def setup
+    @conn = Voyager::Connection.new()
+    @bad_bib = 1
+    @good_bib = 123
+  end
+
+  def teardown
+    @conn.clean_session!
+  end
+
+  def test_bad_bib
+    e = assert_raises(RuntimeError) {
+      Voyager::Holdings::Collection.new_from_opac(@bad_bib, @conn)
+    }
+    assert_match e.message,
+        /com.endinfosys.voyager.holdingsinfo.HoldingsInfo.HoldingsInfoException/
+  end
+
+  def good_bad_bib
+    result = Voyager::Holdings::Collection.new_from_opac(@good_bib, @conn)
+    refute_nil result
+  end
+
 end

data/test/test_voyager_connection.rb

@@ -19,10 +19,25 @@ class TestVoyagerConnection < MiniTest::Unit::TestCase
     vc = Voyager::Connection.new(:http_client => hc, :cookie_path => cookie_file)
 
     vc.request("http://www.google.com")
-    
+
     assert File.exists?(cookie_dir)
     FileUtils.rm_rf(File.dirname(cookie_dir))
 
   end
 
+  def test_new_voyager_connection
+      conn = Voyager::Connection.new()
+      refute_nil conn
+      assert_kind_of Voyager::Connection, conn
+  end
+
+  # http://example.com will return a valid HTML document
+  def test_bad_xml_in_voyager_connection
+    e = assert_raises(RuntimeError) {
+      Voyager::Holdings::Collection.new_from_opac(1, nil, "http://example.com")
+    }
+    assert_match e.message, /invalid xml/i
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voyager_api
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000Z
+date: 2013-07-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152840000 !ruby/object:Gem::Requirement
+  requirement: &2153298640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152840000
+  version_requirements: *2153298640
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152839240 !ruby/object:Gem::Requirement
+  requirement: &2153298120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152839240
+  version_requirements: *2153298120
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &2152838540 !ruby/object:Gem::Requirement
+  requirement: &2153297480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152838540
+  version_requirements: *2153297480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152837800 !ruby/object:Gem::Requirement
+  requirement: &2153296640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152837800
+  version_requirements: *2153296640
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152837080 !ruby/object:Gem::Requirement
+  requirement: &2153296060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152837080
+  version_requirements: *2153296060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152836140 !ruby/object:Gem::Requirement
+  requirement: &2153203400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152836140
+  version_requirements: *2153203400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152835400 !ruby/object:Gem::Requirement
+  requirement: &2153202720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152835400
+  version_requirements: *2153202720
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152834760 !ruby/object:Gem::Requirement
+  requirement: &2153201860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152834760
+  version_requirements: *2153201860
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2152834120 !ruby/object:Gem::Requirement
+  requirement: &2153201120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152834120
+  version_requirements: *2153201120
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2152833400 !ruby/object:Gem::Requirement
+  requirement: &2153199980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152833400
+  version_requirements: *2153199980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152832580 !ruby/object:Gem::Requirement
+  requirement: &2153199120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152832580
+  version_requirements: *2153199120
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2152831700 !ruby/object:Gem::Requirement
+  requirement: &2153198400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152831700
+  version_requirements: *2153198400
 description: ! 'Middleware gem for Voyager 7 API calls, specificially holdings information '
 email: github@jamesstuart.org
 executables: []
@@ -177,6 +177,7 @@ files:
 - test/fixtures/holdings_1052500.xml
 - test/fixtures/holdings_1558940.xml
 - test/fixtures/holdings_1717646.xml
+- test/fixtures/holdings_2120018.xml
 - test/fixtures/holdings_2606957.xml
 - test/fixtures/holdings_289196.xml
 - test/fixtures/holdings_299492.xml
@@ -208,6 +209,7 @@ files:
 - test/fixtures/holdings_8889994.xml
 - test/fixtures/holdings_8891001.xml
 - test/fixtures/holdings_8891001_2.xml
+- test/fixtures/holdings_8891001_3.xml
 - test/fixtures/holdings_8918502.xml
 - test/fixtures/holdings_9420109.xml
 - test/fixtures/holdings_9421045.xml
@@ -238,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1667967424945736233
+      hash: 3233840626635347838
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: