cul_hydra 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bcd5ff2e5d892178111d42facde6174246facde
-  data.tar.gz: 556a42557585191fc8d981285bbf6d684742324b
+  metadata.gz: 0443ea299bfab622ec6f7e0448786f95e2bf7f40
+  data.tar.gz: 73242552dfc36864f6ff716776e79994d635fca8
 SHA512:
-  metadata.gz: 890c5a309de35f748885ee8c03a266563cc3040bb444ff6d35efa3679057363c2699e820d3e320be809dcb2d37b3f5368f329addc52853466f7a18ab64ea59a2
-  data.tar.gz: 85c31b7043f37003d27f94fa5e5677c35ed86d04b561e3884e2272d1eef4e4168c515c79de21a1747b84a470aa2bd61988241dbe3c82751113e4ff41ac4d43b1
+  metadata.gz: fe049bfe0f4d8ce61c999236d778a7f4aa9d67b8c479410b7fd1b5114272547d56b73ed2a4cf27345df134e430c9a94128a91920b2e05f010ccec0eeeeb357f2
+  data.tar.gz: 59df9e0f93b867a18a7c6b211246e1517968439cf07b3008fa9ccdfa7065fa3c4611dc93692030d4a6d1d79c9dc143e2212bbda663bbc998285e8aac704e35ab

data/app/models/concerns/cul/hydra/models/common.rb

@@ -174,8 +174,7 @@ module Cul::Hydra::Models::Common
 
     # Index URI form of pid to facilitate solr joins
     solr_doc['fedora_pid_uri_ssi'] = 'info:fedora/' + self.pid if self.pid.present?
-    #solr_doc['fedora_pid_uri_ssi'] = 'info:fedora/' + solr_doc['id'] if solr_doc['id'].present?
-    #solr_doc['fedora_pid_uri_ssi'] = ''
+    solr_doc['datastreams_ssim'] = self.datastreams.keys.map {|k| k.to_s }.sort
 
     solr_doc
   end

data/config/fedora.yml

@@ -1,26 +1,17 @@
 development:
-  user: fedoraAdmin
-  password: f+BULUS*^
-  url: http://repository.cul.columbia.edu:8080/fedora
-  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
-  time_zone: "America/New_York"
-test: &TEST  
-  user: fedoraAdmin
-  password: fedoraAdmin
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/fedora-test" %>
-  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
-  time_zone: "America/New_York"
+  :user: fedoraAdmin
+  :password: fedoraAdmin
+  :url: http://localhost:8983/fedora-test
+  :time_zone: "America/New_York"
+
+test:
+  :user: fedoraAdmin
+  :password: fedoraAdmin
+  :url: http://localhost:8983/fedora-test
+  :time_zone: "America/New_York"
+  
 production:
-  user: fedoraAdmin
-  password: f+BULUS*^
-  url: http://repository.cul.columbia.edu:8080/fedora
-  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
-  time_zone: "America/New_York"
-dcv_test:
-  user: fedoraAdmin
-  password: f+BULUS*^
-  url: http://repository.cul.columbia.edu:8080/fedora
-  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
-  time_zone: "America/New_York"
-cucumber:
-  <<: *TEST
+  :user: fedoraAdmin
+  :password: f+BULUS*^
+  :url: http://alcott.cul.columbia.edu:8080/fedora
+  :time_zone: "America/New_York"

data/config/solr.yml

@@ -1,17 +1,8 @@
-# This is a sample config file that does not have multiple solr instances. You will also need to be sure to
-# edit the fedora.yml file to match the solr URL for active-fedora. 
-#  url: http://katana.cul.columbia.edu:8080/solr-4.7/dcv_private_dev
-test: &TEST
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
-dcv_dev: &DEV
-  url: http://spatha.cul.columbia.edu:8080/solr-4.7/dcv_private_test
-  dcv_core: 'dcv_private_dev'
-dcv_test: &IFP
-  url: http://spatha.cul.columbia.edu:8080/solr-4.7/dcv_private_test
-  dcv_core: 'dcv_private_test'
-cucumber:
-  <<: *TEST
-production: &PROD
-  url: http://spatha.cul.columbia.edu:8080/solr-4.7/dcv_prod
 development:
-  <<: *PROD
+  url: http://localhost:8983/solr/test
+  
+test:
+  url: http://localhost:8983/solr/test
+  
+production:
+  url: http://katana.cul.columbia.edu:8080/solr-4.7/dcv_private_dev

data/config/subs.yml

@@ -1,10 +1,17 @@
-old:
-  fedora_server: http://sayers.cul.columbia.edu:8080
-  php_server: http://bach.cul.columbia.edu/dev
-  djatoka_server: http://iris.cul.columbia.edu:8080
 development:
-  fedora_server: http://repository.cul.columbia.edu:8080
-  php_server: http://fedora-svc.cul.columbia.edu/dev
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
 test:
-  fedora_server: http://repository.cul.columbia.edu:8080
-  php_server: http://fedora-svc.cul.columbia.edu/dev
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
+production:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://alcott.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu"
+  
+hyacinth_prod:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://alcott.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu"

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

@@ -8,7 +8,7 @@
 	<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>
+	<url displayLabel="Great URL">http://great-url.cul.columbia.edu/ooo</url>
 </location>
 <relatedItem displayLabel="Project" type="host">
 	<titleInfo>

data/lib/cul_hydra/#version.rb#

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

data/lib/cul_hydra/solrizer/mods_fieldable.rb

@@ -322,6 +322,15 @@ module Cul::Hydra::Solrizer
       project_url_val
     end
 
+    # Create a list of attribute hashes for top-level URL locations
+    # @param node [Nokogiri::XML::Node] search context
+    # @return [Array<Hash>] array of url locations as attribute hashes
+    def url_locations(node=mods)
+      node.xpath("./mods:location/mods:url", MODS_NS).map do |n|
+        {access: n['access'], usage: n['usage'], displayLabel: n['displayLabel'], url: n.text.strip }.compact
+      end
+    end
+
     def all_subjects(node=mods)
       list_of_subjects = []
 
@@ -453,6 +462,7 @@ module Cul::Hydra::Solrizer
       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["location_url_json_ss"] = JSON.generate(url_locations)
       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 = '1.5.1'
+    VERSION = '1.5.2'
     def self.version
       VERSION
     end

data/lib/cul_hydra/version.rb~

@@ -0,0 +1,8 @@
+module Cul
+  module Hydra
+    VERSION = '1.5.1'
+    def self.version
+      VERSION
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -532,6 +532,7 @@ files:
 - fixtures/spec/STRUCTMAP/structmap-unlabeled-seq.xml
 - fixtures/spec/STRUCTMAP/structmap-unordered-seq.xml
 - lib/cul_hydra.rb
+- lib/cul_hydra/#version.rb#
 - lib/cul_hydra/access_controls_enforcement.rb
 - lib/cul_hydra/controllers.rb
 - lib/cul_hydra/controllers/aggregates.rb
@@ -569,6 +570,7 @@ files:
 - lib/cul_hydra/solrizer/value_mapper.rb
 - lib/cul_hydra/solrizer_patch.rb
 - lib/cul_hydra/version.rb
+- lib/cul_hydra/version.rb~
 - lib/tasks/cmodel.rake
 - lib/tasks/cul_hydra_dev.rake
 - lib/tasks/index.rake
@@ -595,7 +597,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL repository apps