cul_hydra 1.4.15 → 1.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c7a0b734caa1f463ecaefb6fd21eb9c3620bd8f
-  data.tar.gz: e56b97041f0505cec8405836314f95a1dea93d92
+  metadata.gz: 8804232f1ca85e31ad2a0bfa1bc63d4767cfdafa
+  data.tar.gz: 7d63e63050c095ad14acb31ca1398fd0bda7dd03
 SHA512:
-  metadata.gz: cd12ae40650e82e2ca0127041fc2c9653342ae65f6cb3ac300626846d6320e980ae2dbacfdd0e2ba10955b68cdee12cda8c28f7b2e011dd1a2a94e188535da06
-  data.tar.gz: 4588a63073b3b4da6d77033a500b822fd007d1a5234de9549a6fb52a8102a9ec30c29dede3aa260b72176a2f61620a1483120ceb08b020a909c1d163cff783fe
+  metadata.gz: bb1ff057ca22ba94f107aeae436b855d7c31a2e0c21ba7153e408afb5855bbb0bec1f13b55ccc4e5223944c643774f47983dc37b8851614e503857f63da3b3c0
+  data.tar.gz: c399320ba5fe6dd4e39b2ea80aa67c59979dcd5911b495b8aee026b5ee144b16e011bc5dbdb64de5c143ea50cf0c2f0c532ee011a91d949cb22b2c0666cd08e1

data/fixtures/spec/CUL_MODS/mods-all.xml

@@ -45,6 +45,7 @@
     <namePart type="date">1829-1745</namePart>
     <role>
       <roleTerm authority="marcrelator" type="code">rcp</roleTerm>
+      <roleTerm authority="marcrelator" type="text">Addressee</roleTerm>
     </role>
   </name>
   <name>

data/fixtures/spec/CUL_MODS/mods-names.xml

@@ -12,6 +12,10 @@
     <namePart type="date">1829-1745</namePart>
     <role>
       <roleTerm authority="marcrelator" type="code">rcp</roleTerm>
+      <roleTerm authority="marcrelator" type="text">Addressee</roleTerm>
+    </role>
+    <role>
+      <roleTerm type="text">Owner/Agent</roleTerm>
     </role>
   </name>
   <name>
@@ -27,6 +31,7 @@
 		 <namePart>"Dear Brother"</namePart>
 		 <role>
 				<roleTerm authority="marcrelator" type="code">rcp</roleTerm>
+        <roleTerm authority="marcrelator" type="text">Addressee</roleTerm>
 		 </role>
 	</name>
   <name usage="primary">

data/lib/cul_hydra/solrizer/mods_fieldable.rb

@@ -22,6 +22,7 @@ module Cul::Hydra::Solrizer
       def maps_field?(field_key)
         value_mapper.maps_field? field_key
       end
+
       def normalize(t, strip_punctuation=false)
         # strip whitespace
         n_t = t.dup.strip
@@ -45,6 +46,11 @@ module Cul::Hydra::Solrizer
         end
         n_t
       end
+
+			def role_text_to_solr_field_name(role_text)
+				role_text = normalize(role_text, false)
+				('role_' + role_text.gsub(/[^A-z]/, '_').downcase + '_ssim').gsub(/_+/, '_')
+			end
     end
 
     extend ClassMethods
@@ -382,6 +388,28 @@ module Cul::Hydra::Solrizer
       coordinate_values
     end
 
+		def add_names_by_text_role!(solr_doc)
+			# Note: These roles usually come from http://www.loc.gov/marc/relators/relaterm.html,
+			# but there are known cases when non-marc relator values are used (e.g. 'Owner/Agent'),
+			# and those roles won't have marcrelator codes.
+			# e.g. author_ssim = ['Author 1', 'Author 2'] or project_director_ssim = ['Director 1', 'Director 2']
+			roleterm_xpath_segment = "mods:roleTerm[@type='text' and string-length(text()) > 0]"
+			names_with_roles_xpath = "./mods:name/mods:role/#{roleterm_xpath_segment}/ancestor::mods:name"
+      mods.xpath(names_with_roles_xpath, MODS_NS).collect do |node|
+        name_text = node.xpath('./mods:namePart', MODS_NS).collect { |c| c.text }.join(' ')
+        name_text = ModsFieldable.normalize(name_text, true)
+				solr_role_fields = Set.new
+				node.xpath("./mods:role/#{roleterm_xpath_segment}", MODS_NS).collect do |role_node|
+					solr_role_fields << ModsFieldable.role_text_to_solr_field_name(role_node.text)
+				end
+
+				solr_role_fields.each do |solr_field_name|
+					solr_doc[solr_field_name] ||= []
+					solr_doc[solr_field_name] << name_text
+				end
+      end
+		end
+
     def to_solr(solr_doc={})
       solr_doc = (defined? super) ? super : solr_doc
 
@@ -499,6 +527,9 @@ module Cul::Hydra::Solrizer
       solr_doc['language_language_term_code_ssim'] ||= []
       solr_doc['language_language_term_code_ssim'] +=languages_iso639_2_code
 
+			# Add names to role-derived keys
+			add_names_by_text_role!(solr_doc)
+
       solr_doc.each do |k, v|
         if self.class.maps_field? k
           solr_doc[k] = self.class.map_value(k, v)

data/lib/cul_hydra/version.rb

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

data/lib/cul_hydra/version.rb~

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.4.14'
+    VERSION = '1.4.15'
     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.15
+  version: 1.4.16
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -211,14 +211,14 @@ dependencies:
   name: rubydora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency