cul_hydra 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: add7cd1403a95f97a6b1ad05e3696b555ffae5be
-  data.tar.gz: 4c2ff7a69468b565d1aff893ff455c9513d61f90
+  metadata.gz: efa13a7d8ec21a34f211463fb1026c640a2ca3bf
+  data.tar.gz: f3c5bff14e40684c60accd573b8c7bf0fb525cf0
 SHA512:
-  metadata.gz: a0cd91ebf116b1dd412bf0f69789e826cd4bc38e2bcf2be757b3b36feaa8fc7c05d37349cf6b107257e7f743b852d5cd174e8d28adffe1072e4ca32c6fb5421d
-  data.tar.gz: 39a9ae0bacf69f72f5e890021566442ea26d24216fa6301af9da7db37785cde412bf6790b0f2224cad8c1ed49cb9c9f23ae1df331cbaea801b9857f4c6f66155
+  metadata.gz: 5f44c97c75dce30861be5287f19da6c22d532e9c27f1fd8094a646218ece5f197cb751610ec7d1dfad6dba5257822a8bc288c4f573fc2bdbee95a73c5141f20c
+  data.tar.gz: 893c65d7a0f3ba682104882582f85593028cbe92c8ca1c2e81e5e3088b16c440b271212bf094c0e41a79c06a669df19ff71187dea018bf207c3273822d4800d6

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

@@ -135,9 +135,64 @@ module Cul::Hydra::Models::Common
       end
     }
     solr_doc[:structured_bsi] = 'false' unless solr_doc.has_key? :structured_bsi
+    
+    representative_child = get_representative_generic_resource
+    solr_doc['representative_generic_resource_pid_ssi'] = representative_child.pid unless representative_child.nil?
 
     solr_doc
   end
+  
+  def get_representative_generic_resource
+
+    return self if self.is_a?(GenericResource)
+    return nil unless self.is_a?(Cul::Hydra::Models::Aggregator) # Only Aggregators have struct metadata
+
+    # If we're here, then the object was not a Generic resource.
+    # Try to get child info from a structMat datastream, and fall back to
+    # the first :cul_member_of child if a structMap isn't present
+
+    # Check for the presence of a structMap and get first GenericResource in that structMap
+    if self.has_struct_metadata?
+      struct = Cul::Hydra::Datastreams::StructMetadata.from_xml(self.datastreams['structMetadata'].content)
+      ng_div = struct.first_ordered_content_div #Nokogiri node response
+      found_struct_div = (! ng_div.nil?)
+    else
+      found_struct_div = false
+    end
+    
+    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
+      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
+      if child_obj.nil?
+        content_ids.each do |content_id|
+          child_obj ||= ActiveFedora::Base.exists?(content_id) ? ActiveFedora::Base.find(content_id) : nil
+        end
+      end
+      
+      if child_obj
+        # Recursion!  Woo!
+        return child_obj.get_representative_generic_resource
+      else
+        #Rails.logger.error "No object for dc:identifier in #{content_ids.inspect}"
+        return nil
+      end
+    else
+      # If there isn't a structMap, just get the first child
+      member_pids = Cul::Hydra::RisearchMembers.get_direct_member_pids(self.pid)
+      if member_pids.first
+        child_obj = ActiveFedora::Base.find(member_pids.first)
+        return child_obj.get_representative_generic_resource
+      else
+        #Rails.logger.error "No child objects or resources for #{self.pid}"
+        return nil
+      end
+    end
+  end
 
   def update_datastream_attributes(params={}, opts={})
     logger.debug "Common.update_datastream_attributes"

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

data/lib/cul_hydra/version.rb~

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

data/lib/tasks/cul_hydra_dev.rake

@@ -1,8 +1,8 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../") unless defined?(APP_ROOT)
 
 require 'jettywrapper'
-JETTY_ZIP_BASENAME = '7.x-stable'
-Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
+JETTY_ZIP_BASENAME = 'fedora-3.7-with-risearch'
+Jettywrapper.url = "https://github.com/cul/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
 
 namespace :cul_hydra do
 

metadata

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