cul_hydra 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efa13a7d8ec21a34f211463fb1026c640a2ca3bf
-  data.tar.gz: f3c5bff14e40684c60accd573b8c7bf0fb525cf0
+  metadata.gz: 102ec8e3b9fefe152b73c5e4e3a0a8879e90b71e
+  data.tar.gz: cb023b7bdc8ff9897f4dafbf7c3a4f31e5ba4622
 SHA512:
-  metadata.gz: 5f44c97c75dce30861be5287f19da6c22d532e9c27f1fd8094a646218ece5f197cb751610ec7d1dfad6dba5257822a8bc288c4f573fc2bdbee95a73c5141f20c
-  data.tar.gz: 893c65d7a0f3ba682104882582f85593028cbe92c8ca1c2e81e5e3088b16c440b271212bf094c0e41a79c06a669df19ff71187dea018bf207c3273822d4800d6
+  metadata.gz: 9365a49063b3f98d141541fcf007992b156bdec4b98733d4dab1dda1f1d5d30eaee4fbecb7a1dba164ccbe946006b5186667f34f6593de7ff831edf6356e69d4
+  data.tar.gz: d354dfee384cc8ea31e2a0fd813bcdaaaca806990a96104ce7eae9c63b2271e549ad60542628cf8fb84bc8dd25b2a935e156566a2c8deb5323b099c6fe235e21

data/app/models/concerns/cul/hydra/models/common.rb

@@ -142,8 +142,8 @@ module Cul::Hydra::Models::Common
     solr_doc
   end
   
-  def get_representative_generic_resource
-
+  # This method generally shouldn't be called with any parameters (unless we're doing testing)
+  def get_representative_generic_resource(force_use_of_non_pid_identifier=false)
     return self if self.is_a?(GenericResource)
     return nil unless self.is_a?(Cul::Hydra::Models::Aggregator) # Only Aggregators have struct metadata
 
@@ -163,20 +163,33 @@ module Cul::Hydra::Models::Common
     if found_struct_div
       content_ids = ng_div.attr('CONTENTIDS').split(' ') # Get all space-delimited content ids
       child_obj = nil
-      content_ids.each do |content_id|
-        child_obj ||= GenericAggregator.search_repo.find_by(identifier: content_id) # We don't know what type of aggregator we'll be getting back, but all we need is the pid
+      
+      # Try to do a PID lookup first
+      unless force_use_of_non_pid_identifier
+        content_ids.each do |content_id|
+          child_obj ||= ActiveFedora::Base.exists?(content_id) ? ActiveFedora::Base.find(content_id) : nil
+        end
       end
-      # If we didn't find the child object through an identifier search, we might be working with a PID instead.
-      # Do a pid-based search
+      
+      # Then fall back to identifier lookup
       if child_obj.nil?
+        child_pid = nil
         content_ids.each do |content_id|
-          child_obj ||= ActiveFedora::Base.exists?(content_id) ? ActiveFedora::Base.find(content_id) : nil
+          child_pid ||= Cul::Hydra::RisearchMembers.get_pid_for_identifier(content_id)
+          if force_use_of_non_pid_identifier && child_pid && content_id == child_pid
+            # This really only runs when we're doing testing, if we want to specifically ensure that we're searching by a non-pid identifier
+            child_pid = nil
+          end
+        end
+        
+        if child_pid
+          child_obj = ActiveFedora::Base.find(child_pid)
         end
       end
       
       if child_obj
         # Recursion!  Woo!
-        return child_obj.get_representative_generic_resource
+        return child_obj.get_representative_generic_resource(force_use_of_non_pid_identifier)
       else
         #Rails.logger.error "No object for dc:identifier in #{content_ids.inspect}"
         return nil

data/lib/cul_hydra/risearch_members.rb

@@ -1,3 +1,4 @@
+# TODO: Eventually change this class name from RisearchMembers to RisearchHelpers
 module Cul::Hydra::RisearchMembers
 module ClassMethods
   def get_recursive_member_pids(pid, verbose_output=false, cmodel_type='all')
@@ -119,6 +120,27 @@ module ClassMethods
     return count.blank? ? 0 : count[0]['count'].to_i
   end
   
+  def get_pid_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 => '1',
+      :stream => 'on'
+    }))
+    
+    if search_response['results'].present?
+      return search_response['results'].first['pid'].gsub('info:fedora/', '')
+    else
+      return nil
+    end
+    
+  end
+  
 end
 extend ClassMethods
 end

data/lib/cul_hydra/version.rb

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

data/lib/cul_hydra/version.rb~

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight