cul_scv_hydra 0.16.4 → 0.16.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTU5MmYwNzQ0M2ZhMDViNWYxYmY4MmZjYWRiOWI4MzkxZWU1N2M4ZA==
+    NGZlYjQ5NDJmY2M2Y2E0MTI2MzdkMzNhYTZlZTU0ZGFjYjM2ZTZiNA==
   data.tar.gz: !binary |-
-    N2FhYWYzMjM2ZTMwZjRkMzRmNzRmZDUxMDdlNGY4ZDFlM2M0YWNiZA==
+    OWUxYjU1YjA5OWZiMDRkZWYyNzZiOGRkMGFjMTFiNWZjNTFiYTE1Mw==
 SHA512:
   metadata.gz: !binary |-
-    MzM2YzJmZTUwZDIwMjY0NDk2ZjgwYTNmMmQzNWVlMDE1ZjliODZjMGE2NGQw
-    ZTg3YzBmMTMxOWZhMDkzOWMzYTljN2Y2YjcyNmY5ZWM3NDAwZTM4NWJlNTIw
-    YTZkOTlhMjNjMjZjZmZkMjZiMzBlNzA5MDIzNjAzYjYyOGE3NmY=
+    ZWVhMzEzYjU0ZmRjZGQ0MGU5ZTZhYjc1ZTE4ZDBlMmE2YWQ5NDdhZWVlZTc2
+    Y2Y4MjJmZjkxZjBkNjJlMGIzMDdkYWU5MzczZjMzNTcyMzlkZjE1YTM0ZDUx
+    MWEzZDg4MDU1NTQxNzlhMzJkNzI0ZjgyMmJlZTE0NzNkZmQ5MzQ=
   data.tar.gz: !binary |-
-    ODY1MmU4M2E5NDQyMzIxN2Q2YmIyMDRjZGM3YWEwZjZkNDJlYWY0ZGVlMTY2
-    NjY4MDcwMDYzMDYyODZhMTE0MzkyODE4MThlZDU2MTE4N2U1YThmOWZjNmJl
-    ZGNjZGYxMzMzNzNhZjY4ZGQ0ZDc3YjM0MmIzYmQ5YjBjNjgxNzI=
+    MmUxNjQyNDA3YzJlNDZmMTI4NDNlZDUwMTEwODE1ODAzMDM0Y2E5NDQzNzcz
+    ZWRmNWYwYWI1M2UxY2E1ZTE5ODYzZTBhYzY1NzZkZWVmM2UxOWQ5YmQwYTk0
+    MGQxNzNhNTcwOTBmODU3MTFhYzM4NDk2MDQ3Y2UwMDVlMWEzMjU=

data/app/models/generic_resource.rb

@@ -15,13 +15,13 @@ class GenericResource < ::ActiveFedora::Base
   include ::ActiveFedora::RelsInt
 
   has_and_belongs_to_many :containers, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
-  
+
   IMAGE_EXT = {"image/bmp" => 'bmp', "image/gif" => 'gif', "image/jpeg" => 'jpg', "image/png" => 'png', "image/tiff" => 'tif', "image/x-windows-bmp" => 'bmp'}
   WIDTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_width))
   LENGTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_length))
-  
+
   has_datastream :name => "content", :type=>::ActiveFedora::Datastream, :versionable => true
-  
+
   def assert_content_model
     super
     add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::RESOURCE_TYPE.to_s)
@@ -42,7 +42,7 @@ class GenericResource < ::ActiveFedora::Base
     end
     solr_doc
   end
-  
+
   def thumbnail_info
     thumb = relsint.relationships(datastreams['content'],:foaf_thumb).first
     if thumb
@@ -61,12 +61,14 @@ class GenericResource < ::ActiveFedora::Base
     if self.zooming?
       fz = rels_int.relationships(datastreams['content'], :foaf_zooming).first.object.to_s.split('/')[-1]
       ds = datastreams[fz]
-      rft_id = ds.controlGroup == 'E' ? datastreams[fz].dsLocation : legacy_content_path(ds,'info:fedora/datastreams/')
-      solr_doc['rft_id_ss'] = rft_id
+      unless ds.nil?
+        rft_id = ds.controlGroup == 'E' ? datastreams[fz].dsLocation : legacy_content_path(ds,'info:fedora/datastreams/')
+        solr_doc['rft_id_ss'] = rft_id
+      end
     end
     solr_doc
   end
-  
+
   def thumbnail_info
     thumb = rels_int.relationships(datastreams['content'],:foaf_thumbnail).first
     if thumb
@@ -82,7 +84,7 @@ class GenericResource < ::ActiveFedora::Base
       return {:asset => "cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
     end
   end
-  
+
   def linkable_resources
     # let's start with the known DSIDs from lindquist, then work our way back to parsing the solrized relsint
     results = []
@@ -123,7 +125,7 @@ class GenericResource < ::ActiveFedora::Base
   def zooming?
     !rels_int.relationships(datastreams['content'], :foaf_zooming).first.blank?
   end
-  
+
   private
   def datastream_as_resource(dsid, props={})
     ds = datastreams[dsid]
@@ -144,5 +146,5 @@ class GenericResource < ::ActiveFedora::Base
     base_filename = pid.gsub(/\:/,"")
     res[:filename] = base_filename + "." + dsid + "." + ds.mimeType.gsub(/^[^\/]+\//,"")
    res
-  end       
-end
+  end
+end

data/lib/cul_scv_hydra/indexer.rb

@@ -22,7 +22,11 @@ module Cul::Scv::Hydra::Indexer
       if skip_generic_resources && active_fedora_object.is_a?(GenericResource)
         puts 'Top level object was skipped because GenericResources are being skipped and it is a GenericResource.'
       else
-        active_fedora_object.update_index
+        begin
+          active_fedora_object.update_index
+        rescue Exception => e
+          puts 'Encountered problem.  Skipping record.  Exception: ' + e.message
+        end
         puts 'Done indexing topmost object (' + pid + '). Took ' + (Time.now - START_TIME).to_s + ' seconds' if verbose_output
       end
 
@@ -52,7 +56,11 @@ module Cul::Scv::Hydra::Indexer
         if skip_generic_resources && active_fedora_object.is_a?(GenericResource)
           puts "skipped (because we're skipping GenericResources." if verbose_output
         else
-          active_fedora_object.update_index
+          begin
+            active_fedora_object.update_index
+          rescue Exception => e
+            puts 'Encountered problem.  Skipping record.  Exception: ' + e.message
+          end
           # Display progress
           puts 'done.' if verbose_output
         end

data/lib/cul_scv_hydra/version.rb

@@ -1,7 +1,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.16.4'
+        VERSION = '0.16.5'
         def self.version
           VERSION
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.16.5
 platform: ruby
 authors:
 - Benjamin Armintor