dor-services 5.4.0 → 5.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/config/config_defaults.yml +1 -0
- data/lib/dor/config.rb +8 -6
- data/lib/dor/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 35cb1a44d9afd35558a54871f7af46dc84ae6edc
|
|
4
|
+
data.tar.gz: b3164b45e0cf6715f59658de8b49eb85e1563d47
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f9be737b2a4309a040db2ec25d6fe63938212de57275914a78e29e8672fc24f2a1e3bff9432032e2a6b6ee1cd60cd66a24ecad5a029f19a75255a2fece62538f
|
|
7
|
+
data.tar.gz: 347762c2217189fe6db553f1f140eee4800405aad4dc73a45465ffa696bbf16468fb432081419c019fc636ad94de36359199df2ade3a855ff7564489bec67aba
|
data/config/config_defaults.yml
CHANGED
data/lib/dor/config.rb
CHANGED
|
@@ -55,10 +55,8 @@ module Dor
|
|
|
55
55
|
end
|
|
56
56
|
|
|
57
57
|
def make_solr_connection(add_opts = {})
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
opts = c.opts.merge(add_opts).merge(
|
|
61
|
-
:url => c.url
|
|
58
|
+
opts = Dor::Config.solr.opts.merge(add_opts).merge(
|
|
59
|
+
:url => Dor::Config.solr.url
|
|
62
60
|
)
|
|
63
61
|
::RSolr::Ext.connect(opts)
|
|
64
62
|
end
|
|
@@ -107,9 +105,13 @@ module Dor
|
|
|
107
105
|
stack = Kernel.caller.dup
|
|
108
106
|
stack.shift while stack[0] =~ %r{(active_support/callbacks|dor/config|dor-services)\.rb}
|
|
109
107
|
ActiveSupport::Deprecation.warn "Dor::Config -- solrizer configuration is deprecated. Please use solr instead.", stack
|
|
108
|
+
|
|
109
|
+
config.solrizer.each do |k, v|
|
|
110
|
+
config.solr[k] ||= v
|
|
111
|
+
end
|
|
110
112
|
end
|
|
111
113
|
|
|
112
|
-
if
|
|
114
|
+
if config.solr.url.present?
|
|
113
115
|
ActiveFedora::SolrService.register
|
|
114
116
|
ActiveFedora::SolrService.instance.instance_variable_set :@conn, make_solr_connection
|
|
115
117
|
end
|
|
@@ -129,7 +131,7 @@ module Dor
|
|
|
129
131
|
end
|
|
130
132
|
|
|
131
133
|
def solr_config
|
|
132
|
-
{ :url =>
|
|
134
|
+
{ :url => solr.url }
|
|
133
135
|
end
|
|
134
136
|
|
|
135
137
|
def predicate_config
|
data/lib/dor/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dor-services
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.4.
|
|
4
|
+
version: 5.4.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Michael Klein
|
|
@@ -14,7 +14,7 @@ authors:
|
|
|
14
14
|
autorequire:
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
|
-
date: 2016-02-
|
|
17
|
+
date: 2016-02-22 00:00:00.000000000 Z
|
|
18
18
|
dependencies:
|
|
19
19
|
- !ruby/object:Gem::Dependency
|
|
20
20
|
name: active-fedora
|