cul_scv_hydra 0.22.7 → 0.22.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fee4c2f931371cbd1957daca914793b419d4d878
-  data.tar.gz: 9ee170c5764a6c01ec50efffd499569c3d344bed
+  metadata.gz: 1a9bdfdcfcd9c0166e9c60bebf41c051f4e5673c
+  data.tar.gz: 7b6f4090d51a484def9bc6700f8bdde0a7433593
 SHA512:
-  metadata.gz: e225c9555c17775be784def42a334e76b33aebe30b2181d6cb10318d2dd40b9515bee46c732d0f8f40f247e557779ba93b010db5cdd5f3da6b0d1e85c0308a8c
-  data.tar.gz: 6927ae1cfd3b4d79e50db49e20e16cab6543156189ac81214ec3bd1137b02f8a91cc20fab3ae6752fe944e1c880fd6ebb62f261966ac4602537f862bba53edee
+  metadata.gz: fbc7b110d30b0a2ec1111e0c587e20bfa39aaf560503e86d8caa8fddea91649c61362ac501290ff09d3c7e9eaa3c3828891640dff701e9522ab119a5d6da4722
+  data.tar.gz: 198d4a6f45211f98a944bd42383d5832a5d3de4dcbddc4ae423fec27f390a5389d799d9ce821701a1224f1101774a1d66e256faf044e57619c73a80af066bd99

data/fixtures/spec/CUL_MODS/mods-top-level-location-vs-relateditem-location.xml

@@ -1,11 +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>
-<url access="object in context" usage="primary display">http://somewhere.cul.columbia.edu/something/123</url>
+<location>
+	<physicalLocation authority='marcorg'>NNC-RB</physicalLocation>
+	<physicalLocation>Rare Book and Manuscript Library, Columbia University</physicalLocation>
+	<shelfLocator>(Box no.
+		057)</shelfLocator>
+	<sublocation>exampleSublocation</sublocation>
+	<url access="object in context" usage="primary display">http://item-in-context.cul.columbia.edu/something/123</url>
+	<url>http://another-location.cul.columbia.edu/zzz/yyy</url>
+	<url>http://great-url.cul.columbia.edu/ooo</url>
 </location>
 <relatedItem displayLabel="Project" type="host">
 	<titleInfo>

data/lib/cul_hydra/risearch_members.rb

@@ -51,7 +51,7 @@ module ClassMethods
     unique_pids = get_direct_member_results(pid,verbose_output,'json')
     unique_pids.map{|result| result['pid'].gsub('info:fedora/', '') }.uniq
   end
-  
+
   def get_direct_member_count(pid, verbose_output=false)
     count = get_direct_member_results(pid,verbose_output,'count/json')
     return count.blank? ? 0 : count[0]['count'].to_i

data/lib/cul_hydra/solrizer/mods_fieldable.rb

@@ -244,6 +244,14 @@ module Cul::Hydra::Solrizer
       item_in_context_url_val
     end
 
+    def non_item_in_context_url(node=mods)
+			non_item_in_context_url_val = []
+      node.xpath("./mods:location/mods:url[not(@access='object in context')]", MODS_NS).collect do |n|
+        non_item_in_context_url_val << ModsFieldable.normalize(n.text, true)
+      end
+      non_item_in_context_url_val
+		end
+
     def project_url(node=mods)
       project_url_val = []
       node.xpath("./mods:relatedItem[@type='host' and @displayLabel='Project']/mods:location/mods:url", MODS_NS).collect do |n|
@@ -337,6 +345,7 @@ module Cul::Hydra::Solrizer
       solr_doc["lib_date_notes_ssm"] = date_notes
       solr_doc["lib_non_date_notes_ssm"] = non_date_notes
       solr_doc["lib_item_in_context_url_ssm"] = item_in_context_url
+      solr_doc["lib_non_item_in_context_url_ssm"] = non_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_for_display_ssm"] = origin_info_place_for_display

data/lib/cul_hydra/version.rb

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

data/lib/cul_hydra/version.rb~

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

data/lib/tasks/index.rake

@@ -24,7 +24,7 @@ namespace :cul_scv_hydra do
         pids_to_omit = nil
       end
 
-      skip_generic_resources = true if ENV['skip_generic_resources'] == 'true'
+      skip_generic_resources = (ENV['skip_generic_resources'] == 'true')
 
       begin
         pids.each do |pid|
@@ -52,6 +52,8 @@ namespace :cul_scv_hydra do
         next
       end
 
+      skip_generic_resources = (ENV['skip_generic_resources'] == 'true')
+
       start_time = Time.now
       pids = Cul::Scv::Hydra::RisearchMembers.get_project_constituent_pids(project_pid, true)
       total = pids.length
@@ -59,7 +61,7 @@ namespace :cul_scv_hydra do
       counter = 0
 
       pids.each do |pid|
-        Cul::Hydra::Indexer.index_pid(pid, false, false)
+        Cul::Hydra::Indexer.index_pid(pid, skip_generic_resources, false)
         counter += 1
         puts "Indexed #{counter} of #{total} | #{Time.now - start_time} seconds"
       end

metadata

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