cul_scv_hydra 0.22.2 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee69396ec0c96d812e5d7c872e630b66f19a1d9
-  data.tar.gz: a61e56d4b6ba7251e6ff364e923d18aba5965518
+  metadata.gz: 978a755b275967be31524d7f5353f87bb5f8b1f6
+  data.tar.gz: 3472e7787729f6d4e55fd342ad02904fa7fcaae4
 SHA512:
-  metadata.gz: 4b5d95e704771fc4b9f8c4e2770fd987b67ad1d3df516e6a9707e11c15715307f877284019c5f9246ed5b6023ef908f8bd1a0d9f0acdc98a0981d40f42d9fef6
-  data.tar.gz: e574854f780642125717df158897824ca0f56f7a17f548c28ff2b7235e35e46aed95686dcdc200599ec046470fd0f863d795ca682151bfcb72abf9a5efba392b
+  metadata.gz: 751f9996118553e9750610bd8f03eee3bf5783e5d23b79a78e62e98531700a0796b17afb3af7277780350dddef55ea2aecdae22f4671d2199ab9675e4e504e64
+  data.tar.gz: 8e107fea323d41e5ff4b1b87ef54a7e0a9c1d61db2fa3f38a355dec6bdaaf0d7a23f5e4f5c5d3021a282c73faff61d597aad05ad3c9b70549f138122551aee82

data/lib/cul_scv_hydra/indexer.rb

@@ -58,23 +58,28 @@ module Cul::Scv::Hydra::Indexer
   def self.recursively_index_fedora_objects(top_pid, pids_to_omit=nil, skip_generic_resources=false, verbose_output=false)
 
     descend_from(top_pid, pids_to_omit, verbose_output) do |pid|
+      self.index_pid(pid, skip_generic_resources, verbose_output)
+    end
 
-      # We found an object with the desired PID. Let's reindex it
-      begin
-        active_fedora_object = ActiveFedora::Base.find(pid, :cast => true)
-
-        if skip_generic_resources && active_fedora_object.is_a?(GenericResource)
-          puts 'Object was skipped because GenericResources are being skipped and it is a GenericResource.'
-        else
-          active_fedora_object.update_index
-          puts 'done.' if verbose_output
-        end
-      rescue Exception => e
-        puts "Encountered problem with #{pid}.  Skipping record.  Exception: #{e.message}"
-      end
+  end
 
-    end
+  def self.index_pid(pid, skip_generic_resources=false, verbose_output=false)
+    # We found an object with the desired PID. Let's reindex it
+    begin
+      active_fedora_object = ActiveFedora::Base.find(pid, :cast => true)
 
+      if skip_generic_resources && active_fedora_object.is_a?(GenericResource)
+        puts 'Object was skipped because GenericResources are being skipped and it is a GenericResource.'
+      else
+        active_fedora_object.update_index
+        puts 'done.' if verbose_output
+      end
+    rescue SystemExit, Interrupt => e
+      # Allow system interrupt (ctrl+c)
+      raise e
+    rescue Exception => e
+      puts "Encountered problem with #{pid}.  Skipping record.  Exception: #{e.message}"
+    end
   end
 
 end

data/lib/cul_scv_hydra/risearch_members.rb

@@ -5,7 +5,7 @@ module Cul::Scv::Hydra::RisearchMembers
     recursive_member_query =
       'select $child $parent from <#ri>
       where
-      walk($child <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '> and $child <http://purl.oclc.org/NET/CUL/memberOf> $parent)'      
+      walk($child <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '> and $child <http://purl.oclc.org/NET/CUL/memberOf> $parent)'
 
     unless cmodel_type == 'all'
       recursive_member_query += ' and $child <fedora-model:hasModel> $cmodel'
@@ -51,9 +51,42 @@ module Cul::Scv::Hydra::RisearchMembers
     unique_pids = get_direct_member_results(pid,verbose_output,'json')
     unique_pids.map{|result| result['pid'].gsub('info:fedora/', '') }.uniq
   end
-  
+
   def self.get_direct_member_count(pid, verbose_output=false)
     count = get_direct_member_results(pid,verbose_output,'count/json')
     return count.blank? ? 0 : count[0]['count'].to_i
   end
+
+
+  #Project constituents
+
+  def self.get_project_constituent_results(pid, verbose_output=false, format='json')
+
+    project_constituent_query =
+      'select $pid from <#ri>
+      where $pid <info:fedora/fedora-system:def/relations-external#isConstituentOf> <fedora:' + pid + '>'
+
+    puts 'Performing query:' if verbose_output
+    puts project_constituent_query if verbose_output
+
+    search_response = JSON(Cul::Scv::Fedora.repository.find_by_itql(project_constituent_query, {
+      :type => 'tuples',
+      :format => format,
+      :limit => '',
+      :stream => 'on'
+    }))
+
+    return search_response['results']
+  end
+
+  def self.get_project_constituent_pids(pid, verbose_output=false)
+    unique_pids = get_project_constituent_results(pid,verbose_output,'json')
+    unique_pids.map{|result| result['pid'].gsub('info:fedora/', '') }.uniq
+  end
+
+  def self.get_project_constituent_count(pid, verbose_output=false)
+    count = get_project_constituent_results(pid,verbose_output,'count/json')
+    return count.blank? ? 0 : count[0]['count'].to_i
+  end
+
 end

data/lib/cul_scv_hydra/version.rb

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.22.2'
+        VERSION = '0.22.3'
         def self.version
           VERSION
         end

data/lib/cul_scv_hydra/version.rb~

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.22.1'
+        VERSION = '0.22.2'
         def self.version
           VERSION
         end

data/lib/tasks/index.rake

@@ -40,6 +40,31 @@ namespace :cul_scv_hydra do
 
     end
 
+    task :by_project_pid => :environment do
+
+      puts '---------------------------'
+      puts 'Fedora URL: ' + ActiveFedora.config.credentials[:url]
+      puts 'Solr URL: ' + ActiveFedora.solr_config[:url]
+      puts '---------------------------'
+
+      if ENV['PID']
+        project_pid = ENV['PID']
+      else
+        puts 'Please specify a project PID (e.g. PID=cul:123)'
+        next
+      end
+
+      START_TIME = Time.now
+      pids = Cul::Scv::Hydra::RisearchMembers.get_project_constituent_pids(project_pid, true)
+
+      puts "Found #{pids.length} project members."
+
+      pids.each do |pid|
+        Cul::Scv::Hydra::Indexer.index_pid(pid, false, false)
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.22.3
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -481,3 +481,4 @@ signing_key:
 specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection Viewer
 test_files: []
+has_rdoc: