cul_scv_hydra 0.18.3 → 0.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7785c32e3d0f17f24a888874d662e5f52f54847b
-  data.tar.gz: b9a2948fdef204e83a6f8bf457f4f308341fcb81
+  metadata.gz: 6cf2a83344f82c3ea1feda2793081760cc08e181
+  data.tar.gz: 6ab5ecd724cef6f372a36049253a2f97b81daf8d
 SHA512:
-  metadata.gz: 4c80cbb874268224cb7cf302372a039415b4ac9ec9d8cb2af87a6866f9ef39a39c42ca1de54a22ee9b0c3982c546dc6f47bb149444ced127b6aee97103170808
-  data.tar.gz: 25bdf9e8fcd9abdfd8fec104ce8e167eeafe98a558ef0f992fa5d634f0967d577239090ca7257541d917aef67b6f94efd3fce9bb171157d58dda458b7e75cb0b
+  metadata.gz: 7a5f64fa56d7d49e295218f61e2863ae4e2f31b3f0552c3fa3cf46d9cdeb9d7d14174eafc03fad5d83803b07f1f3c600cce43e11f25898bdb1263fab80f3f467
+  data.tar.gz: 3c5180a0e9c2e491d8df704047b9db2dd625bf84c1e686b6797737211bcaffb611c71acb0a79045af1064c0d80f444c7faee8d40f6e5d0455e7d79a089614c04

data/lib/cul_scv_hydra/solrizer/scv_mods_fieldable.rb

@@ -263,12 +263,17 @@ module Cul::Scv::Hydra::Solrizer
 			return places
 		end
 
-    def origin_info_place_without_value_uri(node=mods)
-			places = []
+    def origin_info_place_for_display(node=mods)
+			# If there are multiple origin_info place elements, choose only the ones without valueUri attributes.  Otherwise show the others.
+			places_with_uri = []
+			places_without_uri = []
+			node.xpath("./mods:originInfo/mods:place/mods:placeTerm[@valueUri]", MODS_NS).collect do |n|
+        places_with_uri << ScvModsFieldable.normalize(n.text, true)
+      end
 			node.xpath("./mods:originInfo/mods:place/mods:placeTerm[not(@valueUri)]", MODS_NS).collect do |n|
-        places << ScvModsFieldable.normalize(n.text, true)
+        places_without_uri << ScvModsFieldable.normalize(n.text, true)
       end
-			return places
+			return (places_without_uri.length > 0 ? places_without_uri : places_with_uri)
 		end
 
     def to_solr(solr_doc={})
@@ -298,7 +303,7 @@ module Cul::Scv::Hydra::Solrizer
       solr_doc["lib_item_in_context_url_ssm"] = item_in_context_url
       solr_doc["lib_project_url_ssm"] = project_url
       solr_doc["origin_info_place_ssm"] = origin_info_place
-      solr_doc["origin_info_place_without_value_uri_ssm"] = origin_info_place_without_value_uri
+      solr_doc["origin_info_place_for_display_ssm"] = origin_info_place_for_display
 
       repo_marc_code = repository_code
       unless repo_marc_code.nil?

data/lib/cul_scv_hydra/version.rb

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.18.3'
+        VERSION = '0.18.4'
         def self.version
           VERSION
         end

data/lib/cul_scv_hydra/version.rb~

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.18.2'
+        VERSION = '0.18.3'
         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.18.3
+  version: 0.18.4
 platform: ruby
 authors:
 - Benjamin Armintor