hydra-head 3.0.0 → 3.0.1
Sign up to get free protection for your applications and to get access to all the features.
- data/HISTORY.textile +7 -0
- data/lib/generators/hydra/templates/config/initializers/blacklight_config.rb +2 -2
- data/lib/generators/hydra/templates/solr_conf/conf/schema.xml +7 -1
- data/lib/generators/hydra/templates/solr_conf/conf/solrconfig.xml +117 -55
- data/lib/hydra-head/version.rb +1 -1
- data/test_support/features/html_validity.feature +2 -2
- data/test_support/features/mods_asset_search_result.feature +2 -2
- metadata +4 -4
data/HISTORY.textile
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
h3. 3.0.1
|
|
2
|
+
|
|
3
|
+
* generator has the correct solr config files
|
|
4
|
+
* reverted back to using object_type_facet for "Format" facet. This is instead of using active_fedora_model_s, which made some cucumber tests unstable because active_fedora_model_s is populated inconsistently by ActiveFedora (really we should deprecate that solr field)
|
|
5
|
+
|
|
6
|
+
h2. 3.0.0: Upgrade to Rails 3
|
|
7
|
+
|
|
1
8
|
h3. 0.0.1
|
|
2
9
|
|
|
3
10
|
Pulled plugin code from Hydrus
|
|
@@ -51,7 +51,7 @@ Blacklight.configure(:shared) do |config|
|
|
|
51
51
|
#
|
|
52
52
|
config[:facet] = {
|
|
53
53
|
:field_names => (facet_fields = [
|
|
54
|
-
"
|
|
54
|
+
"object_type_facet",
|
|
55
55
|
"pub_date",
|
|
56
56
|
"subject_topic_facet",
|
|
57
57
|
"language_facet",
|
|
@@ -60,7 +60,7 @@ Blacklight.configure(:shared) do |config|
|
|
|
60
60
|
"subject_era_facet"
|
|
61
61
|
]),
|
|
62
62
|
:labels => {
|
|
63
|
-
"
|
|
63
|
+
"object_type_facet" => "Format",
|
|
64
64
|
"pub_date" => "Publication Year",
|
|
65
65
|
"subject_topic_facet" => "Topic",
|
|
66
66
|
"language_facet" => "Language",
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8" ?>
|
|
2
|
+
<!--
|
|
3
|
+
IMPORTANT
|
|
4
|
+
This copy of the solr schema is only used in the context of testing hydra-head. If you want to make changes available to individual hydra heads, you must apply them to the template in lib/generators/hydra/templates/solr_config
|
|
5
|
+
-->
|
|
2
6
|
<schema name="Hydra" version="1.1">
|
|
3
7
|
<!-- For complete comments from the Solr project example schema.xml:
|
|
4
8
|
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/schema.xml?view=markup
|
|
@@ -91,7 +95,7 @@
|
|
|
91
95
|
<field name="format" type="string" indexed="true" stored="true"/>
|
|
92
96
|
<!-- pub_date is assumed by Blacklight's default configuration, so we must define it here to avoid errors -->
|
|
93
97
|
<field name="pub_date" type="string" indexed="true" stored="true" multiValued="true"/>
|
|
94
|
-
|
|
98
|
+
|
|
95
99
|
<dynamicField name="*_i" type="sint" indexed="true" stored="true"/>
|
|
96
100
|
<dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="true"/>
|
|
97
101
|
<dynamicField name="*_l" type="slong" indexed="true" stored="true"/>
|
|
@@ -114,5 +118,7 @@
|
|
|
114
118
|
<defaultSearchField>text</defaultSearchField>
|
|
115
119
|
<solrQueryParser defaultOperator="AND" />
|
|
116
120
|
<copyField source="*_facet" dest="text" />
|
|
121
|
+
<copyField source="*_t" dest="text" />
|
|
122
|
+
<copyField source="*_s" dest="text" />
|
|
117
123
|
|
|
118
124
|
</schema>
|
|
@@ -82,51 +82,121 @@
|
|
|
82
82
|
</lst>
|
|
83
83
|
</requestHandler>
|
|
84
84
|
|
|
85
|
-
<!--
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
85
|
+
<!-- Searching ("All Fields") -->
|
|
86
|
+
<requestHandler name="search" class="solr.SearchHandler" default="true">
|
|
87
|
+
<lst name="defaults">
|
|
88
|
+
<str name="defType">dismax</str>
|
|
89
|
+
<str name="echoParams">explicit</str>
|
|
90
|
+
<str name="q.alt">*:*</str>
|
|
91
|
+
<str name="mm">2<-1 5<-2 6<90%</str>
|
|
92
|
+
<!-- this qf and pf are used by default, if not otherwise specified by
|
|
93
|
+
client. The default blacklight_config will use these for the
|
|
94
|
+
"keywords" search. See the author_qf/author_pf, title_qf, etc
|
|
95
|
+
below, which the default blacklight_config will specify for
|
|
96
|
+
those searches. You may also be interested in:
|
|
97
|
+
http://wiki.apache.org/solr/LocalParams
|
|
98
|
+
-->
|
|
99
|
+
<str name="qf">
|
|
100
|
+
id
|
|
101
|
+
title_t^25000
|
|
102
|
+
text
|
|
103
|
+
active_fedora_model_s
|
|
104
|
+
object_type_facet
|
|
105
|
+
</str>
|
|
106
|
+
<str name="pf">
|
|
107
|
+
id
|
|
108
|
+
title_t^250000
|
|
109
|
+
text^10
|
|
110
|
+
active_fedora_model_s
|
|
111
|
+
object_type_facet
|
|
112
|
+
</str>
|
|
113
|
+
<str name="author_qf">
|
|
114
|
+
author_unstem_search^200
|
|
115
|
+
author_addl_unstem_search^50
|
|
116
|
+
author_t^20
|
|
117
|
+
author_addl_t
|
|
118
|
+
</str>
|
|
119
|
+
<str name="author_pf">
|
|
120
|
+
author_unstem_search^2000
|
|
121
|
+
author_addl_unstem_search^500
|
|
122
|
+
author_t^200
|
|
123
|
+
author_addl_t^10
|
|
124
|
+
</str>
|
|
125
|
+
<str name="title_qf">
|
|
126
|
+
title_unstem_search^50000
|
|
127
|
+
subtitle_unstem_search^25000
|
|
128
|
+
title_addl_unstem_search^10000
|
|
129
|
+
title_t^5000
|
|
130
|
+
subtitle_t^2500
|
|
131
|
+
title_addl_t^100
|
|
132
|
+
title_added_entry_unstem_search^50
|
|
133
|
+
title_added_entry_t^10
|
|
134
|
+
title_series_unstem_search^5
|
|
135
|
+
title_series_t
|
|
136
|
+
</str>
|
|
137
|
+
<str name="title_pf">
|
|
138
|
+
title_unstem_search^500000
|
|
139
|
+
subtitle_unstem_search^250000
|
|
140
|
+
title_addl_unstem_search^100000
|
|
141
|
+
title_t^50000
|
|
142
|
+
subtitle_t^25000
|
|
143
|
+
title_addl_t^1000
|
|
144
|
+
title_added_entry_unstem_search^500
|
|
145
|
+
title_added_entry_t^100
|
|
146
|
+
title_series_t^50
|
|
147
|
+
title_series_unstem_search^10
|
|
148
|
+
</str>
|
|
149
|
+
<str name="subject_qf">
|
|
150
|
+
subject_topic_unstem_search^200
|
|
151
|
+
subject_unstem_search^125
|
|
152
|
+
subject_topic_facet^100
|
|
153
|
+
subject_t^50
|
|
154
|
+
subject_addl_unstem_search^10
|
|
155
|
+
subject_addl_t
|
|
156
|
+
</str>
|
|
157
|
+
<str name="subject_pf">
|
|
158
|
+
subject_topic_unstem_search^2000
|
|
159
|
+
subject_unstem_search^1250
|
|
160
|
+
subject_t^1000
|
|
161
|
+
subject_topic_facet^500
|
|
162
|
+
subject_addl_unstem_search^100
|
|
163
|
+
subject_addl_t^10
|
|
164
|
+
</str>
|
|
90
165
|
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
object_type_facet, department_facet, peer_reviewed_facet
|
|
126
|
-
</str>
|
|
127
|
-
</lst>
|
|
128
|
-
</requestHandler>
|
|
129
|
-
|
|
166
|
+
|
|
167
|
+
<int name="ps">3</int>
|
|
168
|
+
<float name="tie">0.01</float>
|
|
169
|
+
|
|
170
|
+
<!-- NOT using marc_display because it is large and will slow things down for search results -->
|
|
171
|
+
<str name="fl">
|
|
172
|
+
*,score
|
|
173
|
+
</str>
|
|
174
|
+
|
|
175
|
+
<str name="facet">true</str>
|
|
176
|
+
<str name="facet.mincount">1</str>
|
|
177
|
+
<str name="facet.limit">10</str>
|
|
178
|
+
<str name="facet.field">format</str>
|
|
179
|
+
<str name="facet.field">lc_1letter_facet</str>
|
|
180
|
+
<str name="facet.field">lc_alpha_facet</str>
|
|
181
|
+
<str name="facet.field">lc_b4cutter_facet</str>
|
|
182
|
+
<str name="facet.field">language_facet</str>
|
|
183
|
+
<str name="facet.field">pub_date</str>
|
|
184
|
+
<str name="facet.field">subject_era_facet</str>
|
|
185
|
+
<str name="facet.field">subject_geo_facet</str>
|
|
186
|
+
<str name="facet.field">subject_topic_facet</str>
|
|
187
|
+
|
|
188
|
+
<str name="spellcheck">true</str>
|
|
189
|
+
<str name="spellcheck.dictionary">default</str>
|
|
190
|
+
<str name="spellcheck.onlyMorePopular">true</str>
|
|
191
|
+
<str name="spellcheck.extendedResults">true</str>
|
|
192
|
+
<str name="spellcheck.collate">false</str>
|
|
193
|
+
<str name="spellcheck.count">5</str>
|
|
194
|
+
</lst>
|
|
195
|
+
<arr name="last-components">
|
|
196
|
+
<str>spellcheck</str>
|
|
197
|
+
</arr>
|
|
198
|
+
</requestHandler>
|
|
199
|
+
|
|
130
200
|
<requestHandler name="public_search" class="solr.SearchHandler" >
|
|
131
201
|
<lst name="defaults">
|
|
132
202
|
<!-- Making defType lucene to exclude file assets -->
|
|
@@ -137,6 +207,8 @@
|
|
|
137
207
|
<!-- dismax params -->
|
|
138
208
|
<str name="mm"> 2<-1 5<-2 6<90% </str>
|
|
139
209
|
<str name="q.alt">*:*</str>
|
|
210
|
+
<str name="qf">id^0.8 id_t^0.8 format text^0.3 journal_issn_t</str>
|
|
211
|
+
<str name="pf">id^0.9 id_t^0.9 text^0.5 journal_issn_t</str>
|
|
140
212
|
<str name="qf_dismax">id^0.8 id_t^0.8 format text^0.3</str>
|
|
141
213
|
<str name="pf_dismax">id^0.9 id_t^0.9 text^0.5</str>
|
|
142
214
|
<int name="ps">100</int>
|
|
@@ -146,17 +218,7 @@
|
|
|
146
218
|
<str name="facet.mincount">1</str>
|
|
147
219
|
<str name="echoParams">explicit</str>
|
|
148
220
|
<str name="fl">
|
|
149
|
-
|
|
150
|
-
person_0_role_t,person_1_role_t,person_2_role_t,person_3_role_t,person_4_role_t,person_5_role_t,person_6_role_t,person_7_role_t,person_8_role_t,person_9_role_t,
|
|
151
|
-
person_0_first_name_t,person_1_first_name_t,person_2_first_name_t,person_3_first_name_t,person_4_first_name_t,person_5_first_name_t,person_6_first_name_t,person_7_first_name_t,person_8_first_name_t,person_9_first_name_t,
|
|
152
|
-
person_0_last_name_t,person_1_last_name_t,person_2_last_name_t,person_3_last_name_t,person_4_last_name_t,person_5_last_name_t,person_6_last_name_t,person_7_last_name_t,person_8_last_name_t,person_9_last_name_t,depositor_t,
|
|
153
|
-
|
|
154
|
-
journal_title_info_t, journal_title_info_main_title_t, journal_issue_publication_date_t, journal_issue_pages_start_t, journal_issue_pages_end_t, journal_issue_volume_t, journal_issue_start_page_t, journal_issue_end_page_t, abstract_t,
|
|
155
|
-
person_0_institution_t,person_1_institution_t,person_2_institution_t,person_3_institution_t,person_4_institution_t,person_5_institution_t,person_institution_role_t,
|
|
156
|
-
person_7_institution_t,person_8_institution_t,person_9_institution_t,
|
|
157
|
-
mods_gps_t, mods_region_t, mods_site_t, mods_ecosystem_t,
|
|
158
|
-
mods_timespan_start_t, mods_timespan_end_t, description_t, mods_title_info_t,mods_0_title_info_0_main_title_t, embargo_release_date_dt, note_t,
|
|
159
|
-
object_type_facet, department_facet, peer_reviewed_facet
|
|
221
|
+
*,score
|
|
160
222
|
</str>
|
|
161
223
|
</lst>
|
|
162
224
|
</requestHandler>
|
data/lib/hydra-head/version.rb
CHANGED
|
@@ -14,14 +14,14 @@ Feature: HTML validity
|
|
|
14
14
|
|
|
15
15
|
Scenario: Search Results (unauthenticated)
|
|
16
16
|
Given I am on the home page
|
|
17
|
-
When I follow "
|
|
17
|
+
When I follow "Article"
|
|
18
18
|
Then I should see "TITLE OF HOST JOURNAL"
|
|
19
19
|
And the page should be HTML5 valid
|
|
20
20
|
|
|
21
21
|
Scenario: Search Results (authenticated)
|
|
22
22
|
Given I am logged in as "archivist1@example.com"
|
|
23
23
|
When I am on the home page
|
|
24
|
-
And I follow "
|
|
24
|
+
And I follow "Article"
|
|
25
25
|
Then I should see "TITLE OF HOST JOURNAL"
|
|
26
26
|
And the page should be HTML5 valid
|
|
27
27
|
|
|
@@ -13,12 +13,12 @@ Feature: ModsAsset Search Result
|
|
|
13
13
|
|
|
14
14
|
Scenario: html5 valid - unauthenticated
|
|
15
15
|
Given I am on the home page
|
|
16
|
-
When I follow "
|
|
16
|
+
When I follow "Article"
|
|
17
17
|
Then the page should be HTML5 valid
|
|
18
18
|
|
|
19
19
|
Scenario: html5 valid - authenticated
|
|
20
20
|
Given I am logged in as "archivist1@example.com"
|
|
21
21
|
When I am on the home page
|
|
22
|
-
And I follow "
|
|
22
|
+
And I follow "Article"
|
|
23
23
|
Then the page should be HTML5 valid
|
|
24
24
|
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: hydra-head
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 5
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 3
|
|
8
8
|
- 0
|
|
9
|
-
-
|
|
10
|
-
version: 3.0.
|
|
9
|
+
- 1
|
|
10
|
+
version: 3.0.1
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more. See https://github.com/projecthydra/hydra-head/contributors
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2011-11-
|
|
18
|
+
date: 2011-11-10 00:00:00 -08:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|