active-fedora 6.6.0.pre4 → 6.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4995b4f2b4c10a25a2a6ed613fb2f6cadd5cbc1d
-  data.tar.gz: 3751da9a77221454120ac555b1704502ad95d2fc
+  metadata.gz: 964d99013806f9b52b6b916d277df38d6dbea927
+  data.tar.gz: 10f8ff33c035ecccb052c23d2c77166f8f605240
 SHA512:
-  metadata.gz: d74b8c98fbec12782819cae635a80d93d6ac2ea4578899bcefc4371e79c70d7f30bfa8a8026f36facfc4f2b03ae7b9ecd1ba51c4cded3302bad478da478d1c61
-  data.tar.gz: a752d40a3e2110c729c43657bd8e205c1b88ba342a098d0ee310dc1ef8ad1dc551fe35396809c228711d91008d5217f34f09a9289f5c27a9071c08cb839279f0
+  metadata.gz: 07707c2080d608e9ed4a3ecadf8e88f64ff4a0867bc8b79f1a63d92383d21152fc67b16c8db191d8987697fd516d99aed3b8d7c8d205ea1caeb6cf017d0bea8e
+  data.tar.gz: aae37c986f98847630f0f9e98d3f8a52fee97a7cc2ab725983478d1d1b3e0e05630e8507528c7986fdfbde7ad84a2f44feffb0b6c5b8cb8d17194886598fcf69

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -7,10 +7,15 @@ module ActiveFedora
       end
 
       def find_target
+          page_size = @reflection.options[:solr_page_size]
+          page_size ||= 200
           pids = @owner.ids_for_outbound(@reflection.options[:property])
           return [] if pids.empty?
-          query = ActiveFedora::SolrService.construct_query_for_pids(pids)
-          solr_result = SolrService.query(query, rows: 1000)
+          solr_result = []
+          0.step(pids.size,page_size) do |startIdx|
+            query = ActiveFedora::SolrService.construct_query_for_pids(pids.slice(startIdx,page_size))
+            solr_result += ActiveFedora::SolrService.query(query, rows: page_size)
+          end
           return ActiveFedora::SolrService.reify_solr_results(solr_result)
       end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.6.0.pre4"
+  VERSION = "6.6.0.rc1"
 end

data/spec/unit/has_and_belongs_to_many_collection_spec.rb

@@ -28,5 +28,20 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
     ac << object
 
   end
-  
+
+  it "should call solr query multiple times" do
+
+    subject = double("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a', :ids_for_outbound => [])
+    predicate = double(:klass => double.class, :options=>{:property=>'predicate', solr_page_size:10}, :class_name=> nil)
+    ids = []
+    0.upto(15) {|i| ids << i.to_s}
+    query1 = ids.slice(0,10).map {|i| "_query_:\"{!raw f=id}#{i}\""}.join(" OR ")
+    query2 = ids.slice(10,10).map {|i| "_query_:\"{!raw f=id}#{i}\""}.join(" OR ")
+    subject.should_receive(:ids_for_outbound).and_return(ids)
+    ActiveFedora::SolrService.should_receive(:query).with(query1, {:rows=>10}).and_return([])
+    ActiveFedora::SolrService.should_receive(:query).with(query2, {:rows=>10}).and_return([])
+
+    ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
+    ac.find_target
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.6.0.pre4
+  version: 6.6.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr