active-fedora 9.8.1 → 9.8.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 58586ed53bced58a10c3a3a900ffdb413af0da13
4
- data.tar.gz: 3722c4020f7de0759cba639c5b934a899d8b1eab
3
+ metadata.gz: 649deb26ad5996b290d97012ef63c57c9b0adbe6
4
+ data.tar.gz: deaec7e3b53d51ea1a02c2bd7d2b9b94b57a4ffc
5
5
  SHA512:
6
- metadata.gz: 9fedd2331376a0cac8f2259dd0ebfca4763f330178a1d82023c66f16fa5dc2a4158d88c50fcbb816c436432472104b759ba5ab1ae60d41a53cf745610d76ffa2
7
- data.tar.gz: 4db5188bb830e88107a19887c112f94d8427f0e47c1f3411cdb4ea8a4e0e5466fb510c2728158daafa8a856a594739ae7576fe3c9908f5a7d71bd3cbf199314c
6
+ metadata.gz: a68489b40710a2c6309a7e11f041d0f4caeb5dfb4f069bddce70dd04af88979575c00bccecc7b65a644b03db3c93583342d5c41035ab5d54d82effdb444bb653
7
+ data.tar.gz: a02c29e941b1c014c3ef95dd1c116537df836423e75fa3e48c539c8b66a7f68605983c89582a990177172b558eb05a060b43bdb864b243519a8d03e67147bf6b
data/.gitignore CHANGED
@@ -14,3 +14,4 @@ bin
14
14
  .ruby-gemset
15
15
  gemfiles/*.gemfile.lock
16
16
  /fcrepo4-data
17
+ /fcrepo4-test-data
data/README.md CHANGED
@@ -83,7 +83,7 @@ You can switch `hydra-test` to `hydra-dev` if you want to create a collection fo
83
83
  To start FCRepo, open another shell and run:
84
84
 
85
85
  ```bash
86
- fedora_wrapper -p 8984
86
+ fcrepo_wrapper -p 8984
87
87
  ```
88
88
 
89
89
  Now you’re ready to run the tests. In the directory where active\_fedora
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
28
28
  s.add_development_dependency "yard"
29
29
  s.add_development_dependency "rake"
30
30
  s.add_development_dependency "solr_wrapper", "~> 0.4"
31
- s.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
31
+ s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
32
32
  s.add_development_dependency "rspec", "~> 3.0"
33
33
  s.add_development_dependency "rspec-its"
34
34
  s.add_development_dependency "equivalent-xml"
data/config/fedora.yml CHANGED
@@ -6,7 +6,7 @@ development:
6
6
  test:
7
7
  user: fedoraAdmin
8
8
  password: fedoraAdmin
9
- url: http://localhost:8984/rest
9
+ url: http://localhost:8986/rest
10
10
  base_path: /test
11
11
  production:
12
12
  user: fedoraAdmin
data/config/solr.yml CHANGED
@@ -5,9 +5,9 @@ development:
5
5
  url: http://localhost:8983/solr/development
6
6
  test:
7
7
  default:
8
- url: http://localhost:8983/solr/hydra-test
8
+ url: http://localhost:8985/solr/hydra-test
9
9
  full_text:
10
- url: http://localhost:8983/solr/test
10
+ url: http://localhost:8985/solr/test
11
11
  production:
12
12
  default:
13
13
  url: http://localhost:8080/solr/production
@@ -1,3 +1,3 @@
1
1
  module ActiveFedora
2
- VERSION = "9.8.1".freeze
2
+ VERSION = "9.8.2".freeze
3
3
  end
@@ -6,7 +6,7 @@ development:
6
6
  test:
7
7
  user: fedoraAdmin
8
8
  password: fedoraAdmin
9
- url: http://localhost:8984/rest
9
+ url: http://localhost:8986/rest
10
10
  base_path: /test
11
11
  production:
12
12
  user: fedoraAdmin
@@ -2,6 +2,6 @@
2
2
  development:
3
3
  url: http://localhost:8983/solr/hydra-dev
4
4
  test:
5
- url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/hydra-test" %>
5
+ url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8985}/solr/hydra-test" %>
6
6
  production:
7
7
  url: http://your.production.server:8080/bl_solr/core0
@@ -32,6 +32,8 @@
32
32
 
33
33
  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
34
34
  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
35
+ <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
36
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
35
37
 
36
38
  <directoryFactory name="DirectoryFactory"
37
39
  class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
@@ -45,7 +47,7 @@
45
47
  <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
46
48
 
47
49
  <requestDispatcher handleSelect="true" >
48
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
50
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048000" />
49
51
  </requestDispatcher>
50
52
 
51
53
  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
@@ -69,162 +71,58 @@
69
71
  will be overridden by parameters in the request
70
72
  -->
71
73
  <lst name="defaults">
72
- <str name="defType">dismax</str>
74
+ <str name="defType">edismax</str>
73
75
  <str name="echoParams">explicit</str>
74
- <int name="rows">10</int>
75
-
76
76
  <str name="q.alt">*:*</str>
77
77
  <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
78
-
78
+ <int name="qs">1</int>
79
+ <int name="ps">2</int>
80
+ <float name="tie">0.01</float>
79
81
  <!-- this qf and pf are used by default, if not otherwise specified by
80
82
  client. The default blacklight_config will use these for the
81
- "keywords" search. See the author_qf/author_pf, title_qf, etc
83
+ "keywords" search. See the author_qf/author_pf, title_qf, etc
82
84
  below, which the default blacklight_config will specify for
83
85
  those searches. You may also be interested in:
84
86
  http://wiki.apache.org/solr/LocalParams
85
87
  -->
88
+ <str name="qf">
89
+ id
90
+ active_fedora_model_ssi
91
+ title_tesim
92
+ author_tesim
93
+ subject_tesim
94
+ </str>
95
+ <str name="pf">
96
+ all_text_timv^10
97
+ </str>
86
98
 
87
- <str name="qf">
88
- title_unstem_search^100000
89
- subtitle_unstem_search^50000
90
- title_t^25000
91
- subtitle_t^10000
92
- title_addl_unstem_search^5000
93
- title_addl_t^2500
94
- title_added_entry_unstem_search^1500
95
- title_added_entry_t^1250
96
- subject_topic_unstem_search^1000
97
- subject_unstem_search^750
98
- subject_topic_facet^625
99
- subject_t^500
100
- author_unstem_search^250
101
- author_addl_unstem_search^250
102
- author_t^100
103
- author_addl_t^50
104
- subject_addl_unstem_search^250
105
- subject_addl_t^50
106
- title_series_unstem_search^25
107
- title_series_t^10
108
- isbn_t
109
- text
110
- </str>
111
- <str name="pf">
112
- title_unstem_search^1000000
113
- subtitle_unstem_search^500000
114
- title_t^250000
115
- subtitle_t^100000
116
- title_addl_unstem_search^50000
117
- title_addl_t^25000
118
- title_added_entry_unstem_search^15000
119
- title_added_entry_t^12500
120
- subject_topic_unstem_search^10000
121
- subject_unstem_search^7500
122
- subject_topic_facet^6250
123
- subject_t^5000
124
- author_unstem_search^2500
125
- author_addl_unstem_search^2500
126
- author_t^1000
127
- author_addl_t^500
128
- subject_addl_unstem_search^2500
129
- subject_addl_t^500
130
- title_series_unstem_search^250
131
- title_series_t^100
132
- text^10
133
- </str>
134
99
  <str name="author_qf">
135
- author_unstem_search^200
136
- author_addl_unstem_search^50
137
- author_t^20
138
- author_addl_t
100
+ author_tesim
139
101
  </str>
140
102
  <str name="author_pf">
141
- author_unstem_search^2000
142
- author_addl_unstem_search^500
143
- author_t^200
144
- author_addl_t^10
145
103
  </str>
146
104
  <str name="title_qf">
147
- title_unstem_search^50000
148
- subtitle_unstem_search^25000
149
- title_addl_unstem_search^10000
150
- title_t^5000
151
- subtitle_t^2500
152
- title_addl_t^100
153
- title_added_entry_unstem_search^50
154
- title_added_entry_t^10
155
- title_series_unstem_search^5
156
- title_series_t
105
+ title_tesim
157
106
  </str>
158
107
  <str name="title_pf">
159
- title_unstem_search^500000
160
- subtitle_unstem_search^250000
161
- title_addl_unstem_search^100000
162
- title_t^50000
163
- subtitle_t^25000
164
- title_addl_t^1000
165
- title_added_entry_unstem_search^500
166
- title_added_entry_t^100
167
- title_series_t^50
168
- title_series_unstem_search^10
169
108
  </str>
170
109
  <str name="subject_qf">
171
- subject_topic_unstem_search^200
172
- subject_unstem_search^125
173
- subject_topic_facet^100
174
- subject_t^50
175
- subject_addl_unstem_search^10
176
- subject_addl_t
110
+ subject_tesim
177
111
  </str>
178
112
  <str name="subject_pf">
179
- subject_topic_unstem_search^2000
180
- subject_unstem_search^1250
181
- subject_t^1000
182
- subject_topic_facet^500
183
- subject_addl_unstem_search^100
184
- subject_addl_t^10
185
113
  </str>
186
-
187
- <int name="ps">3</int>
188
- <float name="tie">0.01</float>
189
114
 
190
- <!-- NOT using marc_display because it is large and will slow things down for search results -->
191
115
  <str name="fl">
192
- id,
193
- score,
194
- author_display,
195
- author_vern_display,
196
- format,
197
- isbn_t,
198
- language_facet,
199
- lc_callnum_display,
200
- material_type_display,
201
- published_display,
202
- published_vern_display,
203
- pub_date,
204
- title_display,
205
- title_vern_display,
206
- subject_topic_facet,
207
- subject_geo_facet,
208
- subject_era_facet,
209
- subtitle_display,
210
- subtitle_vern_display,
211
- url_fulltext_display,
212
- url_suppl_display,
116
+ *,
117
+ score
213
118
  </str>
214
119
 
215
120
  <str name="facet">true</str>
216
121
  <str name="facet.mincount">1</str>
217
122
  <str name="facet.limit">10</str>
218
- <str name="facet.field">format</str>
219
- <str name="facet.field">lc_1letter_facet</str>
220
- <str name="facet.field">lc_alpha_facet</str>
221
- <str name="facet.field">lc_b4cutter_facet</str>
222
- <str name="facet.field">language_facet</str>
223
- <str name="facet.field">pub_date</str>
224
- <str name="facet.field">subject_era_facet</str>
225
- <str name="facet.field">subject_geo_facet</str>
226
- <str name="facet.field">subject_topic_facet</str>
227
-
123
+ <str name="facet.field">active_fedora_model_ssi</str>
124
+ <str name="facet.field">subject_sim</str>
125
+
228
126
  <str name="spellcheck">true</str>
229
127
  <str name="spellcheck.dictionary">default</str>
230
128
  <str name="spellcheck.onlyMorePopular">true</str>
@@ -233,62 +131,32 @@
233
131
  <str name="spellcheck.count">5</str>
234
132
 
235
133
  </lst>
236
- <!-- In addition to defaults, "appends" params can be specified
237
- to identify values which should be appended to the list of
238
- multi-val params from the query (or the existing "defaults").
239
- -->
240
- <!-- In this example, the param "fq=instock:true" would be appended to
241
- any query time fq params the user may specify, as a mechanism for
242
- partitioning the index, independent of any user selected filtering
243
- that may also be desired (perhaps as a result of faceted searching).
244
-
245
- NOTE: there is *absolutely* nothing a client can do to prevent these
246
- "appends" values from being used, so don't use this mechanism
247
- unless you are sure you always want it.
248
- -->
249
- <!--
250
- <lst name="appends">
251
- <str name="fq">inStock:true</str>
252
- </lst>
253
- -->
254
- <!-- "invariants" are a way of letting the Solr maintainer lock down
255
- the options available to Solr clients. Any params values
256
- specified here are used regardless of what values may be specified
257
- in either the query, the "defaults", or the "appends" params.
258
-
259
- In this example, the facet.field and facet.query params would
260
- be fixed, limiting the facets clients can use. Faceting is
261
- not turned on by default - but if the client does specify
262
- facet=true in the request, these are the only facets they
263
- will be able to see counts for; regardless of what other
264
- facet.field or facet.query params they may specify.
265
-
266
- NOTE: there is *absolutely* nothing a client can do to prevent these
267
- "invariants" values from being used, so don't use this mechanism
268
- unless you are sure you always want it.
269
- -->
270
- <!--
271
- <lst name="invariants">
272
- <str name="facet.field">cat</str>
273
- <str name="facet.field">manu_exact</str>
274
- <str name="facet.query">price:[* TO 500]</str>
275
- <str name="facet.query">price:[500 TO *]</str>
276
- </lst>
277
- -->
278
- <!-- If the default list of SearchComponents is not desired, that
279
- list can either be overridden completely, or components can be
280
- prepended or appended to the default list. (see below)
281
- -->
282
- <!--
283
- <arr name="components">
284
- <str>nameOfCustomComponent1</str>
285
- <str>nameOfCustomComponent2</str>
286
- </arr>
287
- -->
288
134
  <arr name="last-components">
289
135
  <str>spellcheck</str>
290
136
  </arr>
291
-
137
+ </requestHandler>
138
+
139
+ <requestHandler name="permissions" class="solr.SearchHandler" >
140
+ <lst name="defaults">
141
+ <str name="facet">off</str>
142
+ <str name="echoParams">all</str>
143
+ <str name="rows">1</str>
144
+ <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
145
+ <str name="fl">
146
+ id,
147
+ access_ssim,
148
+ discover_access_group_ssim,discover_access_person_ssim,
149
+ read_access_group_ssim,read_access_person_ssim,
150
+ edit_access_group_ssim,edit_access_person_ssim,
151
+ depositor_ti,
152
+ embargo_release_date_dtsi
153
+ inheritable_access_ssim,
154
+ inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
155
+ inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
156
+ inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim,
157
+ inheritable_embargo_release_date_dtsi
158
+ </str>
159
+ </lst>
292
160
  </requestHandler>
293
161
 
294
162
  <requestHandler name="standard" class="solr.SearchHandler">
@@ -415,5 +283,18 @@
415
283
  </arr>
416
284
  </requestHandler>
417
285
 
286
+ <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler">
287
+ <lst name="defaults">
288
+ <str name="fmap.Last-Modified">last_modified</str>
289
+ <str name="uprefix">ignored_</str>
290
+ </lst>
291
+ <!--Optional. Specify a path to a tika configuration file. See the Tika docs for details.-->
292
+ <!-- <str name="tika.config">/my/path/to/tika.config</str> -->
293
+ <!-- Optional. Specify one or more date formats to parse. See DateUtil.DEFAULT_DATE_FORMATS
294
+ for default date formats -->
295
+ <!-- <lst name="date.formats"> -->
296
+ <!-- <str>yyyy&#45;MM&#45;dd</str> -->
297
+ <!-- </lst> -->
298
+ </requestHandler>
418
299
  </config>
419
300
 
@@ -51,11 +51,9 @@ namespace :active_fedora do
51
51
  desc "CI build"
52
52
  task :ci do
53
53
  ENV['environment'] = "test"
54
- # Rake::Task["active_fedora:configure_jetty"].invoke
55
- # jetty_params = Jettywrapper.load_config
56
- solr_params = { port: 8983, verbose: true, managed: true }
57
- fcrepo_params = { port: 8984, verbose: true, managed: true }
58
- error = nil
54
+ solr_params = { port: 8985, verbose: true, managed: true }
55
+ fcrepo_params = { port: 8986, verbose: true, managed: true,
56
+ no_jms: true, fcrepo_home_dir: 'fcrepo4-test-data' }
59
57
  SolrWrapper.wrap(solr_params) do |solr|
60
58
  solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "config")) do
61
59
  FcrepoWrapper.wrap(fcrepo_params) do
@@ -32,6 +32,8 @@
32
32
 
33
33
  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
34
34
  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
35
+ <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
36
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
35
37
 
36
38
  <directoryFactory name="DirectoryFactory"
37
39
  class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
@@ -45,7 +47,7 @@
45
47
  <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
46
48
 
47
49
  <requestDispatcher handleSelect="true" >
48
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
50
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048000" />
49
51
  </requestDispatcher>
50
52
 
51
53
  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
@@ -69,162 +71,58 @@
69
71
  will be overridden by parameters in the request
70
72
  -->
71
73
  <lst name="defaults">
72
- <str name="defType">dismax</str>
74
+ <str name="defType">edismax</str>
73
75
  <str name="echoParams">explicit</str>
74
- <int name="rows">10</int>
75
-
76
76
  <str name="q.alt">*:*</str>
77
77
  <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
78
-
78
+ <int name="qs">1</int>
79
+ <int name="ps">2</int>
80
+ <float name="tie">0.01</float>
79
81
  <!-- this qf and pf are used by default, if not otherwise specified by
80
82
  client. The default blacklight_config will use these for the
81
- "keywords" search. See the author_qf/author_pf, title_qf, etc
83
+ "keywords" search. See the author_qf/author_pf, title_qf, etc
82
84
  below, which the default blacklight_config will specify for
83
85
  those searches. You may also be interested in:
84
86
  http://wiki.apache.org/solr/LocalParams
85
87
  -->
88
+ <str name="qf">
89
+ id
90
+ active_fedora_model_ssi
91
+ title_tesim
92
+ author_tesim
93
+ subject_tesim
94
+ </str>
95
+ <str name="pf">
96
+ all_text_timv^10
97
+ </str>
86
98
 
87
- <str name="qf">
88
- title_unstem_search^100000
89
- subtitle_unstem_search^50000
90
- title_t^25000
91
- subtitle_t^10000
92
- title_addl_unstem_search^5000
93
- title_addl_t^2500
94
- title_added_entry_unstem_search^1500
95
- title_added_entry_t^1250
96
- subject_topic_unstem_search^1000
97
- subject_unstem_search^750
98
- subject_topic_facet^625
99
- subject_t^500
100
- author_unstem_search^250
101
- author_addl_unstem_search^250
102
- author_t^100
103
- author_addl_t^50
104
- subject_addl_unstem_search^250
105
- subject_addl_t^50
106
- title_series_unstem_search^25
107
- title_series_t^10
108
- isbn_t
109
- text
110
- </str>
111
- <str name="pf">
112
- title_unstem_search^1000000
113
- subtitle_unstem_search^500000
114
- title_t^250000
115
- subtitle_t^100000
116
- title_addl_unstem_search^50000
117
- title_addl_t^25000
118
- title_added_entry_unstem_search^15000
119
- title_added_entry_t^12500
120
- subject_topic_unstem_search^10000
121
- subject_unstem_search^7500
122
- subject_topic_facet^6250
123
- subject_t^5000
124
- author_unstem_search^2500
125
- author_addl_unstem_search^2500
126
- author_t^1000
127
- author_addl_t^500
128
- subject_addl_unstem_search^2500
129
- subject_addl_t^500
130
- title_series_unstem_search^250
131
- title_series_t^100
132
- text^10
133
- </str>
134
99
  <str name="author_qf">
135
- author_unstem_search^200
136
- author_addl_unstem_search^50
137
- author_t^20
138
- author_addl_t
100
+ author_tesim
139
101
  </str>
140
102
  <str name="author_pf">
141
- author_unstem_search^2000
142
- author_addl_unstem_search^500
143
- author_t^200
144
- author_addl_t^10
145
103
  </str>
146
104
  <str name="title_qf">
147
- title_unstem_search^50000
148
- subtitle_unstem_search^25000
149
- title_addl_unstem_search^10000
150
- title_t^5000
151
- subtitle_t^2500
152
- title_addl_t^100
153
- title_added_entry_unstem_search^50
154
- title_added_entry_t^10
155
- title_series_unstem_search^5
156
- title_series_t
105
+ title_tesim
157
106
  </str>
158
107
  <str name="title_pf">
159
- title_unstem_search^500000
160
- subtitle_unstem_search^250000
161
- title_addl_unstem_search^100000
162
- title_t^50000
163
- subtitle_t^25000
164
- title_addl_t^1000
165
- title_added_entry_unstem_search^500
166
- title_added_entry_t^100
167
- title_series_t^50
168
- title_series_unstem_search^10
169
108
  </str>
170
109
  <str name="subject_qf">
171
- subject_topic_unstem_search^200
172
- subject_unstem_search^125
173
- subject_topic_facet^100
174
- subject_t^50
175
- subject_addl_unstem_search^10
176
- subject_addl_t
110
+ subject_tesim
177
111
  </str>
178
112
  <str name="subject_pf">
179
- subject_topic_unstem_search^2000
180
- subject_unstem_search^1250
181
- subject_t^1000
182
- subject_topic_facet^500
183
- subject_addl_unstem_search^100
184
- subject_addl_t^10
185
113
  </str>
186
-
187
- <int name="ps">3</int>
188
- <float name="tie">0.01</float>
189
114
 
190
- <!-- NOT using marc_display because it is large and will slow things down for search results -->
191
115
  <str name="fl">
192
- id,
193
- score,
194
- author_display,
195
- author_vern_display,
196
- format,
197
- isbn_t,
198
- language_facet,
199
- lc_callnum_display,
200
- material_type_display,
201
- published_display,
202
- published_vern_display,
203
- pub_date,
204
- title_display,
205
- title_vern_display,
206
- subject_topic_facet,
207
- subject_geo_facet,
208
- subject_era_facet,
209
- subtitle_display,
210
- subtitle_vern_display,
211
- url_fulltext_display,
212
- url_suppl_display,
116
+ *,
117
+ score
213
118
  </str>
214
119
 
215
120
  <str name="facet">true</str>
216
121
  <str name="facet.mincount">1</str>
217
122
  <str name="facet.limit">10</str>
218
- <str name="facet.field">format</str>
219
- <str name="facet.field">lc_1letter_facet</str>
220
- <str name="facet.field">lc_alpha_facet</str>
221
- <str name="facet.field">lc_b4cutter_facet</str>
222
- <str name="facet.field">language_facet</str>
223
- <str name="facet.field">pub_date</str>
224
- <str name="facet.field">subject_era_facet</str>
225
- <str name="facet.field">subject_geo_facet</str>
226
- <str name="facet.field">subject_topic_facet</str>
227
-
123
+ <str name="facet.field">active_fedora_model_ssi</str>
124
+ <str name="facet.field">subject_sim</str>
125
+
228
126
  <str name="spellcheck">true</str>
229
127
  <str name="spellcheck.dictionary">default</str>
230
128
  <str name="spellcheck.onlyMorePopular">true</str>
@@ -233,62 +131,32 @@
233
131
  <str name="spellcheck.count">5</str>
234
132
 
235
133
  </lst>
236
- <!-- In addition to defaults, "appends" params can be specified
237
- to identify values which should be appended to the list of
238
- multi-val params from the query (or the existing "defaults").
239
- -->
240
- <!-- In this example, the param "fq=instock:true" would be appended to
241
- any query time fq params the user may specify, as a mechanism for
242
- partitioning the index, independent of any user selected filtering
243
- that may also be desired (perhaps as a result of faceted searching).
244
-
245
- NOTE: there is *absolutely* nothing a client can do to prevent these
246
- "appends" values from being used, so don't use this mechanism
247
- unless you are sure you always want it.
248
- -->
249
- <!--
250
- <lst name="appends">
251
- <str name="fq">inStock:true</str>
252
- </lst>
253
- -->
254
- <!-- "invariants" are a way of letting the Solr maintainer lock down
255
- the options available to Solr clients. Any params values
256
- specified here are used regardless of what values may be specified
257
- in either the query, the "defaults", or the "appends" params.
258
-
259
- In this example, the facet.field and facet.query params would
260
- be fixed, limiting the facets clients can use. Faceting is
261
- not turned on by default - but if the client does specify
262
- facet=true in the request, these are the only facets they
263
- will be able to see counts for; regardless of what other
264
- facet.field or facet.query params they may specify.
265
-
266
- NOTE: there is *absolutely* nothing a client can do to prevent these
267
- "invariants" values from being used, so don't use this mechanism
268
- unless you are sure you always want it.
269
- -->
270
- <!--
271
- <lst name="invariants">
272
- <str name="facet.field">cat</str>
273
- <str name="facet.field">manu_exact</str>
274
- <str name="facet.query">price:[* TO 500]</str>
275
- <str name="facet.query">price:[500 TO *]</str>
276
- </lst>
277
- -->
278
- <!-- If the default list of SearchComponents is not desired, that
279
- list can either be overridden completely, or components can be
280
- prepended or appended to the default list. (see below)
281
- -->
282
- <!--
283
- <arr name="components">
284
- <str>nameOfCustomComponent1</str>
285
- <str>nameOfCustomComponent2</str>
286
- </arr>
287
- -->
288
134
  <arr name="last-components">
289
135
  <str>spellcheck</str>
290
136
  </arr>
291
-
137
+ </requestHandler>
138
+
139
+ <requestHandler name="permissions" class="solr.SearchHandler" >
140
+ <lst name="defaults">
141
+ <str name="facet">off</str>
142
+ <str name="echoParams">all</str>
143
+ <str name="rows">1</str>
144
+ <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
145
+ <str name="fl">
146
+ id,
147
+ access_ssim,
148
+ discover_access_group_ssim,discover_access_person_ssim,
149
+ read_access_group_ssim,read_access_person_ssim,
150
+ edit_access_group_ssim,edit_access_person_ssim,
151
+ depositor_ti,
152
+ embargo_release_date_dtsi
153
+ inheritable_access_ssim,
154
+ inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
155
+ inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
156
+ inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim,
157
+ inheritable_embargo_release_date_dtsi
158
+ </str>
159
+ </lst>
292
160
  </requestHandler>
293
161
 
294
162
  <requestHandler name="standard" class="solr.SearchHandler">
@@ -415,5 +283,18 @@
415
283
  </arr>
416
284
  </requestHandler>
417
285
 
286
+ <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler">
287
+ <lst name="defaults">
288
+ <str name="fmap.Last-Modified">last_modified</str>
289
+ <str name="uprefix">ignored_</str>
290
+ </lst>
291
+ <!--Optional. Specify a path to a tika configuration file. See the Tika docs for details.-->
292
+ <!-- <str name="tika.config">/my/path/to/tika.config</str> -->
293
+ <!-- Optional. Specify one or more date formats to parse. See DateUtil.DEFAULT_DATE_FORMATS
294
+ for default date formats -->
295
+ <!-- <lst name="date.formats"> -->
296
+ <!-- <str>yyyy&#45;MM&#45;dd</str> -->
297
+ <!-- </lst> -->
298
+ </requestHandler>
418
299
  </config>
419
300
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active-fedora
3
3
  version: !ruby/object:Gem::Version
4
- version: 9.8.1
4
+ version: 9.8.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Zumwalt
@@ -200,14 +200,14 @@ dependencies:
200
200
  requirements:
201
201
  - - "~>"
202
202
  - !ruby/object:Gem::Version
203
- version: '0.1'
203
+ version: '0.2'
204
204
  type: :development
205
205
  prerelease: false
206
206
  version_requirements: !ruby/object:Gem::Requirement
207
207
  requirements:
208
208
  - - "~>"
209
209
  - !ruby/object:Gem::Version
210
- version: '0.1'
210
+ version: '0.2'
211
211
  - !ruby/object:Gem::Dependency
212
212
  name: rspec
213
213
  requirement: !ruby/object:Gem::Requirement
@@ -317,7 +317,6 @@ files:
317
317
  - Rakefile
318
318
  - active-fedora.gemspec
319
319
  - config/fedora.yml
320
- - config/jetty.yml
321
320
  - config/predicate_mappings.yml
322
321
  - config/service_mappings.yml
323
322
  - config/solr.yml
data/config/jetty.yml DELETED
@@ -1,6 +0,0 @@
1
- default:
2
- startup_wait: 90
3
- jetty_port: 8983
4
- java_opts:
5
- - "-Xmx512m"
6
- - "-XX:MaxPermSize=128m"