cul-fedora 0.8.5 → 0.8.6

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

data/cul-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cul-fedora}
-  s.version = "0.8.5"
+  s.version = "0.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Stuart"]
-  s.date = %q{2011-07-11}
+  s.date = %q{2011-07-14}
   s.description = %q{Columbia-specific Fedora libraries}
   s.email = %q{tastyhat@jamesstuart.org}
   s.extra_rdoc_files = [

data/lib/cul-fedora/item.rb

@@ -8,6 +8,7 @@ module Cul
       include Open3 
 
       URI_TO_PID = 'info:fedora/'
+      MAX_LIST_MEMBERS_PER_REQUEST = 500
 
       def <=>(other)
         pid <=> other.pid
@@ -69,16 +70,31 @@ module Cul
 
       def listMembers()
         begin
-          result = Nokogiri::XML(request(:method => "/objects", :sdef => "methods/ldpd:sdef.Aggregator", :request => "listMembers", :format => "", :max => "", :start => ""))
-
-          result.css("sparql>results>result>member").collect do |result_node|
-            @server.item(result_node.attributes["uri"].value)
+          i = 1
+          size = getSize
+          items = []
+          while (i <= size)
+            result = Nokogiri::XML(request(:method => "/objects", :sdef => "methods/ldpd:sdef.Aggregator", :request => "listMembers", :format => "sparql", :max => MAX_LIST_MEMBERS_PER_REQUEST, :start => (i - 1)))
+
+            result.css("sparql>results>result>member").collect do |result_node|
+              items << @server.item(result_node.attributes["uri"].value)
+            end
+            i = i + MAX_LIST_MEMBERS_PER_REQUEST
           end
+          return items
         rescue
           []
         end
       end
 
+      def getSize()
+        begin
+          request(:method => "/objects", :sdef => "methods/ldpd:sdef.Aggregator", :request => "getSize").to_i
+        rescue
+          -1
+        end
+      end
+
       def describedBy
         begin
           params = {:method => '/objects', :request => "describedBy", :sdef => "methods/ldpd:sdef.Core"}

data/lib/cul-fedora/solr.rb

@@ -72,6 +72,7 @@ module Cul
           delete_removed(fedora_server)
         end
         
+        logger.info "Preparing the items for indexing..."
         collections.each do |collection|
           items |= collection.listMembers
         end
@@ -82,6 +83,8 @@ module Cul
         results = Hash.new { |h,k| h[k] = [] }
         errors = {}
       
+        logger.info "Preparing to index " + items.length.to_s + " items..."
+      
         items.each do |i|
           
           if(ignore.index(i.pid).nil? == false)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cul-fedora
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - James Stuart
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -04:00
+date: 2011-07-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency