uw_catalog 0.0.5 → 0.0.6

data/lib/uw_catalog/catalog.rb

@@ -22,13 +22,14 @@ module UwCatalog
       bibs
     end
 
-    def self.get_item_from_hash(d)
-     item = Item.new({:id => d[:item_id], :item_enum=>d[:item_enum], 
-                     :copy_number=>d[:copy_number], :on_reserve=>d[:on_reserve], 
-                     :item_status=>d[:item_status],     
-                     :item_barcode=>d[:item_barcode], 
-                     :item_status_date=>d[:item_status_date], :current_due_date=>d[:current_due_date], 
-                     :hold_recall_status_date=>d[:hold_recall_status_date]})
+    def self.get_availability_data(bibid)
+      ret = Array.new
+      begin
+        data_hash = get_availability_data_hash(bibid)
+        parse_availability_data_hash(data_hash)
+      rescue => e
+        throw UwCatalogError.new("#{e.class}: #{e.message}")
+      end
     end
 
     def self.get_availability_data_hash(bibid)
@@ -38,11 +39,11 @@ module UwCatalog
     def self.parse_availability_data_hash(data_hash)
       ret = Array.new
       data_hash.each do |d|
-	loc_id = d[:location_id]
-	location = d[:location]
+      loc_id = d[:location_id]
+      location = d[:location]
         if !d[:temp_location].nil?
-           loc_id = d[:temp_location_id]
-	   location = d[:temp_location]
+          loc_id = d[:temp_location_id]
+          location = d[:temp_location]
         end
 
         loc = Location.new({:id => loc_id, :location => location})
@@ -62,20 +63,23 @@ module UwCatalog
         end
         if (!d[:item_id].nil?)
           item = get_item_from_hash(d) 
-	  holding.add_item(item)
+          holding.add_item(item)
         end
       end
       ret
     end
 
-    def self.get_availability_data(bibid)
-      ret = Array.new
-      begin
-        data_hash = get_availability_data_hash(bibid)
-        parse_availability_data_hash(data_hash)
-      rescue => e
-        throw UwCatalogError.new("#{e.class}: #{e.message}") 
-      end
+    
+    private
+
+
+    def self.get_item_from_hash(d)
+     item = Item.new({:id => d[:item_id], :item_enum=>d[:item_enum],
+                     :copy_number=>d[:copy_number], :on_reserve=>d[:on_reserve],
+                     :item_status=>d[:item_status], :item_type_id=>d[:item_type_id],
+                     :item_barcode=>d[:item_barcode],
+                     :item_status_date=>d[:item_status_date], :current_due_date=>d[:current_due_date],
+                     :hold_recall_status_date=>d[:hold_recall_status_date]})
     end
 
     def self.get_items_data_hash(bibid)

data/lib/uw_catalog/model/holding.rb

@@ -1,6 +1,5 @@
 module UwCatalog
   class Holding
-    @@date_format = "%B %d, %Y"
     attr_accessor :id, :call_number, :item_enum, :perm_location_id, :perm_location, :items
 
     def initialize(h=Hash.new)
@@ -12,22 +11,28 @@ module UwCatalog
       self.id == another_holding.id
     end
 
-    def get_copies
-      if items.nil?
-	return Array.new
-      end
-      copies = items.collect {|c| c.copy_number}.uniq
-    end
-    
-    def self.get_item_rank(item)
-      status_guide = VoyagerItemStatus.status_guide(item.item_status.to_i)
-      status_guide[:rank]
+    def library_has
+      ret = Hash.new
+      marc = HoldingMarc.new(@id)
+      val = marc.bound_copies
+      ret[:bound_copies] = val unless (val.nil? or val.empty?) 
+      val = marc.indexes
+      ret[:indexes] = val unless (val.nil? or val.empty?) 
+      val = marc.supplements
+      ret[:supplements] = val unless (val.nil? or val.empty?) 
+      ret
     end
 
-    def self.override_status(item)
-      (16 == item.item_status.to_i)
-    end
+    def get_items_display(concise = false)
+      ret = Hash.new
+      return ret unless items.size > 0
 
+      status_list = item_statuses(concise) 
+      ret[:status] = status_list 
+
+      ret
+    end
+    
     def add_item(item)
       idx = items.index(item)
       if idx.nil?
@@ -47,30 +52,23 @@ module UwCatalog
       end
     end
 
-    def library_has
-      ret = Hash.new
-      marc = HoldingMarc.new(@id)
-      val = marc.bound_copies
-      ret[:bound_copies] = val unless (val.nil? or val.empty?) 
-      val = marc.indexes
-      ret[:indexes] = val unless (val.nil? or val.empty?) 
-      val = marc.supplements
-      ret[:supplements] = val unless (val.nil? or val.empty?) 
-      ret
+    private 
+    
+    def get_copies
+      if items.nil?
+        return Array.new
+      end
+      copies = items.collect {|c| c.copy_number}.uniq
     end
-
-    def get_items_display(concise = false)
-      ret = Hash.new
-      return ret unless items.size > 0
-
-      ret.merge!(library_has)
-
-      status_list = item_statuses(concise) 
-      ret[:status] = status_list 
-
-      ret
+    
+    def self.override_status(item)
+      (16 == item.item_status.to_i)
+    end
+    
+    def self.get_item_rank(item)
+      status_guide = VoyagerItemStatus.status_guide(item.item_status.to_i)
+      status_guide[:rank]
     end
-
 
     def item_statuses(concise)
       status_list = Array.new
@@ -80,14 +78,17 @@ module UwCatalog
         status_available, status_text = get_status(item)
         status_list <<  {:item_id => item.id, :status_text => status_text,
                :available => status_available, :copy_number=> item.copy_number,
-               :item_enum => item.item_enum}
+               :item_enum => item.item_enum,  :item_type_id => item.item_type_id,  
+               :noloan => (item.item_type_id == 2)}
       end
 
       if (concise)
         total_count = status_list.size
         status_list.keep_if{|i| i[:available] == false}.compact
         if (total_count > 0 && status_list.size == 0)
+          #reset status list to aggregated view with no specific item data
           status_list << {:status_text => 'Available', :available => true}
+          status_list[0][:noloan] = (items.select{|i| i.item_type_id ==2 }.size == items.size)          
         end
       end
 
@@ -101,13 +102,15 @@ module UwCatalog
      
       ret = status_text
       status_date = nil
+      date_format = "%B %d, %Y"
+      
       if status_guide[:display_date]
         case item.item_status.to_i
         when 2, 3
-          status_date = item.current_due_date.strftime(@@date_format) unless item.current_due_date.nil?
+          status_date = item.current_due_date.strftime(date_format) unless item.current_due_date.nil?
           status_text = "#{status_text}, Due on #{status_date}"
         else  
-          status_date = item.item_status_date.strftime(@@date_format) unless item.item_status_date.nil?
+          status_date = item.item_status_date.strftime(date_format) unless item.item_status_date.nil?
           status_text = "#{status_text} #{status_date}"
         end
       end

data/lib/uw_catalog/model/holding_marc.rb

@@ -1,10 +1,10 @@
 module UwCatalog
   class HoldingMarc
 
-    @@year_captions   = ['(year)', '(Year)', 'year', '(year covered)']
-    @@month_captions  = ['(month)', 'mo']
-    @@day_captions    = ['(day)']
-    @@season_captions = ['(season)']
+    YEAR_CAPTIONS   = ['(year)', '(Year)', 'year', '(year covered)']
+    MONTH_CAPTIONS  = ['(month)', 'mo']
+    DAY_CAPTIONS    = ['(day)']
+    SEASON_CAPTIONS = ['(season)']
  
     attr_reader :holding_id, :record
     
@@ -33,23 +33,14 @@ module UwCatalog
       supplements_internal
     end
 
-
+    private
 
     def new_issues
       issues_received(0)
     end
 
     def issues_received(category)
-      sql = "select serial_issues.enumchron " +
-            "from line_item_copy_status " +
-            "inner join subscription on line_item_copy_status.line_item_id = subscription.line_item_id " +
-            "inner join component on subscription.subscription_id = component.subscription_id " +
-            "inner join serial_issues on component.component_id = serial_issues.component_id " +
-            "inner join issues_received on issues_received.issue_id = serial_issues.issue_id and component.component_id = issues_received.component_id " +
-            "where line_item_copy_status.mfhd_id = ? " +
-            "and component.category = ? " +
-            "and serial_issues.received = 1 " +
-            "and issues_received.opac_suppressed = 1"
+      sql = VoyagerSql.get_issues_recieved_sql
       repository(:UW).adapter.select(sql, @holding_id, category)
     end
 
@@ -62,8 +53,7 @@ module UwCatalog
 
     def marc_stream
       marc_stream = ''
-      sql = "select mfhd_data.record_segment from mfhd_master, mfhd_data where mfhd_master.mfhd_id=? and " +
-            " mfhd_master.mfhd_id = mfhd_data.mfhd_id"
+      sql = VoyagerSql.get_marc_stream_sql
       mfhd_data_segments = repository(:UW).adapter.select(sql, @holding_id)
       mfhd_data_segments.each do |segment|
         marc_stream << segment
@@ -235,10 +225,10 @@ module UwCatalog
         
         # Locate the chronology subfields
         field.subfields.each do |subfield| 
-          caption_and_pattern[field['8']][:chronology][:year] = subfield.code if @@year_captions.include?(subfield.value)
-          caption_and_pattern[field['8']][:chronology][:month] = subfield.code if @@month_captions.include?(subfield.value)
-          caption_and_pattern[field['8']][:chronology][:day] = subfield.code if @@day_captions.include?(subfield.value)
-          caption_and_pattern[field['8']][:chronology][:season] = subfield.code if @@season_captions.include?(subfield.value)
+          caption_and_pattern[field['8']][:chronology][:year] = subfield.code if YEAR_CAPTIONS.include?(subfield.value)
+          caption_and_pattern[field['8']][:chronology][:month] = subfield.code if MONTH_CAPTIONS.include?(subfield.value)
+          caption_and_pattern[field['8']][:chronology][:day] = subfield.code if DAY_CAPTIONS.include?(subfield.value)
+          caption_and_pattern[field['8']][:chronology][:season] = subfield.code if SEASON_CAPTIONS.include?(subfield.value)
         end
 
         # Unless the chronology data is in subfield $a...

data/lib/uw_catalog/model/item.rb

@@ -1,7 +1,7 @@
 module UwCatalog
   class Item
     attr_accessor :id, :item_enum, :copy_number, :on_reserve, :item_status, 
-                  :item_barcode,  
+                  :item_barcode, :item_type_id,   
                   :item_status_date, :current_due_date, :hold_recall_status_date
 
     def initialize(h=Hash.new)

data/lib/uw_catalog/version.rb

@@ -1,3 +1,3 @@
 module UwCatalog
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/uw_catalog/voyager_item_status.rb

@@ -1,6 +1,6 @@
 module UwCatalog
   class VoyagerItemStatus
-    @@item_statuses = 
+    ITEM_STATUSES = 
       {
         0 => { :voyager_identifer => 0, :available => false, :forward_status => "Unknown", :display_date => false, :rank => 25 },
         1 => { :voyager_identifer => 1, :available => true, :forward_status => "Available", :display_date => false, :rank => 20 },
@@ -30,7 +30,7 @@ module UwCatalog
         25 => { :voyager_identifer => 25, :available => false, :forward_status => "Requested", :display_date => true, :rank => 17 }
       }
     def self.status_guide(status_code)
-      @@item_statuses[status_code]
+      ITEM_STATUSES[status_code]
     end
 
     def available?(itemStatusCode)

data/lib/uw_catalog/voyager_sql.rb

@@ -34,8 +34,8 @@ module UwCatalog
       ", circ_transactions, hold_recall_items " +
       "where bib_mfhd.bib_id=? " + 
       "and bib_mfhd.mfhd_id=mfhd_master.mfhd_id " +
-      "and mfhd_master.location_id=hloc.location_id " + 
       "and mfhd_master.suppress_in_opac='N' " +
+      "and mfhd_master.location_id=hloc.location_id " + 
       "and hloc.suppress_in_opac='N' " +
       "and mfhd_master.mfhd_id=mfhd_item.mfhd_id " +
       "and mfhd_item.item_id=item.item_id " +
@@ -76,5 +76,24 @@ module UwCatalog
       "and not exists (select 'x' from mfhd_item mi where mi.mfhd_id = mfhd_master.mfhd_id)"
     end
 
+    def self.get_issues_recieved_sql()
+      "select serial_issues.enumchron " +
+      "from line_item_copy_status " +
+      "inner join subscription on line_item_copy_status.line_item_id = subscription.line_item_id " +
+      "inner join component on subscription.subscription_id = component.subscription_id " +
+      "inner join serial_issues on component.component_id = serial_issues.component_id " +
+      "inner join issues_received on issues_received.issue_id = serial_issues.issue_id " + 
+      "and component.component_id = issues_received.component_id " +
+      "where line_item_copy_status.mfhd_id = ? " +
+      "and component.category = ? " +
+      "and serial_issues.received = 1 " +
+      "and issues_received.opac_suppressed = 1"
+    end
+    
+    def self.get_marc_stream_sql()
+      "select mfhd_data.record_segment from mfhd_master, mfhd_data " + 
+      "where mfhd_master.mfhd_id=? " +
+      "and mfhd_master.mfhd_id = mfhd_data.mfhd_id"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uw_catalog
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake