Skip to content

Commit

Permalink
Merge pull request #115 from sul-dlss/o2p_cache
Browse files Browse the repository at this point in the history
Add caching to #objects_to_process
  • Loading branch information
jmartin-sul committed Aug 25, 2018
2 parents 13542d5 + b1ef095 commit 5567dab
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions lib/pre_assembly/bundle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -689,22 +689,20 @@ def process_digital_objects
end

def objects_to_process
objects = digital_objects.reject { |dobj| skippables.has_key?(dobj.unadjusted_container) }
unless accession_items.nil? # check to see if we are specifying certain objects to be accessioned
unless accession_items[:only].nil? # handle the "only" case for accession items specified
objects.reject! do |dobj|
bundle_id = dobj.druid ? dobj.druid.druid : dobj.container_basename
!accession_items[:only].include?(bundle_id)
end
return @o2p if @o2p
@o2p = digital_objects.reject { |dobj| skippables.has_key?(dobj.unadjusted_container) }
return @o2p if accession_items.nil? # check to see if we are specifying certain objects to be accessioned
if accession_items[:only]
@o2p.reject! do |dobj|
!accession_items[:only].include?(dobj.druid ? dobj.druid.druid : dobj.container_basename)
end
unless accession_items[:except].nil? # handle the "except" case for accession items specified
objects.reject! do |dobj|
bundle_id = dobj.druid ? dobj.druid.druid : dobj.container_basename
accession_items[:except].include?(bundle_id)
end
end
if accession_items[:except]
@o2p.reject! do |dobj|
accession_items[:except].include?(dobj.druid ? dobj.druid.druid : dobj.container_basename)
end
end
objects
@o2p
end

def log_progress_info(dobj)
Expand Down

0 comments on commit 5567dab

Please sign in to comment.