cul_hydra 1.4.12 → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5275607a41c2fcccd7c963551e5c258e99a8e9c3
-  data.tar.gz: 9239f43187013c44790e72f15332da3509da3a70
+  metadata.gz: b00a31481023d67e45fbcc98632503d040588153
+  data.tar.gz: 3ed19c422e4756423635b9d05d8d69ddfc18fb62
 SHA512:
-  metadata.gz: e9722b9f154c4fe2e72095d601f4fae1e92514cf68f573f1601f31223a547f1073bf5b86cb2c1b1e1033e07d414f72a8b5e8c278ea06d4881a9d4921399e5702
-  data.tar.gz: 6c573233c1c838452c1dbe5aa7b17058ac6f28ba3033dc163f2d392fb0b90390b9f756793af99ec3f2fb5596b658f76d40fa0f53efbbdbbf16b85d6b391f4bd6
+  metadata.gz: dbf2ede45ca288de1a36a4d86cd8691950b1202dd8ba46462f84940006f517471bba2fde83f942761c33c64ae21921efbb2eb17d4cd224e85942602f45651258
+  data.tar.gz: 4527adec810592381e6e30b6f02c0f34ca8a256e824ad665aa5255868a8ca262e38cebef17a2ae0eecdc6e88d6a280019b813ed92e38b94e663aa05ce417e187

data/app/models/content_aggregator.rb

@@ -3,8 +3,9 @@ class ContentAggregator < GenericAggregator
   rdf_types(RDF::PCDM.Object)
   def to_solr(solr_doc = Hash.new, opts={})
     solr_doc = super
-    self.members.each do |member_doc|
-      member = ActiveFedora::Base.find(member_doc['id'])
+
+    Cul::Hydra::RisearchMembers.get_direct_members_with_datastream_pids(self.pid, 'fulltext').each do |pid|
+      member = ActiveFedora::Base.find(pid)
       if member.is_a? GenericResource
         member_doc = member.to_solr
         unless member_doc["fulltext_tesim"].blank?
@@ -12,6 +13,7 @@ class ContentAggregator < GenericAggregator
         end
       end
     end
+
     solr_doc
   end
 end

data/lib/cul_hydra/risearch_members.rb

@@ -6,7 +6,7 @@ module ClassMethods
     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'
@@ -59,6 +59,38 @@ module ClassMethods
     return count.blank? ? 0 : count[0]['count'].to_i
   end
 
+  def get_direct_members_with_datastream_results(pid, dsid, flush_resource_index_before_query=false, verbose_output=false, format='json')
+    # Note: The query we're using below is a faster version of this query:
+    #   "select $pid from <#ri>
+    #   where $pid <http://purl.oclc.org/NET/CUL/memberOf> <fedora:#{pid}>
+    #   and $pid <fedora-view:disseminates> $ds
+    #   and $ds <fedora-view:disseminationType> <info:fedora/*/#{dsid}>"
+
+    direct_members_with_ds_query = "select $pid
+      count( select $ds from <#ri> where  $pid <fedora-view:disseminates> $ds and $ds <fedora-view:disseminationType> <info:fedora/*/#{dsid}>)
+      from <#ri>
+      where $pid <http://purl.oclc.org/NET/CUL/memberOf> <info:fedora/#{pid}>
+      having $k0 <http://mulgara.org/mulgara#occursMoreThan> '0.0'^^<http://www.w3.org/2001/XMLSchema#double>;"
+
+      puts 'Performing query:' if verbose_output
+      puts direct_members_with_ds_query if verbose_output
+
+      search_response = JSON.parse(Cul::Hydra::Fedora.repository.find_by_itql(direct_members_with_ds_query, {
+        :type => 'tuples',
+        :format => format,
+        :limit => '',
+        :stream => 'on',
+        :flush => flush_resource_index_before_query.to_s
+      }))
+
+      return search_response['results']
+  end
+
+  def get_direct_members_with_datastream_pids(pid, dsid, flush_resource_index_before_query=false, verbose_output=false)
+    unique_pids = get_direct_members_with_datastream_results(pid, dsid, flush_resource_index_before_query, verbose_output, 'json')
+    unique_pids.map{|result| result['pid'].gsub('info:fedora/', '') }.uniq
+  end
+
   #Project constituents
 
   def get_project_constituent_results(pid, verbose_output=false, format='json')
@@ -89,9 +121,9 @@ module ClassMethods
     count = get_project_constituent_results(pid,verbose_output,'count/json')
     return count.blank? ? 0 : count[0]['count'].to_i
   end
-  
+
   #Publish target members
-  
+
   def get_publish_target_member_results(pid, verbose_output=false, format='json')
 
     project_constituent_query =
@@ -120,13 +152,13 @@ module ClassMethods
     count = get_publish_target_member_results(pid,verbose_output,'count/json')
     return count.blank? ? 0 : count[0]['count'].to_i
   end
-  
+
   # Returns the pid of the first object found with the given identifier
   def get_pid_for_identifier(identifier, flush_resource_index_before_query=false)
     find_by_identifier_query = "select $pid from <#ri>
     where $pid <http://purl.org/dc/elements/1.1/identifier> $identifier
     and $identifier <mulgara:is> '#{identifier}'"
-    
+
     search_response = JSON(Cul::Hydra::Fedora.repository.find_by_itql(find_by_identifier_query, {
       :type => 'tuples',
       :format => 'json',
@@ -134,39 +166,39 @@ module ClassMethods
       :stream => 'on',
       :flush => flush_resource_index_before_query.to_s
     }))
-    
+
     if search_response['results'].present?
       return search_response['results'].first['pid'].gsub('info:fedora/', '')
     else
       return nil
     end
   end
-  
+
   # Returns the pids of ALL objects found with the given identifier
   def get_all_pids_for_identifier(identifier)
-    
+
     find_by_identifier_query = "select $pid from <#ri>
     where $pid <http://purl.org/dc/elements/1.1/identifier> $identifier
     and $identifier <mulgara:is> '#{identifier}'"
-    
+
     search_response = JSON(Cul::Hydra::Fedora.repository.find_by_itql(find_by_identifier_query, {
       :type => 'tuples',
       :format => 'json',
       :limit => '',
       :stream => 'on'
     }))
-    
+
     pids_to_return = []
-    
+
     if search_response['results'].present?
       search_response['results'].each do |result|
         pids_to_return << result['pid'].gsub('info:fedora/', '')
       end
     end
-    
+
     return pids_to_return
   end
-  
+
 end
 extend ClassMethods
-end
+end

data/lib/cul_hydra/solrizer/mods_fieldable.rb

@@ -64,13 +64,13 @@ module Cul::Hydra::Solrizer
         ModsFieldable.normalize(main_title(p_node), true)
       end
     end
-    
+
     def languages_iso639_2_text
       mods.xpath("./mods:language/mods:languageTerm[@type='text' and @authority='iso639-2']", MODS_NS).collect do |n|
         ModsFieldable.normalize(n.text, true)
       end
     end
-    
+
     def languages_iso639_2_code
       mods.xpath("./mods:language/mods:languageTerm[@type='code' and @authority='iso639-2']", MODS_NS).collect do |n|
         ModsFieldable.normalize(n.text, true)
@@ -210,7 +210,7 @@ module Cul::Hydra::Solrizer
       end
       values
     end
-    
+
     def sublocation(node=mods)
       values = node.xpath("./mods:location/mods:sublocation", MODS_NS).collect do |n|
         ModsFieldable.normalize(n.text, true)
@@ -483,7 +483,7 @@ module Cul::Hydra::Solrizer
 
       # Geo data
       solr_doc["geo"] = coordinates
-      
+
       ## Handle alternate form of language authority for language_language_term_text_ssim
       ## We already capture elements when authority="iso639-2b", but we want to additionally
       ## capture language elements when authority="iso639-2".

data/lib/cul_hydra/version.rb

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.4.12'
+    VERSION = '1.4.13'
     def self.version
       VERSION
     end

data/lib/cul_hydra/version.rb~

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.4.11'
+    VERSION = '1.4.12'
     def self.version
       VERSION
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.4.12
+  version: 1.4.13
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -582,7 +582,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL repository apps