blacklight_advanced_search 6.0.2 → 6.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (61) hide show
  1. checksums.yaml +4 -4
  2. data/.rspec +2 -0
  3. data/.rubocop.yml +15 -0
  4. data/.rubocop_todo.yml +351 -0
  5. data/.solr_wrapper.yml +5 -0
  6. data/.travis.yml +4 -7
  7. data/Gemfile +18 -11
  8. data/Rakefile +24 -34
  9. data/VERSION +1 -1
  10. data/app/controllers/advanced_controller.rb +5 -7
  11. data/app/controllers/blacklight_advanced_search/advanced_controller.rb +5 -8
  12. data/app/helpers/advanced_helper.rb +4 -6
  13. data/blacklight_advanced_search.gemspec +11 -8
  14. data/lib/blacklight_advanced_search.rb +29 -34
  15. data/lib/blacklight_advanced_search/advanced_query_parser.rb +12 -13
  16. data/lib/blacklight_advanced_search/advanced_search_builder.rb +28 -32
  17. data/lib/blacklight_advanced_search/catalog_helper_override.rb +11 -34
  18. data/lib/blacklight_advanced_search/controller.rb +1 -1
  19. data/lib/blacklight_advanced_search/filter_parser.rb +7 -9
  20. data/lib/blacklight_advanced_search/parsing_nesting_parser.rb +5 -8
  21. data/lib/blacklight_advanced_search/redirect_legacy_params_filter.rb +23 -25
  22. data/lib/blacklight_advanced_search/render_constraints_override.rb +46 -33
  23. data/lib/blacklight_advanced_search/version.rb +0 -1
  24. data/lib/generators/blacklight_advanced_search/assets_generator.rb +4 -8
  25. data/lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb +0 -2
  26. data/lib/generators/blacklight_advanced_search/install_generator.rb +9 -5
  27. data/lib/generators/blacklight_advanced_search/templates/advanced_controller.rb +0 -2
  28. data/lib/parsing_nesting/grammar.rb +22 -25
  29. data/lib/parsing_nesting/tree.rb +156 -168
  30. data/solr/conf/_rest_managed.json +3 -0
  31. data/solr/conf/admin-extra.html +31 -0
  32. data/solr/conf/elevate.xml +36 -0
  33. data/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
  34. data/solr/conf/protwords.txt +21 -0
  35. data/solr/conf/schema.xml +635 -0
  36. data/solr/conf/scripts.conf +24 -0
  37. data/solr/conf/solrconfig.xml +411 -0
  38. data/solr/conf/spellings.txt +2 -0
  39. data/solr/conf/stopwords.txt +58 -0
  40. data/solr/conf/stopwords_en.txt +58 -0
  41. data/solr/conf/synonyms.txt +31 -0
  42. data/solr/conf/xslt/example.xsl +132 -0
  43. data/solr/conf/xslt/example_atom.xsl +67 -0
  44. data/solr/conf/xslt/example_rss.xsl +66 -0
  45. data/solr/conf/xslt/luke.xsl +337 -0
  46. data/solr/sample_solr_documents.yml +2692 -0
  47. data/spec/features/blacklight_advanced_search_form_spec.rb +0 -2
  48. data/spec/helpers/advanced_helper_spec.rb +0 -2
  49. data/spec/integration/blacklight_stub_spec.rb +0 -2
  50. data/spec/lib/advanced_search_builder_spec.rb +7 -14
  51. data/spec/lib/blacklight_advanced_search/render_constraints_override_spec.rb +39 -0
  52. data/spec/lib/deep_merge_spec.rb +109 -34
  53. data/spec/lib/filter_parser_spec.rb +8 -14
  54. data/spec/parsing_nesting/build_tree_spec.rb +73 -81
  55. data/spec/parsing_nesting/consuming_spec.rb +2 -12
  56. data/spec/parsing_nesting/to_solr_spec.rb +93 -130
  57. data/spec/spec_helper.rb +0 -3
  58. data/spec/test_app_templates/app/controllers/catalog_controller.rb +3 -3
  59. data/spec/test_app_templates/lib/generators/test_app_generator.rb +3 -3
  60. metadata +63 -13
  61. data/spec/spec.opts +0 -4
@@ -0,0 +1,24 @@
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright ownership.
4
+ # The ASF licenses this file to You under the Apache License, Version 2.0
5
+ # (the "License"); you may not use this file except in compliance with
6
+ # the License. You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS,
12
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ # See the License for the specific language governing permissions and
14
+ # limitations under the License.
15
+
16
+ user=
17
+ solr_hostname=localhost
18
+ solr_port=8983
19
+ rsyncd_port=18983
20
+ data_dir=
21
+ webapp_name=solr
22
+ master_host=
23
+ master_data_dir=
24
+ master_status_dir=
@@ -0,0 +1,411 @@
1
+ <?xml version="1.0" encoding="UTF-8" ?>
2
+ <!--
3
+ Licensed to the Apache Software Foundation (ASF) under one or more
4
+ contributor license agreements. See the NOTICE file distributed with
5
+ this work for additional information regarding copyright ownership.
6
+ The ASF licenses this file to You under the Apache License, Version 2.0
7
+ (the "License"); you may not use this file except in compliance with
8
+ the License. You may obtain a copy of the License at
9
+
10
+ http://www.apache.org/licenses/LICENSE-2.0
11
+
12
+ Unless required by applicable law or agreed to in writing, software
13
+ distributed under the License is distributed on an "AS IS" BASIS,
14
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ See the License for the specific language governing permissions and
16
+ limitations under the License.
17
+ -->
18
+
19
+ <!--
20
+ This is a stripped down config file used for a simple example...
21
+ It is *not* a good example to work from.
22
+ -->
23
+ <config>
24
+
25
+ <!-- Controls what version of Lucene various components of Solr
26
+ adhere to. Generally, you want to use the latest version to
27
+ get all bug fixes and improvements. It is highly recommended
28
+ that you fully re-index after changing this setting as it can
29
+ affect both how text is indexed and queried.
30
+ -->
31
+ <luceneMatchVersion>5.0.0</luceneMatchVersion>
32
+
33
+ <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
34
+ <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
35
+
36
+ <directoryFactory name="DirectoryFactory"
37
+ class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
38
+ </directoryFactory>
39
+
40
+ <codecFactory class="solr.SchemaCodecFactory"/>
41
+
42
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
43
+
44
+
45
+ <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
46
+
47
+ <requestDispatcher handleSelect="true" >
48
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
49
+ </requestDispatcher>
50
+
51
+ <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
52
+
53
+ <!-- config for the admin interface -->
54
+ <admin>
55
+ <defaultQuery>*:*</defaultQuery>
56
+ </admin>
57
+
58
+ <!-- SearchHandler
59
+
60
+ http://wiki.apache.org/solr/SearchHandler
61
+
62
+ For processing Search Queries, the primary Request Handler
63
+ provided with Solr is "SearchHandler" It delegates to a sequent
64
+ of SearchComponents (see below) and supports distributed
65
+ queries across multiple shards
66
+ -->
67
+ <requestHandler name="search" class="solr.SearchHandler" default="true">
68
+ <!-- default values for query parameters can be specified, these
69
+ will be overridden by parameters in the request
70
+ -->
71
+ <lst name="defaults">
72
+ <str name="defType">dismax</str>
73
+ <str name="echoParams">explicit</str>
74
+ <int name="rows">10</int>
75
+
76
+ <str name="q.alt">*:*</str>
77
+ <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
78
+
79
+ <!-- this qf and pf are used by default, if not otherwise specified by
80
+ client. The default blacklight_config will use these for the
81
+ "keywords" search. See the author_qf/author_pf, title_qf, etc
82
+ below, which the default blacklight_config will specify for
83
+ those searches. You may also be interested in:
84
+ http://wiki.apache.org/solr/LocalParams
85
+ -->
86
+
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
+ <str name="author_qf">
135
+ author_unstem_search^200
136
+ author_addl_unstem_search^50
137
+ author_t^20
138
+ author_addl_t
139
+ </str>
140
+ <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
+ </str>
146
+ <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
157
+ </str>
158
+ <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
+ </str>
170
+ <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
177
+ </str>
178
+ <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
+ </str>
186
+
187
+ <int name="ps">3</int>
188
+ <float name="tie">0.01</float>
189
+
190
+ <!-- NOT using marc_display because it is large and will slow things down for search results -->
191
+ <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,
213
+ </str>
214
+
215
+ <str name="facet">true</str>
216
+ <str name="facet.mincount">1</str>
217
+ <str name="facet.field">format</str>
218
+ <str name="facet.field">lc_1letter_facet</str>
219
+ <str name="facet.field">lc_alpha_facet</str>
220
+ <str name="facet.field">lc_b4cutter_facet</str>
221
+ <str name="facet.field">language_facet</str>
222
+ <str name="facet.field">pub_date</str>
223
+ <str name="facet.field">subject_era_facet</str>
224
+ <str name="facet.field">subject_geo_facet</str>
225
+ <str name="facet.field">subject_topic_facet</str>
226
+
227
+ <str name="spellcheck">true</str>
228
+ <str name="spellcheck.dictionary">default</str>
229
+ <str name="spellcheck.onlyMorePopular">true</str>
230
+ <str name="spellcheck.extendedResults">true</str>
231
+ <str name="spellcheck.collate">false</str>
232
+ <str name="spellcheck.count">5</str>
233
+
234
+ </lst>
235
+ <!-- In addition to defaults, "appends" params can be specified
236
+ to identify values which should be appended to the list of
237
+ multi-val params from the query (or the existing "defaults").
238
+ -->
239
+ <!-- In this example, the param "fq=instock:true" would be appended to
240
+ any query time fq params the user may specify, as a mechanism for
241
+ partitioning the index, independent of any user selected filtering
242
+ that may also be desired (perhaps as a result of faceted searching).
243
+
244
+ NOTE: there is *absolutely* nothing a client can do to prevent these
245
+ "appends" values from being used, so don't use this mechanism
246
+ unless you are sure you always want it.
247
+ -->
248
+ <!--
249
+ <lst name="appends">
250
+ <str name="fq">inStock:true</str>
251
+ </lst>
252
+ -->
253
+ <!-- "invariants" are a way of letting the Solr maintainer lock down
254
+ the options available to Solr clients. Any params values
255
+ specified here are used regardless of what values may be specified
256
+ in either the query, the "defaults", or the "appends" params.
257
+
258
+ In this example, the facet.field and facet.query params would
259
+ be fixed, limiting the facets clients can use. Faceting is
260
+ not turned on by default - but if the client does specify
261
+ facet=true in the request, these are the only facets they
262
+ will be able to see counts for; regardless of what other
263
+ facet.field or facet.query params they may specify.
264
+
265
+ NOTE: there is *absolutely* nothing a client can do to prevent these
266
+ "invariants" values from being used, so don't use this mechanism
267
+ unless you are sure you always want it.
268
+ -->
269
+ <!--
270
+ <lst name="invariants">
271
+ <str name="facet.field">cat</str>
272
+ <str name="facet.field">manu_exact</str>
273
+ <str name="facet.query">price:[* TO 500]</str>
274
+ <str name="facet.query">price:[500 TO *]</str>
275
+ </lst>
276
+ -->
277
+ <!-- If the default list of SearchComponents is not desired, that
278
+ list can either be overridden completely, or components can be
279
+ prepended or appended to the default list. (see below)
280
+ -->
281
+ <!--
282
+ <arr name="components">
283
+ <str>nameOfCustomComponent1</str>
284
+ <str>nameOfCustomComponent2</str>
285
+ </arr>
286
+ -->
287
+ <arr name="last-components">
288
+ <str>spellcheck</str>
289
+ </arr>
290
+
291
+ </requestHandler>
292
+
293
+ <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
294
+ <requestHandler name="document" class="solr.SearchHandler" >
295
+ <lst name="defaults">
296
+ <str name="echoParams">all</str>
297
+ <str name="fl">*</str>
298
+ <str name="rows">1</str>
299
+ <str name="q">{!term f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
300
+ </lst>
301
+ </requestHandler>
302
+
303
+ <!-- Spell Check
304
+
305
+ The spell check component can return a list of alternative spelling
306
+ suggestions.
307
+
308
+ http://wiki.apache.org/solr/SpellCheckComponent
309
+ -->
310
+ <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
311
+
312
+ <str name="queryAnalyzerFieldType">textSpell</str>
313
+
314
+ <!-- Multiple "Spell Checkers" can be declared and used by this
315
+ component
316
+ -->
317
+
318
+ <!-- a spellchecker built from a field of the main index, and
319
+ written to disk
320
+ -->
321
+ <lst name="spellchecker">
322
+ <str name="name">default</str>
323
+ <str name="field">spell</str>
324
+ <str name="spellcheckIndexDir">./spell</str>
325
+ <str name="buildOnOptimize">true</str>
326
+ </lst>
327
+ <lst name="spellchecker">
328
+ <str name="name">author</str>
329
+ <str name="field">author_spell</str>
330
+ <str name="spellcheckIndexDir">./spell_author</str>
331
+ <str name="accuracy">0.7</str>
332
+ <str name="buildOnOptimize">true</str>
333
+ </lst>
334
+ <lst name="spellchecker">
335
+ <str name="name">subject</str>
336
+ <str name="field">subject_spell</str>
337
+ <str name="spellcheckIndexDir">./spell_subject</str>
338
+ <str name="accuracy">0.7</str>
339
+ <str name="buildOnOptimize">true</str>
340
+ </lst>
341
+ <lst name="spellchecker">
342
+ <str name="name">title</str>
343
+ <str name="field">title_spell</str>
344
+ <str name="spellcheckIndexDir">./spell_title</str>
345
+ <str name="accuracy">0.7</str>
346
+ <str name="buildOnOptimize">true</str>
347
+ </lst>
348
+
349
+ <!-- a spellchecker that uses a different distance measure -->
350
+ <!--
351
+ <lst name="spellchecker">
352
+ <str name="name">jarowinkler</str>
353
+ <str name="field">spell</str>
354
+ <str name="distanceMeasure">
355
+ org.apache.lucene.search.spell.JaroWinklerDistance
356
+ </str>
357
+ <str name="spellcheckIndexDir">spellcheckerJaro</str>
358
+ </lst>
359
+ -->
360
+
361
+ <!-- a spellchecker that use an alternate comparator
362
+
363
+ comparatorClass be one of:
364
+ 1. score (default)
365
+ 2. freq (Frequency first, then score)
366
+ 3. A fully qualified class name
367
+ -->
368
+ <!--
369
+ <lst name="spellchecker">
370
+ <str name="name">freq</str>
371
+ <str name="field">lowerfilt</str>
372
+ <str name="spellcheckIndexDir">spellcheckerFreq</str>
373
+ <str name="comparatorClass">freq</str>
374
+ <str name="buildOnCommit">true</str>
375
+ -->
376
+
377
+ <!-- A spellchecker that reads the list of words from a file -->
378
+ <!--
379
+ <lst name="spellchecker">
380
+ <str name="classname">solr.FileBasedSpellChecker</str>
381
+ <str name="name">file</str>
382
+ <str name="sourceLocation">spellings.txt</str>
383
+ <str name="characterEncoding">UTF-8</str>
384
+ <str name="spellcheckIndexDir">spellcheckerFile</str>
385
+ </lst>
386
+ -->
387
+ </searchComponent>
388
+
389
+ <searchComponent name="suggest" class="solr.SuggestComponent">
390
+ <lst name="suggester">
391
+ <str name="name">mySuggester</str>
392
+ <str name="lookupImpl">FuzzyLookupFactory</str>
393
+ <str name="suggestAnalyzerFieldType">textSuggest</str>
394
+ <str name="buildOnCommit">true</str>
395
+ <str name="field">suggest</str>
396
+ </lst>
397
+ </searchComponent>
398
+
399
+ <requestHandler name="/suggest" class="solr.SearchHandler" startup="lazy">
400
+ <lst name="defaults">
401
+ <str name="suggest">true</str>
402
+ <str name="suggest.count">5</str>
403
+ <str name="suggest.dictionary">mySuggester</str>
404
+ </lst>
405
+ <arr name="components">
406
+ <str>suggest</str>
407
+ </arr>
408
+ </requestHandler>
409
+
410
+ </config>
411
+
@@ -0,0 +1,2 @@
1
+ pizza
2
+ history
@@ -0,0 +1,58 @@
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright ownership.
4
+ # The ASF licenses this file to You under the Apache License, Version 2.0
5
+ # (the "License"); you may not use this file except in compliance with
6
+ # the License. You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS,
12
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ # See the License for the specific language governing permissions and
14
+ # limitations under the License.
15
+
16
+ #-----------------------------------------------------------------------
17
+ # a couple of test stopwords to test that the words are really being
18
+ # configured from this file:
19
+ stopworda
20
+ stopwordb
21
+
22
+ #Standard english stop words taken from Lucene's StopAnalyzer
23
+ a
24
+ an
25
+ and
26
+ are
27
+ as
28
+ at
29
+ be
30
+ but
31
+ by
32
+ for
33
+ if
34
+ in
35
+ into
36
+ is
37
+ it
38
+ no
39
+ not
40
+ of
41
+ on
42
+ or
43
+ s
44
+ such
45
+ t
46
+ that
47
+ the
48
+ their
49
+ then
50
+ there
51
+ these
52
+ they
53
+ this
54
+ to
55
+ was
56
+ will
57
+ with
58
+