cul_scv_hydra 0.16.8 → 0.16.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDcwZTc1NGY1MzE1MTFmNGY4YjI3NGVkODMzMmFhZDhhZjEyNGMxNQ==
+    ZjlkYzY2YTNkZmFiMjNlMGY4OGVlZjI2OTkxMmIzM2NmYTI4MzExMw==
   data.tar.gz: !binary |-
-    MTNkNjdhZjA3NTQ1NjE2Mjg2MDYyMzY2NmYxNzg5OWE0ZmFkZDYzNQ==
+    YzNiNTZiOWUzYmU1MDkwNDZhODhmNjNlNTIzNWFjYzM2MjYxNjZiYw==
 SHA512:
   metadata.gz: !binary |-
-    ZDAyOGMzMzYyOWNiMTBlOTU4MDBkOWIyNDdiY2ZiMmY1ZWE5YTNiYzdkMWQ0
-    ZDdiZjc1YjYwZjFkZjIyYWQ1Yjk2NGUyZGIwNWFlOTQxNTIxNzNlNWMyMDdk
-    NDk5ODY3NDFhYmM1YTA2MzljZjkxMGFiNDAxOWFhMjY0ZjIyOWQ=
+    YmMzZGJkMTBhM2Q3YTgzZDVkZWNkM2Q1OTUwZmFiMzhkYjQyNjMxNGM2OGNh
+    NDg2MGRkYTM3OGFjZWU2YTU0MDM0YzJkNmJmNGZjNTk2ZmIxMTUyZTc4ZWZl
+    YjY3YjA5OTIwYmVhODRmMmY3OGMxYjUzNmI3NjZiNDljY2ZlZjI=
   data.tar.gz: !binary |-
-    NDVjMjRkNGE3NGRhMGI5YjMzNDkxZmYwMGE1Mzc5NzBlM2JlMzg5N2M3NzEy
-    NjI2NzkxOWFjNTgzNTcxZTlmNTUzODM4ZTgwOTY2YzUzZjE0ZDQzMzZhMzcw
-    MDRhODFkODg1YTY3Y2UzODQwNzM0ZTI1YjE5MDU0MjQ2YTcyNGY=
+    ZWQyOTk1YjU5YTBlYzE3ZjI5ZWQxZmVmNWExNTBiOTM0Njk4YWZiNzI2MTM0
+    ODVmYWUxZjcyZTBlMjcxNTdiOWE4MzBlMDdiZjNiMWQyNzI3NzVlOWMzZDhm
+    ZDgzNTI0MTNhMjA5ZmRjZjU3NDAyOGY2Y2FmMDg2NDQxN2M3MzU=

data/app/models/generic_aggregator.rb

@@ -16,7 +16,7 @@ class GenericAggregator < ::ActiveFedora::Base
   def index_type_label
     riquery = Cul::Scv::Hydra::Models::MEMBER_ITQL.gsub(/%PID%/, self.pid)
     begin
-      docs = Cul::Scv::Fedora.repository.find_by_itql riquery, limit: 2, format: json
+      docs = Cul::Scv::Fedora.repository.find_by_itql riquery, limit: 2, format: 'json'
       docs = JSON.parse(docs)['results']
     rescue Exception=>e
       Rails.logger.warn("#{self.class.name} failed to find children with TQL: #{e.message}")

data/app/models/generic_resource.rb

@@ -109,8 +109,8 @@ class GenericResource < ::ActiveFedora::Base
 
       dsuris.each do |dsuri|
         dsid = dsuri.to_s.split('/')[-1]
-        width_rel = rels_int.relationships(dsuri, :exif_image_width)[0]
-        length_rel = rels_int.relationships(dsuri, :exif_image_length)[0]
+        width_rel = rels_int.relationships(dsuri, :image_width)[0]
+        length_rel = rels_int.relationships(dsuri, :image_length)[0]
         extent_rel = rels_int.relationships(dsuri, :extent)[0]
         props = {EXTENT_PREDICATE => [], WIDTH_PREDICATE => [], LENGTH_PREDICATE => []}
         props[EXTENT_PREDICATE] << extent_rel.object.to_s unless extent_rel.blank?

data/config/predicate_mappings.yml

@@ -18,6 +18,7 @@
     :cul_has_member: hasMember
     :cul_member_of: memberOf
     :cul_metadata_for: metadataFor
+    :cul_obsolete_from: obsoleteFrom
   http://creativecommons.org/ns#:
     :cc_license: license
   info:fedora/fedora-system:def/relations-external#: 
@@ -47,8 +48,8 @@
   info:fedora/fedora-system:def/model#:
     :has_model: hasModel
   http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/:
-    :image_width: imageWidth
-    :image_length: imageLength
+    :cul_image_width: imageWidth
+    :cul_image_length: imageLength
   http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/ASSESSMENT/:
     :x_sampling: xSamplingFrequency
     :y_sampling: ySamplingFrequency
@@ -58,8 +59,8 @@
     :format: format
     :format_of: isFormatOf
   http://www.w3.org/2003/12/exif/ns#:
-    :exif_image_width: imageWidth
-    :exif_image_length: imageLength
+    :image_width: imageWidth
+    :image_length: imageLength
     :x_resolution: xResolution
     :y_resolution: yResolution
     :resolution_unit: resolutionUnit
@@ -67,5 +68,7 @@
     :foaf_image: image
     :foaf_thumbnail: thumbnail
     :foaf_zooming: zoomingImage
+    :foaf_depicts: depicts
+    :foaf_depiction: depiction
   http://www.w3.org/1999/02/22-rdf-syntax-ns#:
-    :rdf_type: type
+    :rdf_type: type

data/lib/cul_scv_hydra/solrizer/scv_mods_fieldable.rb

@@ -65,10 +65,17 @@ module Cul::Scv::Hydra::Solrizer
 
     def titles(node=mods)
       # all titles without descending into relatedItems
-      node.xpath('./mods:titleInfo', MODS_NS).collect do |t|
+      # For now, this only includes the main title and selected alternate_titles
+      all_titles = []
+      all_titles << main_title unless main_title.nil?
+      all_titles += alternative_titles unless alternative_titles.nil?
+    end
+
+    def alternative_titles(node=mods)
+      node.xpath('./mods:titleInfo[@type and (@type="alternative" or @type="abbreviated" or @type="translated" or @type="uniform")]', MODS_NS).collect do |t|
         ScvModsFieldable.normalize(t.text)
       end
-    end
+		end
 
     def names(role_authority=nil, role=nil)
       # get all the name nodes
@@ -93,7 +100,7 @@ module Cul::Scv::Hydra::Solrizer
       #  base_text = node.xpath('./mods:namePart', MODS_NS).collect { |c| c.text }.join(' ')
       #  names << ScvModsFieldable.normalize(base_text, true)
       #end
-      
+
       names
     end
 
@@ -205,15 +212,47 @@ module Cul::Scv::Hydra::Solrizer
 			item_in_context_url_val
 		end
 
+    def all_subjects(node=mods)
+			list_of_subjects = []
+
+			node.xpath("./mods:subject/mods:topic", MODS_NS).collect do |n|
+        list_of_subjects << ScvModsFieldable.normalize(n.text, true)
+      end
+			node.xpath("./mods:subject/mods:geographic", MODS_NS).collect do |n|
+        list_of_subjects << ScvModsFieldable.normalize(n.text, true)
+      end
+			node.xpath("./mods:subject/mods:name", MODS_NS).collect do |n|
+        list_of_subjects << ScvModsFieldable.normalize(n.text, true)
+      end
+			node.xpath("./mods:subject/mods:temporal", MODS_NS).collect do |n|
+        list_of_subjects << ScvModsFieldable.normalize(n.text, true)
+      end
+			node.xpath("./mods:subject/mods:titleInfo", MODS_NS).collect do |n|
+        list_of_subjects << ScvModsFieldable.normalize(n.text, true)
+      end
+			node.xpath("./mods:subject/mods:genre", MODS_NS).collect do |n|
+        list_of_subjects << ScvModsFieldable.normalize(n.text, true)
+      end
+
+			return list_of_subjects
+		end
+
     def to_solr(solr_doc={})
       solr_doc = (defined? super) ? super : solr_doc
+
+      solr_doc["all_text_teim"] ||= []
+
       solr_doc["title_si"] = sort_title
       solr_doc["title_ssm"] = titles
+      solr_doc["alternative_title_ssm"] = alternative_titles
+      solr_doc["all_text_teim"] += solr_doc["alternative_title_ssm"]
       solr_doc["lib_collection_sim"] = collections
       solr_doc["lib_name_sim"] = names
-      solr_doc["lib_name_teim"] = names
-      solr_doc["all_text_teim"] ||= []
+      solr_doc["lib_name_teim"] = solr_doc["lib_name_sim"]
       solr_doc["all_text_teim"] += solr_doc["lib_name_teim"]
+      solr_doc["lib_all_subjects_ssm"] = all_subjects
+      solr_doc["lib_all_subjects_teim"] = solr_doc["lib_all_subjects_ssm"]
+      solr_doc["all_text_teim"] += solr_doc["lib_all_subjects_teim"]
       solr_doc["lib_name_ssm"] = solr_doc["lib_name_sim"]
       solr_doc["lib_author_sim"] = names(:marcrelator, 'aut')
       solr_doc["lib_recipient_sim"] = names(:marcrelator, 'rcp')

data/lib/cul_scv_hydra/version.rb

@@ -1,7 +1,8 @@
+
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.16.8'
+        VERSION = '0.16.10'
         def self.version
           VERSION
         end

data/lib/cul_scv_hydra/version.rb~

@@ -1,7 +1,8 @@
+
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.16.7'
+        VERSION = '0.16.9'
         def self.version
           VERSION
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.16.8
+  version: 0.16.10
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight