cul_hydra 1.4.10 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1fa8daff2d1478b0a54e6f08959a37753b93457
-  data.tar.gz: e13de4607a5f95cee62150738ade25fa886b299a
+  metadata.gz: 2737cd4a45932293c8be61930787704ba71757ba
+  data.tar.gz: 773c934a6cf9ea8905a65c9002297a022d45baa6
 SHA512:
-  metadata.gz: 83e8060838dc54913834db7c9bd8ea507ee40560bdf9ebb4e7c71198b68d12f56607cce1c4bcc6feac85dd8f95af1f333e57a0bccd2246319dab8ac56b7226eb
-  data.tar.gz: 015c43166025a1792201efbb5e4ebae748294b5c0ead6f4e2055c081f0889a66ca27bcd84348cb57be686d9b03a0f472070f396e505b1e748117b6dc23676c5c
+  metadata.gz: 1fae21818bbb7ff322432c45900083e10fa0384cecd283ebdcb42f25b0b03af2d017256419d77e6b879142e8a990137ab63c6004840be2a5d085002bfaf5b22f
+  data.tar.gz: 153483a94ca7d83d0dac238c5b24e25eaefcd30410f9cd00bbc468e9671da9795c3bb755d36e0fa9dba10defe82072c1e7b16fc3bd2aba12ba4946098abef5b2

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

@@ -151,13 +151,18 @@ 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?
 
+    # Index URI form of pid to facilitate solr joins
+    solr_doc['fedora_pid_uri_ssi'] = 'info:fedora/' + self.pid if self.pid.present?
+    #solr_doc['fedora_pid_uri_ssi'] = 'info:fedora/' + solr_doc['id'] if solr_doc['id'].present?
+    #solr_doc['fedora_pid_uri_ssi'] = ''
+
     solr_doc
   end
-  
+
   # 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)
@@ -180,11 +185,11 @@ module Cul::Hydra::Models::Common
     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
-      
+
       # Try to do a PID lookup first
       unless force_use_of_non_pid_identifier
         content_ids.each do |content_id|
@@ -192,7 +197,7 @@ module Cul::Hydra::Models::Common
           child_obj ||= ActiveFedora::Base.exists?(content_id) ? ActiveFedora::Base.find(content_id) : nil
         end
       end
-      
+
       # Then fall back to identifier lookup
       if child_obj.nil?
         child_pid = nil
@@ -203,12 +208,12 @@ module Cul::Hydra::Models::Common
             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(force_use_of_non_pid_identifier)
@@ -308,4 +313,4 @@ module Cul::Hydra::Models::Common
     min = (ld.min < 10) ? "0#{ld.min}" : ld.min.to_s
     return File.join(ds_root,"#{ld.year}/#{month}#{day}/#{hour}/#{min}", ds.dsLocation.sub(':','_'))
   end
-end
+end

data/lib/cul_hydra/indexer.rb

@@ -66,7 +66,7 @@ module Cul::Hydra::Indexer
 
   end
 
-  def self.index_pid(pid, skip_generic_resources=false, verbose_output=false)
+  def self.index_pid(pid, skip_generic_resources=false, verbose_output=false, softcommit=true)
     # We found an object with the desired PID. Let's reindex it
     begin
       active_fedora_object = nil
@@ -77,7 +77,12 @@ module Cul::Hydra::Indexer
           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
+            if softcommit
+              active_fedora_object.update_index
+            else
+              # Using direct solr query to update document without soft commiting
+              ActiveFedora::SolrService.add(active_fedora_object.to_solr)
+            end
             puts 'done.' if verbose_output
           end
           break
@@ -108,4 +113,4 @@ module Cul::Hydra::Indexer
       puts "Encountered problem with #{pid}.  Skipping record.  Exception class: #{e.class.name}.  Message: #{e.message}"
     end
   end
-end
+end

data/lib/cul_hydra/version.rb

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

data/lib/cul_hydra/version.rb~

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.4.9'
+    VERSION = '1.4.10'
     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.10
+  version: 1.4.11
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight