enju_leaf 1.1.0.rc18 → 1.1.0.rc19
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/MIT-LICENSE +1 -1
- data/app/controllers/my_accounts_controller.rb +1 -1
- data/app/controllers/page_controller.rb +5 -5
- data/app/controllers/profiles_controller.rb +0 -1
- data/app/controllers/user_import_files_controller.rb +2 -1
- data/app/models/identity.rb +9 -0
- data/app/models/profile.rb +2 -0
- data/app/models/user_import_file.rb +0 -1
- data/app/views/devise/registrations/edit.html.erb +8 -14
- data/app/views/my_accounts/_edit_credential.html.erb +6 -21
- data/app/views/my_accounts/_edit_credential.html.slim +63 -0
- data/app/views/my_accounts/edit.html.erb +1 -0
- data/app/views/my_accounts/show.html.erb +2 -1
- data/app/views/my_accounts/show.html.slim +59 -0
- data/app/views/page/500_nosolr.html.erb +66 -0
- data/app/views/page/{_msie_acceralator.html.erb → _msie_accelerator.html.erb} +0 -0
- data/app/views/page/add_on.html.slim +7 -0
- data/app/views/page/{msie_acceralator.builder → msie_accelerator.builder} +0 -0
- data/app/views/profiles/_edit_credential.html.slim +67 -0
- data/app/views/profiles/_edit_profile.html.slim +40 -0
- data/app/views/profiles/new.html.erb +0 -5
- data/app/views/roles/index.html.erb +6 -2
- data/app/views/roles/show.html.erb +3 -1
- data/app/views/user_groups/index.html.erb +3 -1
- data/app/views/user_groups/show.html.erb +6 -2
- data/app/views/user_import_files/index.html.slim +52 -0
- data/app/views/user_import_files/new.html.slim +64 -0
- data/config/locales/devise.ja.yml +1 -1
- data/config/locales/translation_en.yml +11 -9
- data/config/locales/translation_ja.yml +2 -0
- data/config/routes.rb +6 -1
- data/db/migrate/20140110122216_create_user_import_files.rb +1 -1
- data/db/migrate/20150421023923_create_identities.rb +15 -0
- data/lib/enju_leaf/controller.rb +1 -1
- data/lib/enju_leaf/user.rb +8 -8
- data/lib/enju_leaf/version.rb +1 -1
- data/lib/enju_leaf.rb +13 -2
- data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb +12 -8
- data/lib/generators/enju_leaf/setup/setup_generator.rb +14 -14
- data/lib/generators/enju_leaf/setup/templates/config/initializers/resque.rb +3 -0
- data/lib/generators/enju_leaf/setup/templates/db/seeds.rb +2 -7
- data/lib/generators/enju_leaf/setup/templates/solr/conf/schema.xml +32 -12
- data/lib/generators/enju_leaf/setup/templates/solr/conf/solrconfig.xml +599 -853
- data/spec/controllers/my_accounts_controller_spec.rb +6 -6
- data/spec/controllers/page_controller_spec.rb +2 -2
- data/spec/dummy/db/schema.rb +14 -1
- data/spec/factories/user.rb +0 -3
- data/spec/fixtures/library_groups.yml +1 -0
- data/spec/models/user_import_file_spec.rb +1 -1
- data/spec/models/user_spec.rb +0 -17
- metadata +27 -25
- data/lib/generators/enju_leaf/setup/templates/config/resque.yml +0 -3
- data/lib/generators/enju_leaf/setup/templates/solr/conf/admin-extra.html +0 -31
- data/lib/generators/enju_leaf/setup/templates/solr/conf/elevate.xml +0 -36
- data/lib/generators/enju_leaf/setup/templates/solr/conf/mapping-ISOLatin1Accent.txt +0 -246
- data/lib/generators/enju_leaf/setup/templates/solr/conf/protwords.txt +0 -21
- data/lib/generators/enju_leaf/setup/templates/solr/conf/scripts.conf +0 -24
- data/lib/generators/enju_leaf/setup/templates/solr/conf/spellings.txt +0 -2
- data/lib/generators/enju_leaf/setup/templates/solr/conf/stopwords.txt +0 -58
- data/lib/generators/enju_leaf/setup/templates/solr/conf/synonyms.txt +0 -31
@@ -125,12 +125,12 @@ describe MyAccountsController do
|
|
125
125
|
end
|
126
126
|
end
|
127
127
|
|
128
|
-
describe "with invalid password params" do
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
end
|
128
|
+
#describe "with invalid password params" do
|
129
|
+
# it "assigns the requested user as @user" do
|
130
|
+
# put :update, profile: @invalid_passwd_attrs
|
131
|
+
# expect(assigns(:profile).errors).not_to be_blank
|
132
|
+
# end
|
133
|
+
#end
|
134
134
|
end
|
135
135
|
|
136
136
|
describe "When logged in as Librarian" do
|
@@ -58,8 +58,8 @@ describe PageController do
|
|
58
58
|
expect(response).to be_success
|
59
59
|
end
|
60
60
|
|
61
|
-
it "should get
|
62
|
-
get :
|
61
|
+
it "should get msie_accelerator" do
|
62
|
+
get :msie_accelerator, format: :xml
|
63
63
|
expect(response).to be_success
|
64
64
|
end
|
65
65
|
|
data/spec/dummy/db/schema.rb
CHANGED
@@ -498,6 +498,19 @@ ActiveRecord::Schema.define(version: 20150506105356) do
|
|
498
498
|
add_index "identifiers", ["body", "identifier_type_id"], name: "index_identifiers_on_body_and_identifier_type_id"
|
499
499
|
add_index "identifiers", ["manifestation_id"], name: "index_identifiers_on_manifestation_id"
|
500
500
|
|
501
|
+
create_table "identities", force: :cascade do |t|
|
502
|
+
t.string "name"
|
503
|
+
t.string "email"
|
504
|
+
t.string "password_digest"
|
505
|
+
t.integer "profile_id"
|
506
|
+
t.datetime "created_at", null: false
|
507
|
+
t.datetime "updated_at", null: false
|
508
|
+
end
|
509
|
+
|
510
|
+
add_index "identities", ["email"], name: "index_identities_on_email"
|
511
|
+
add_index "identities", ["name"], name: "index_identities_on_name"
|
512
|
+
add_index "identities", ["profile_id"], name: "index_identities_on_profile_id"
|
513
|
+
|
501
514
|
create_table "import_request_transitions", force: :cascade do |t|
|
502
515
|
t.string "to_state"
|
503
516
|
t.text "metadata", default: "{}"
|
@@ -1418,7 +1431,7 @@ ActiveRecord::Schema.define(version: 20150506105356) do
|
|
1418
1431
|
t.datetime "executed_at"
|
1419
1432
|
t.string "user_import_file_name"
|
1420
1433
|
t.string "user_import_content_type"
|
1421
|
-
t.
|
1434
|
+
t.integer "user_import_file_size"
|
1422
1435
|
t.datetime "user_import_updated_at"
|
1423
1436
|
t.string "user_import_fingerprint"
|
1424
1437
|
t.string "edit_mode"
|
data/spec/factories/user.rb
CHANGED
@@ -2,7 +2,6 @@ FactoryGirl.define do
|
|
2
2
|
factory :admin, :class => User do |f|
|
3
3
|
f.sequence(:username){|n| "admin_#{n}"}
|
4
4
|
f.sequence(:email){|n| "admin_#{n}@example.jp"}
|
5
|
-
f.email_confirmation{|u| u.email}
|
6
5
|
f.password 'adminpassword'
|
7
6
|
f.password_confirmation 'adminpassword'
|
8
7
|
f.after(:create) do |user|
|
@@ -16,7 +15,6 @@ FactoryGirl.define do
|
|
16
15
|
factory :librarian, :class => User do |f|
|
17
16
|
f.sequence(:username){|n| "librarian_#{n}"}
|
18
17
|
f.sequence(:email){|n| "librarian_#{n}@example.jp"}
|
19
|
-
f.email_confirmation{|u| u.email}
|
20
18
|
f.password 'librarianpassword'
|
21
19
|
f.password_confirmation 'librarianpassword'
|
22
20
|
f.after(:create) do |user|
|
@@ -30,7 +28,6 @@ FactoryGirl.define do
|
|
30
28
|
factory :user, :class => User do |f|
|
31
29
|
f.sequence(:username){|n| "user_#{n}"}
|
32
30
|
f.sequence(:email){|n| "user_#{n}@example.jp"}
|
33
|
-
f.email_confirmation{|u| u.email}
|
34
31
|
f.password 'userpassword'
|
35
32
|
f.password_confirmation 'userpassword'
|
36
33
|
f.after(:create) do |user|
|
@@ -73,7 +73,7 @@ describe UserImportFile do
|
|
73
73
|
@file.executed_at.should be_truthy
|
74
74
|
|
75
75
|
@file.reload
|
76
|
-
@file.error_message.should eq "The
|
76
|
+
@file.error_message.should eq "The following column(s) were ignored: invalid"
|
77
77
|
end
|
78
78
|
|
79
79
|
it "should send message when import is completed" do
|
data/spec/models/user_spec.rb
CHANGED
@@ -73,13 +73,6 @@ describe User do
|
|
73
73
|
user.errors[:email].should be_empty
|
74
74
|
end
|
75
75
|
|
76
|
-
it "should not require email on create if an operator is set" do
|
77
|
-
user = FactoryGirl.build(:user, :email => '')
|
78
|
-
user.operator = FactoryGirl.create(:admin)
|
79
|
-
user.save
|
80
|
-
user.errors[:email].should be_empty
|
81
|
-
end
|
82
|
-
|
83
76
|
it "should reset password" do
|
84
77
|
users(:user1).password = 'new password'
|
85
78
|
users(:user1).password_confirmation = 'new password'
|
@@ -126,16 +119,6 @@ describe User do
|
|
126
119
|
end
|
127
120
|
|
128
121
|
if defined?(EnjuCirculation)
|
129
|
-
it "should reset checkout_icalendar_token" do
|
130
|
-
users(:user1).reset_checkout_icalendar_token
|
131
|
-
users(:user1).checkout_icalendar_token.should be_truthy
|
132
|
-
end
|
133
|
-
|
134
|
-
it "should delete checkout_icalendar_token" do
|
135
|
-
users(:user1).delete_checkout_icalendar_token
|
136
|
-
users(:user1).checkout_icalendar_token.should be_nil
|
137
|
-
end
|
138
|
-
|
139
122
|
it "should get checked_item_count" do
|
140
123
|
count = users(:user1).checked_item_count
|
141
124
|
count.should eq({:book=>2, :serial=>1, :cd=>0})
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_leaf
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.0.
|
4
|
+
version: 1.1.0.rc19
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-06-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -16,7 +16,7 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.2.
|
19
|
+
version: 3.2.22
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
22
|
version: '5.0'
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 3.2.
|
29
|
+
version: 3.2.22
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
32
|
version: '5.0'
|
@@ -36,42 +36,42 @@ dependencies:
|
|
36
36
|
requirements:
|
37
37
|
- - "~>"
|
38
38
|
- !ruby/object:Gem::Version
|
39
|
-
version: 0.1.0.
|
39
|
+
version: 0.1.0.pre66
|
40
40
|
type: :runtime
|
41
41
|
prerelease: false
|
42
42
|
version_requirements: !ruby/object:Gem::Requirement
|
43
43
|
requirements:
|
44
44
|
- - "~>"
|
45
45
|
- !ruby/object:Gem::Version
|
46
|
-
version: 0.1.0.
|
46
|
+
version: 0.1.0.pre66
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: enju_library
|
49
49
|
requirement: !ruby/object:Gem::Requirement
|
50
50
|
requirements:
|
51
51
|
- - "~>"
|
52
52
|
- !ruby/object:Gem::Version
|
53
|
-
version: 0.1.0.
|
53
|
+
version: 0.1.0.pre41
|
54
54
|
type: :runtime
|
55
55
|
prerelease: false
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
57
57
|
requirements:
|
58
58
|
- - "~>"
|
59
59
|
- !ruby/object:Gem::Version
|
60
|
-
version: 0.1.0.
|
60
|
+
version: 0.1.0.pre41
|
61
61
|
- !ruby/object:Gem::Dependency
|
62
62
|
name: enju_manifestation_viewer
|
63
63
|
requirement: !ruby/object:Gem::Requirement
|
64
64
|
requirements:
|
65
65
|
- - "~>"
|
66
66
|
- !ruby/object:Gem::Version
|
67
|
-
version: 0.1.0.
|
67
|
+
version: 0.1.0.pre18
|
68
68
|
type: :runtime
|
69
69
|
prerelease: false
|
70
70
|
version_requirements: !ruby/object:Gem::Requirement
|
71
71
|
requirements:
|
72
72
|
- - "~>"
|
73
73
|
- !ruby/object:Gem::Version
|
74
|
-
version: 0.1.0.
|
74
|
+
version: 0.1.0.pre18
|
75
75
|
- !ruby/object:Gem::Dependency
|
76
76
|
name: friendly_id
|
77
77
|
requirement: !ruby/object:Gem::Requirement
|
@@ -120,14 +120,14 @@ dependencies:
|
|
120
120
|
requirements:
|
121
121
|
- - "~>"
|
122
122
|
- !ruby/object:Gem::Version
|
123
|
-
version: '1.
|
123
|
+
version: '1.11'
|
124
124
|
type: :runtime
|
125
125
|
prerelease: false
|
126
126
|
version_requirements: !ruby/object:Gem::Requirement
|
127
127
|
requirements:
|
128
128
|
- - "~>"
|
129
129
|
- !ruby/object:Gem::Version
|
130
|
-
version: '1.
|
130
|
+
version: '1.11'
|
131
131
|
- !ruby/object:Gem::Dependency
|
132
132
|
name: acts_as_list
|
133
133
|
requirement: !ruby/object:Gem::Requirement
|
@@ -442,14 +442,14 @@ dependencies:
|
|
442
442
|
requirements:
|
443
443
|
- - "~>"
|
444
444
|
- !ruby/object:Gem::Version
|
445
|
-
version: 0.1.2.
|
445
|
+
version: 0.1.2.pre22
|
446
446
|
type: :development
|
447
447
|
prerelease: false
|
448
448
|
version_requirements: !ruby/object:Gem::Requirement
|
449
449
|
requirements:
|
450
450
|
- - "~>"
|
451
451
|
- !ruby/object:Gem::Version
|
452
|
-
version: 0.1.2.
|
452
|
+
version: 0.1.2.pre22
|
453
453
|
- !ruby/object:Gem::Dependency
|
454
454
|
name: enju_search_log
|
455
455
|
requirement: !ruby/object:Gem::Requirement
|
@@ -693,6 +693,7 @@ files:
|
|
693
693
|
- app/helpers/page_helper.rb
|
694
694
|
- app/mailers/notifier.rb
|
695
695
|
- app/models/enju_leaf/ability.rb
|
696
|
+
- app/models/identity.rb
|
696
697
|
- app/models/profile.rb
|
697
698
|
- app/models/role.rb
|
698
699
|
- app/models/user_export_file.rb
|
@@ -737,10 +738,12 @@ files:
|
|
737
738
|
- app/views/layouts/devise/sessions.html.erb
|
738
739
|
- app/views/layouts/devise/sessions.mobile.erb
|
739
740
|
- app/views/my_accounts/_edit_credential.html.erb
|
741
|
+
- app/views/my_accounts/_edit_credential.html.slim
|
740
742
|
- app/views/my_accounts/_form.html.erb
|
741
743
|
- app/views/my_accounts/_show.html.erb
|
742
744
|
- app/views/my_accounts/edit.html.erb
|
743
745
|
- app/views/my_accounts/show.html.erb
|
746
|
+
- app/views/my_accounts/show.html.slim
|
744
747
|
- app/views/my_accounts/show.mobile.erb
|
745
748
|
- app/views/page/403.html.erb
|
746
749
|
- app/views/page/403.mobile.erb
|
@@ -751,6 +754,7 @@ files:
|
|
751
754
|
- app/views/page/500.html.erb
|
752
755
|
- app/views/page/500.mobile.erb
|
753
756
|
- app/views/page/500.xml.erb
|
757
|
+
- app/views/page/500_nosolr.html.erb
|
754
758
|
- app/views/page/_add.html.erb
|
755
759
|
- app/views/page/_footer.html.erb
|
756
760
|
- app/views/page/_footer.mobile.erb
|
@@ -762,7 +766,7 @@ files:
|
|
762
766
|
- app/views/page/_login.html.erb
|
763
767
|
- app/views/page/_menu.html.erb
|
764
768
|
- app/views/page/_mobile.mobile.erb
|
765
|
-
- app/views/page/
|
769
|
+
- app/views/page/_msie_accelerator.html.erb
|
766
770
|
- app/views/page/_portlets.html.erb
|
767
771
|
- app/views/page/_position.html.erb
|
768
772
|
- app/views/page/_required_field.html.erb
|
@@ -772,18 +776,21 @@ files:
|
|
772
776
|
- app/views/page/about.en.html.erb
|
773
777
|
- app/views/page/about.ja.html.erb
|
774
778
|
- app/views/page/add_on.html.erb
|
779
|
+
- app/views/page/add_on.html.slim
|
775
780
|
- app/views/page/advanced_search.html.erb
|
776
781
|
- app/views/page/configuration.html.erb
|
777
782
|
- app/views/page/export.html.erb
|
778
783
|
- app/views/page/import.html.erb
|
779
784
|
- app/views/page/index.html.erb
|
780
785
|
- app/views/page/index.mobile.erb
|
781
|
-
- app/views/page/
|
786
|
+
- app/views/page/msie_accelerator.builder
|
782
787
|
- app/views/page/opensearch.xml.builder
|
783
788
|
- app/views/page/statistics.html.erb
|
784
789
|
- app/views/page/system_information.html.erb
|
785
790
|
- app/views/profiles/_edit_credential.html.erb
|
791
|
+
- app/views/profiles/_edit_credential.html.slim
|
786
792
|
- app/views/profiles/_edit_profile.html.erb
|
793
|
+
- app/views/profiles/_edit_profile.html.slim
|
787
794
|
- app/views/profiles/_form.html.erb
|
788
795
|
- app/views/profiles/_show.html.erb
|
789
796
|
- app/views/profiles/edit.html.erb
|
@@ -809,7 +816,9 @@ files:
|
|
809
816
|
- app/views/user_import_files/_form.html.erb
|
810
817
|
- app/views/user_import_files/edit.html.erb
|
811
818
|
- app/views/user_import_files/index.html.erb
|
819
|
+
- app/views/user_import_files/index.html.slim
|
812
820
|
- app/views/user_import_files/new.html.erb
|
821
|
+
- app/views/user_import_files/new.html.slim
|
813
822
|
- app/views/user_import_files/show.html.erb
|
814
823
|
- app/views/user_import_results/_form.html.erb
|
815
824
|
- app/views/user_import_results/index.html.erb
|
@@ -851,6 +860,7 @@ files:
|
|
851
860
|
- db/migrate/20140811031145_add_expired_at_to_profile.rb
|
852
861
|
- db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
|
853
862
|
- db/migrate/20141003182825_add_date_of_birth_to_profile.rb
|
863
|
+
- db/migrate/20150421023923_create_identities.rb
|
854
864
|
- db/migrate/20150506105356_add_error_message_to_user_import_result.rb
|
855
865
|
- lib/enju_leaf.rb
|
856
866
|
- lib/enju_leaf/calculate_stat.rb
|
@@ -869,21 +879,13 @@ files:
|
|
869
879
|
- lib/generators/enju_leaf/quick_install/quick_install_generator.rb
|
870
880
|
- lib/generators/enju_leaf/setup/setup_generator.rb
|
871
881
|
- lib/generators/enju_leaf/setup/templates/Procfile
|
872
|
-
- lib/generators/enju_leaf/setup/templates/config/resque.
|
882
|
+
- lib/generators/enju_leaf/setup/templates/config/initializers/resque.rb
|
873
883
|
- lib/generators/enju_leaf/setup/templates/config/schedule.rb
|
874
884
|
- lib/generators/enju_leaf/setup/templates/db/fixtures/roles.yml
|
875
885
|
- lib/generators/enju_leaf/setup/templates/db/fixtures/user_groups.yml
|
876
886
|
- lib/generators/enju_leaf/setup/templates/db/seeds.rb
|
877
|
-
- lib/generators/enju_leaf/setup/templates/solr/conf/admin-extra.html
|
878
|
-
- lib/generators/enju_leaf/setup/templates/solr/conf/elevate.xml
|
879
|
-
- lib/generators/enju_leaf/setup/templates/solr/conf/mapping-ISOLatin1Accent.txt
|
880
|
-
- lib/generators/enju_leaf/setup/templates/solr/conf/protwords.txt
|
881
887
|
- lib/generators/enju_leaf/setup/templates/solr/conf/schema.xml
|
882
|
-
- lib/generators/enju_leaf/setup/templates/solr/conf/scripts.conf
|
883
888
|
- lib/generators/enju_leaf/setup/templates/solr/conf/solrconfig.xml
|
884
|
-
- lib/generators/enju_leaf/setup/templates/solr/conf/spellings.txt
|
885
|
-
- lib/generators/enju_leaf/setup/templates/solr/conf/stopwords.txt
|
886
|
-
- lib/generators/enju_leaf/setup/templates/solr/conf/synonyms.txt
|
887
889
|
- lib/plugins.rb
|
888
890
|
- lib/plugins/ext.rb
|
889
891
|
- lib/plugins/ext/sunspot.rb
|
@@ -1,31 +0,0 @@
|
|
1
|
-
<!--
|
2
|
-
Licensed to the Apache Software Foundation (ASF) under one or more
|
3
|
-
contributor license agreements. See the NOTICE file distributed with
|
4
|
-
this work for additional information regarding copyright ownership.
|
5
|
-
The ASF licenses this file to You under the Apache License, Version 2.0
|
6
|
-
(the "License"); you may not use this file except in compliance with
|
7
|
-
the License. You may obtain a copy of the License at
|
8
|
-
|
9
|
-
http://www.apache.org/licenses/LICENSE-2.0
|
10
|
-
|
11
|
-
Unless required by applicable law or agreed to in writing, software
|
12
|
-
distributed under the License is distributed on an "AS IS" BASIS,
|
13
|
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
14
|
-
See the License for the specific language governing permissions and
|
15
|
-
limitations under the License.
|
16
|
-
-->
|
17
|
-
|
18
|
-
<!-- The content of this page will be statically included into the top
|
19
|
-
of the admin page. Uncomment this as an example to see there the content
|
20
|
-
will show up.
|
21
|
-
|
22
|
-
<hr>
|
23
|
-
<i>This line will appear before the first table</i>
|
24
|
-
<tr>
|
25
|
-
<td colspan="2">
|
26
|
-
This row will be appended to the end of the first table
|
27
|
-
</td>
|
28
|
-
</tr>
|
29
|
-
<hr>
|
30
|
-
|
31
|
-
-->
|
@@ -1,36 +0,0 @@
|
|
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
|
-
<!-- If this file is found in the config directory, it will only be
|
20
|
-
loaded once at startup. If it is found in Solr's data
|
21
|
-
directory, it will be re-loaded every commit.
|
22
|
-
-->
|
23
|
-
|
24
|
-
<elevate>
|
25
|
-
<query text="foo bar">
|
26
|
-
<doc id="1" />
|
27
|
-
<doc id="2" />
|
28
|
-
<doc id="3" />
|
29
|
-
</query>
|
30
|
-
|
31
|
-
<query text="ipod">
|
32
|
-
<doc id="MA147LL/A" /> <!-- put the actual ipod at the top -->
|
33
|
-
<doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
|
34
|
-
</query>
|
35
|
-
|
36
|
-
</elevate>
|
@@ -1,246 +0,0 @@
|
|
1
|
-
# The ASF licenses this file to You under the Apache License, Version 2.0
|
2
|
-
# (the "License"); you may not use this file except in compliance with
|
3
|
-
# the License. You may obtain a copy of the License at
|
4
|
-
#
|
5
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
6
|
-
#
|
7
|
-
# Unless required by applicable law or agreed to in writing, software
|
8
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
9
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
10
|
-
# See the License for the specific language governing permissions and
|
11
|
-
# limitations under the License.
|
12
|
-
|
13
|
-
# Syntax:
|
14
|
-
# "source" => "target"
|
15
|
-
# "source".length() > 0 (source cannot be empty.)
|
16
|
-
# "target".length() >= 0 (target can be empty.)
|
17
|
-
|
18
|
-
# example:
|
19
|
-
# "À" => "A"
|
20
|
-
# "\u00C0" => "A"
|
21
|
-
# "\u00C0" => "\u0041"
|
22
|
-
# "ß" => "ss"
|
23
|
-
# "\t" => " "
|
24
|
-
# "\n" => ""
|
25
|
-
|
26
|
-
# À => A
|
27
|
-
"\u00C0" => "A"
|
28
|
-
|
29
|
-
# Á => A
|
30
|
-
"\u00C1" => "A"
|
31
|
-
|
32
|
-
# Â => A
|
33
|
-
"\u00C2" => "A"
|
34
|
-
|
35
|
-
# Ã => A
|
36
|
-
"\u00C3" => "A"
|
37
|
-
|
38
|
-
# Ä => A
|
39
|
-
"\u00C4" => "A"
|
40
|
-
|
41
|
-
# Å => A
|
42
|
-
"\u00C5" => "A"
|
43
|
-
|
44
|
-
# Æ => AE
|
45
|
-
"\u00C6" => "AE"
|
46
|
-
|
47
|
-
# Ç => C
|
48
|
-
"\u00C7" => "C"
|
49
|
-
|
50
|
-
# È => E
|
51
|
-
"\u00C8" => "E"
|
52
|
-
|
53
|
-
# É => E
|
54
|
-
"\u00C9" => "E"
|
55
|
-
|
56
|
-
# Ê => E
|
57
|
-
"\u00CA" => "E"
|
58
|
-
|
59
|
-
# Ë => E
|
60
|
-
"\u00CB" => "E"
|
61
|
-
|
62
|
-
# Ì => I
|
63
|
-
"\u00CC" => "I"
|
64
|
-
|
65
|
-
# Í => I
|
66
|
-
"\u00CD" => "I"
|
67
|
-
|
68
|
-
# Î => I
|
69
|
-
"\u00CE" => "I"
|
70
|
-
|
71
|
-
# Ï => I
|
72
|
-
"\u00CF" => "I"
|
73
|
-
|
74
|
-
# IJ => IJ
|
75
|
-
"\u0132" => "IJ"
|
76
|
-
|
77
|
-
# Ð => D
|
78
|
-
"\u00D0" => "D"
|
79
|
-
|
80
|
-
# Ñ => N
|
81
|
-
"\u00D1" => "N"
|
82
|
-
|
83
|
-
# Ò => O
|
84
|
-
"\u00D2" => "O"
|
85
|
-
|
86
|
-
# Ó => O
|
87
|
-
"\u00D3" => "O"
|
88
|
-
|
89
|
-
# Ô => O
|
90
|
-
"\u00D4" => "O"
|
91
|
-
|
92
|
-
# Õ => O
|
93
|
-
"\u00D5" => "O"
|
94
|
-
|
95
|
-
# Ö => O
|
96
|
-
"\u00D6" => "O"
|
97
|
-
|
98
|
-
# Ø => O
|
99
|
-
"\u00D8" => "O"
|
100
|
-
|
101
|
-
# Œ => OE
|
102
|
-
"\u0152" => "OE"
|
103
|
-
|
104
|
-
# Þ
|
105
|
-
"\u00DE" => "TH"
|
106
|
-
|
107
|
-
# Ù => U
|
108
|
-
"\u00D9" => "U"
|
109
|
-
|
110
|
-
# Ú => U
|
111
|
-
"\u00DA" => "U"
|
112
|
-
|
113
|
-
# Û => U
|
114
|
-
"\u00DB" => "U"
|
115
|
-
|
116
|
-
# Ü => U
|
117
|
-
"\u00DC" => "U"
|
118
|
-
|
119
|
-
# Ý => Y
|
120
|
-
"\u00DD" => "Y"
|
121
|
-
|
122
|
-
# Ÿ => Y
|
123
|
-
"\u0178" => "Y"
|
124
|
-
|
125
|
-
# à => a
|
126
|
-
"\u00E0" => "a"
|
127
|
-
|
128
|
-
# á => a
|
129
|
-
"\u00E1" => "a"
|
130
|
-
|
131
|
-
# â => a
|
132
|
-
"\u00E2" => "a"
|
133
|
-
|
134
|
-
# ã => a
|
135
|
-
"\u00E3" => "a"
|
136
|
-
|
137
|
-
# ä => a
|
138
|
-
"\u00E4" => "a"
|
139
|
-
|
140
|
-
# å => a
|
141
|
-
"\u00E5" => "a"
|
142
|
-
|
143
|
-
# æ => ae
|
144
|
-
"\u00E6" => "ae"
|
145
|
-
|
146
|
-
# ç => c
|
147
|
-
"\u00E7" => "c"
|
148
|
-
|
149
|
-
# è => e
|
150
|
-
"\u00E8" => "e"
|
151
|
-
|
152
|
-
# é => e
|
153
|
-
"\u00E9" => "e"
|
154
|
-
|
155
|
-
# ê => e
|
156
|
-
"\u00EA" => "e"
|
157
|
-
|
158
|
-
# ë => e
|
159
|
-
"\u00EB" => "e"
|
160
|
-
|
161
|
-
# ì => i
|
162
|
-
"\u00EC" => "i"
|
163
|
-
|
164
|
-
# í => i
|
165
|
-
"\u00ED" => "i"
|
166
|
-
|
167
|
-
# î => i
|
168
|
-
"\u00EE" => "i"
|
169
|
-
|
170
|
-
# ï => i
|
171
|
-
"\u00EF" => "i"
|
172
|
-
|
173
|
-
# ij => ij
|
174
|
-
"\u0133" => "ij"
|
175
|
-
|
176
|
-
# ð => d
|
177
|
-
"\u00F0" => "d"
|
178
|
-
|
179
|
-
# ñ => n
|
180
|
-
"\u00F1" => "n"
|
181
|
-
|
182
|
-
# ò => o
|
183
|
-
"\u00F2" => "o"
|
184
|
-
|
185
|
-
# ó => o
|
186
|
-
"\u00F3" => "o"
|
187
|
-
|
188
|
-
# ô => o
|
189
|
-
"\u00F4" => "o"
|
190
|
-
|
191
|
-
# õ => o
|
192
|
-
"\u00F5" => "o"
|
193
|
-
|
194
|
-
# ö => o
|
195
|
-
"\u00F6" => "o"
|
196
|
-
|
197
|
-
# ø => o
|
198
|
-
"\u00F8" => "o"
|
199
|
-
|
200
|
-
# œ => oe
|
201
|
-
"\u0153" => "oe"
|
202
|
-
|
203
|
-
# ß => ss
|
204
|
-
"\u00DF" => "ss"
|
205
|
-
|
206
|
-
# þ => th
|
207
|
-
"\u00FE" => "th"
|
208
|
-
|
209
|
-
# ù => u
|
210
|
-
"\u00F9" => "u"
|
211
|
-
|
212
|
-
# ú => u
|
213
|
-
"\u00FA" => "u"
|
214
|
-
|
215
|
-
# û => u
|
216
|
-
"\u00FB" => "u"
|
217
|
-
|
218
|
-
# ü => u
|
219
|
-
"\u00FC" => "u"
|
220
|
-
|
221
|
-
# ý => y
|
222
|
-
"\u00FD" => "y"
|
223
|
-
|
224
|
-
# ÿ => y
|
225
|
-
"\u00FF" => "y"
|
226
|
-
|
227
|
-
# ff => ff
|
228
|
-
"\uFB00" => "ff"
|
229
|
-
|
230
|
-
# fi => fi
|
231
|
-
"\uFB01" => "fi"
|
232
|
-
|
233
|
-
# fl => fl
|
234
|
-
"\uFB02" => "fl"
|
235
|
-
|
236
|
-
# ffi => ffi
|
237
|
-
"\uFB03" => "ffi"
|
238
|
-
|
239
|
-
# ffl => ffl
|
240
|
-
"\uFB04" => "ffl"
|
241
|
-
|
242
|
-
# ſt => ft
|
243
|
-
"\uFB05" => "ft"
|
244
|
-
|
245
|
-
# st => st
|
246
|
-
"\uFB06" => "st"
|
@@ -1,21 +0,0 @@
|
|
1
|
-
# The ASF licenses this file to You under the Apache License, Version 2.0
|
2
|
-
# (the "License"); you may not use this file except in compliance with
|
3
|
-
# the License. You may obtain a copy of the License at
|
4
|
-
#
|
5
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
6
|
-
#
|
7
|
-
# Unless required by applicable law or agreed to in writing, software
|
8
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
9
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
10
|
-
# See the License for the specific language governing permissions and
|
11
|
-
# limitations under the License.
|
12
|
-
|
13
|
-
#-----------------------------------------------------------------------
|
14
|
-
# Use a protected word file to protect against the stemmer reducing two
|
15
|
-
# unrelated words to the same base word.
|
16
|
-
|
17
|
-
# Some non-words that normally won't be encountered,
|
18
|
-
# just to test that they won't be stemmed.
|
19
|
-
dontstems
|
20
|
-
zwhacky
|
21
|
-
|