cul_scv_hydra 0.14.0 → 0.14.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzFmMmEyZjBlOGY1OWZhOGE5MWJlMGFkYzc4NTJlMWRlYTQyY2M1NA==
+    MzMzNjljZWE0ZmY3OGNiMjM5ZjU1MzZmMmI0N2E3OWMwODVlYzcxOQ==
   data.tar.gz: !binary |-
-    M2QwNzhmZWY5YmU5NmE5NjRkZmNmNDE3NjdiYzJhMDk4NjBlNDczYQ==
+    MzNlYTljNmJjNjE3YjU1ZDAzYzg1NmI3MmZlODVmOWQwOTM3NDU3YQ==
 SHA512:
   metadata.gz: !binary |-
-    ODcyYmRjODI2Mzk5OGU3YzY0YThiYTYyMzI4YTRhYmVlY2RhNmZmZjUwNDg5
-    OWYxMjU2YmZjNWI2NWRkNTlkMzhhYzEyN2YzNjViZGU3NWFkNzVlYjNjYzNk
-    NDRkYzE4ZTUzNjU0NTM2OGY5MDg5ZTk1NzBjZWY5ZDJlZDYyNGE=
+    Y2NjN2EyNmZmMWQ1YjE1MmQ0ZTJiZDc4MGZhNDc3NDkzNzY1YTI2NGZhNTVk
+    NTBkODBlODhlZWUwMDYxMTVkOWU3MWQ0NWIwNjYwNjZiZjBhZGNjNWUwYjMw
+    NTQ5M2NjNDY5MzQxNzY1NGNhNTQ1ZTk2YzQ3ZDRkODA4ZDA1NzM=
   data.tar.gz: !binary |-
-    ZDA0ZTM2YTE0NDQ3NGVjZThiMTljNGE0NjA0YmNlMDE3NTFmZTA0Nzk0OTMw
-    NWNiYTg1ZjNiYWJkM2U1YmNlMDQzYjBjMDE5NjA4YTM3MGMyY2ZmNTNiOTI4
-    NTgyZTEyZjhiMWU2MjA5NjM4YzhiZTg4NTZmZTc2MzU1ZTRlNjY=
+    MmQ2Mjk1NDE2ODUxN2ZlODgyYjNhNDA3Yzc3OWZiMWVkMTlhM2ZmNzlmYmVi
+    MmI3OWY0YWVjMGZmOThjNjEzNGM0YThhMDI3Yzk3ZjA3ODExMDI3ODdiNTQz
+    NjViZWM4OThlOGJkYzIzYThhNDFkZDcxOGQ4MmVlNDI0MTg0MmM=

data/lib/cul_scv_fedora/dummy_object.rb

@@ -1,7 +1,7 @@
 module Cul
   module Scv
     module Fedora
-      class FakeObject
+      class DummyObject
         attr_accessor :pid
         def initialize(pid, isNew=false)
           @pid = pid
@@ -17,7 +17,7 @@ module Cul
           Cul::Scv::Fedora.repository
         end
         def spawn(pid)
-          s = FakeObject.new(pid)
+          s = DummyObject.new(pid)
           s.connection= connection
           s.repository= repository
           s

data/lib/cul_scv_hydra/engine.rb

@@ -14,7 +14,7 @@ module Cul::Scv::Hydra
       #{config.root}/app/models/concerns
     )
 
-    config.generators do |g|                                                               
+    config.generators do |g|
       g.test_framework :rspec
       g.integration_tool :rspec
     end
@@ -23,7 +23,7 @@ module Cul::Scv::Hydra
     rake_tasks do
       Dir.chdir(File.expand_path(File.join(File.dirname(__FILE__), '..'))) do
         Dir.glob(File.join('tasks', '*.rake')).each do |railtie|
-          load railtie
+          #load railtie # Commenting this out for now because we appear to be loading rake tasks twice
         end
       end
     end

data/lib/cul_scv_hydra/indexer.rb

@@ -0,0 +1,70 @@
+module Cul::Scv::Hydra::Indexer
+
+  def self.recursively_index_fedora_objects(pid, skip_top_level_object_indexing=false, verbose_output=false)
+
+    if pid.blank?
+      raise 'Please supply a pid (e.g. rake recursively_index_fedora_objects pid=ldpd:123)'
+    end
+
+    unless ActiveFedora::Base.exists?(pid)
+      raise 'Could not find Fedora object with pid: ' + pid
+    end
+
+    if skip_top_level_object_indexing
+      puts 'Skipping top level object indexing (' + pid + ')' if verbose_output
+    else
+      puts 'Indexing topmost object in this set (' + pid + ')...' if verbose_output
+      puts 'If this is a BagAggregator with a lot of members, this will take a while...' if verbose_output
+
+      # We found an object with the desired PID. Let's reindex it
+      active_fedora_object = ActiveFedora::Base.find(pid, :cast => true)
+      active_fedora_object.update_index
+
+      puts 'Done indexing topmost object (' + pid + '). Took ' + (Time.now - START_TIME).to_s + ' seconds' if verbose_output
+    end
+
+    puts 'Recursively retreieving and indexing all members...'
+
+    member_query =
+      'select $child $parent $cmodel from <#ri>
+      where
+      walk($child <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '> and $child <http://purl.oclc.org/NET/CUL/memberOf> $parent)
+      and
+      $child <fedora-model:hasModel> $cmodel'
+
+    puts 'Performing query:' if verbose_output
+    puts member_query if verbose_output
+
+    search_response = JSON(Cul::Scv::Fedora.repository.find_by_itql(member_query, {
+      :type => 'tuples',
+      :format => 'json',
+      :limit => '',
+      :stream => 'on'
+    }))
+
+    unique_pids = search_response['results'].map{|result| result['child'].gsub('info:fedora/', '') }.uniq
+
+    total_number_of_members = unique_pids.length
+    puts 'Recursive search found ' + total_number_of_members.to_s + ' members.' if verbose_output
+
+    i = 1
+    if total_number_of_members > 0
+      unique_pids.each {|pid|
+
+        print 'Indexing ' + i.to_s + ' of ' + total_number_of_members.to_s + ' members (' + pid + ')...' if verbose_output
+
+        active_fedora_object = ActiveFedora::Base.find(pid, :cast => true)
+        active_fedora_object.update_index
+
+        # Display progress
+        puts 'done.' if verbose_output
+
+        i += 1
+      }
+    end
+
+    puts 'Indexing complete!  Took ' + (Time.now - START_TIME).to_s + ' seconds' if verbose_output
+
+  end
+
+end

data/lib/cul_scv_hydra/version.rb

@@ -1,7 +1,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.14.0'
+        VERSION = '0.14.1'
         def self.version
           VERSION
         end

data/lib/cul_scv_hydra.rb

@@ -39,6 +39,7 @@ end
 require "cul_scv_hydra/access_controls_enforcement"
 require "cul_scv_hydra/controllers"
 require "cul_scv_hydra/om"
+require "cul_scv_hydra/indexer"
 require "cul_scv_hydra/solrizer"
 require "cul_scv_hydra/version"
 require "cul_scv_hydra/engine" if defined? Rails

data/lib/tasks/cmodel.rake

@@ -58,7 +58,7 @@ end
 def load_content(content, pid)
   begin
     connection.ingest(:file=>StringIO.new(content), :pid=>pid)
-  rescue Exception => e 
+  rescue Exception => e
     puts "possible problem with ingest of #{pid}: #{e.message}"
     raise e
   end
@@ -67,7 +67,7 @@ end
 def purge(pid)
   begin
     connection.purge_object :pid=>pid
-  rescue Exception => e 
+  rescue Exception => e
     puts "possible problem with purge of #{pid}: #{e.message}"
   end
 
@@ -78,7 +78,7 @@ def reload(pid)
   purge(pid)
   load_content(fcontent, pid)
 end
-  
+
 
 namespace :cul_scv_hydra do
   namespace :cmodel do

data/lib/tasks/index.rake

@@ -0,0 +1,31 @@
+namespace :cul_scv_hydra do
+
+  namespace :index do
+
+    task :recursively_index_fedora_objects => :environment do
+
+      puts '---------------------------'
+      puts 'Fedora URL: ' + ActiveFedora.config.credentials[:url]
+      puts 'Solr URL: ' + ActiveFedora.solr_config[:url]
+      puts '---------------------------'
+
+      START_TIME = Time.now
+
+      #lindquist == burke_lindq == ldpd:130509
+
+      ENV["RAILS_ENV"] ||= Rails.env
+      pid = ENV['pid']
+      skip_top_level_object_indexing = ( ! ENV['skip_top_level_object_indexing'].blank? && ENV['skip_top_level_object_indexing'])
+
+      begin
+        Cul::Scv::Hydra::Indexer.recursively_index_fedora_objects(pid, skip_top_level_object_indexing, true)
+      rescue => e
+        puts e
+        next
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -266,6 +266,7 @@ files:
 - lib/cul_scv_hydra/controllers/suggestions.rb
 - lib/cul_scv_hydra/controllers/terms.rb
 - lib/cul_scv_hydra/engine.rb
+- lib/cul_scv_hydra/indexer.rb
 - lib/cul_scv_hydra/om.rb
 - lib/cul_scv_hydra/om/standard_mods.rb
 - lib/cul_scv_hydra/solrizer.rb
@@ -276,6 +277,7 @@ files:
 - lib/cul_scv_hydra/solrizer/value_mapper.rb
 - lib/cul_scv_hydra/version.rb
 - lib/tasks/cmodel.rake
+- lib/tasks/index.rake
 homepage: https://github.com/cul/cul_scv_hydra
 licenses: []
 metadata: {}