cul_hydra 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe4ba4c680dcea9404bfb212289593a966f4873b
-  data.tar.gz: 53d811bfe46285cf98dcd523fa39bf521ec3027d
+  metadata.gz: 57b046842e517c4452af5cb21a6359c4aefdff88
+  data.tar.gz: 5b6122776131139c34d7ff6e6da266c9a8314f6d
 SHA512:
-  metadata.gz: 5b3caee8ee92f083491a732e5952e23b9813c397af27a59cd8697d3a9640e0487fb58c51e4dee523f687e18bc65736462d823e04394daa085e08e85502d081a8
-  data.tar.gz: c8538f0b7b3babff13a71823970255249091e41d2d881f9a7e879de20e44c5ddca981be18f6e6ff49420a399cc9d1a35ebc07c1ab950fd2f7711677ddc09e62e
+  metadata.gz: 30cf1096c6208e8ef81eab273ab22e536c46a6c0d6eea7826af4198bb36237bd257c235ee27428af4c4795ccb2dfafd02a1e972ce73511f49898c8f6e05a035f
+  data.tar.gz: 36711e7bd294a79840f28d4b9b8305484b8b4b42431d845f995f51ca5136be305ee5e696c511b311c50fb4eb60f5fc8aa32a862e80077158220688464486252a

data/app/models/cul/hydra/datastreams/mods_document.rb

@@ -89,7 +89,7 @@ class ModsDocument < ::ActiveFedora::OmDatastream
       t.lib_repo(:path=>"physicalLocation",
         :attributes=>{:authority=>"marcorg"},
         :index_as=>[:textable])
-      t.shelf_locator(:path=>"shelfLocator", :index_as=>[:textable, :displayable])
+      t.shelf_locator(:path=>"shelfLocator", :index_as=>[:displayable])
       t.sublocation(:path=>"sublocation", :index_as=>[:textable, :displayable])
       t.url
     }

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

@@ -4,5 +4,6 @@
 <note type="banana">Banana note</note>
 <note type="date">Date note</note>
 <note type="date source">Date source note</note>
+<note type="filename">filename_to_be_excluded.tif</note>
 <note type="view direction">WEST</note>
 </mods>

data/fixtures/spec/CUL_MODS/mods-physical-location-with-dual-location-shelflocator.xml

@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<mods xmlns='http://www.loc.gov/mods/v3' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-4.xsd' version='3.4'>
+<location><physicalLocation authority='marcorg'>NNC-RB</physicalLocation>
+	<physicalLocation>Rare Book and Manuscript Library, Columbia University</physicalLocation>
+	<shelfLocator>(Box no.
+		057)</shelfLocator>
+	<sublocation>exampleSublocation</sublocation>
+	<holdingSimple>
+		<copyInformation>
+			<shelfLocator>Folder no. 5</shelfLocator>
+		</copyInformation>
+	</holdingSimple>
+</location>
+</mods>

data/lib/cul_hydra/solrizer/mods_fieldable.rb

@@ -190,9 +190,13 @@ module Cul::Hydra::Solrizer
     end
 
     def shelf_locators(node=mods)
-      node.xpath("./mods:location/mods:shelfLocator", MODS_NS).collect do |n|
+      values = node.xpath("./mods:location/mods:shelfLocator", MODS_NS).collect do |n|
         ModsFieldable.normalize(n.text, true)
       end
+      values += node.xpath("./mods:location/mods:holdingSimple/mods:copyInformation/mods:shelfLocator", MODS_NS).collect do |n|
+        ModsFieldable.normalize(n.text, true)
+      end
+      values
     end
 
     def textual_dates(node=mods)
@@ -250,14 +254,12 @@ module Cul::Hydra::Solrizer
 
     def non_date_notes(node=mods)
       non_date_notes = []
-      node.xpath("./mods:note[not(@type) or (@type != 'date' and @type != 'date source')]", MODS_NS).collect do |n|
+      node.xpath("./mods:note[not(@type) or (@type != 'date' and @type != 'date source' and @type != 'filename')]", MODS_NS).collect do |n|
 				if n.attr('type') == 'view direction'
 					non_date_notes << 'View Direction: ' + ModsFieldable.normalize(n.text, true)
 				else
 					non_date_notes << ModsFieldable.normalize(n.text, true)
 				end
-
-
       end
       return non_date_notes
     end
@@ -376,6 +378,8 @@ module Cul::Hydra::Solrizer
       solr_doc["lib_recipient_sim"] = names(:marcrelator, 'rcp')
       solr_doc["lib_format_sim"] = formats
       solr_doc["lib_shelf_sim"] = shelf_locators
+      solr_doc['location_shelf_locator_ssm'] = solr_doc["lib_shelf_sim"]
+      solr_doc["all_text_teim"] += solr_doc["lib_shelf_sim"]
       solr_doc["lib_date_textual_ssm"] = textual_dates
       solr_doc["lib_date_notes_ssm"] = date_notes
       solr_doc["lib_non_date_notes_ssm"] = non_date_notes

data/lib/cul_hydra/version.rb

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

data/lib/cul_hydra/version.rb~

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -459,6 +459,7 @@ files:
 - fixtures/spec/CUL_MODS/mods-origin-info.xml
 - fixtures/spec/CUL_MODS/mods-part.xml
 - fixtures/spec/CUL_MODS/mods-physical-description.xml
+- fixtures/spec/CUL_MODS/mods-physical-location-with-dual-location-shelflocator.xml
 - fixtures/spec/CUL_MODS/mods-physical-location.xml
 - fixtures/spec/CUL_MODS/mods-record-info.xml
 - fixtures/spec/CUL_MODS/mods-relateditem-project.xml