enju_circulation 0.1.0.pre39 → 0.1.0.pre40

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/manifestation_checkout_stats_controller.rb +15 -4
  3. data/app/models/checkin.rb +1 -5
  4. data/app/models/checkout.rb +11 -9
  5. data/app/views/manifestation_checkout_stats/_group_by_manifestation.html.erb +19 -0
  6. data/app/views/manifestation_checkout_stats/show.html.erb +50 -25
  7. data/app/views/manifestation_checkout_stats/show.js.erb +1 -0
  8. data/app/views/manifestation_checkout_stats/show.txt.erb +2 -2
  9. data/config/locales/translation_en.yml +6 -4
  10. data/config/locales/translation_ja.yml +3 -1
  11. data/lib/enju_circulation/version.rb +1 -1
  12. metadata +14 -92
  13. data/spec/dummy/db/development.sqlite3 +0 -0
  14. data/spec/dummy/db/test.sqlite3 +0 -0
  15. data/spec/dummy/solr/conf/admin-extra.html +0 -31
  16. data/spec/dummy/solr/conf/elevate.xml +0 -36
  17. data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +0 -246
  18. data/spec/dummy/solr/conf/protwords.txt +0 -21
  19. data/spec/dummy/solr/conf/schema.xml +0 -255
  20. data/spec/dummy/solr/conf/scripts.conf +0 -24
  21. data/spec/dummy/solr/conf/solrconfig.xml +0 -667
  22. data/spec/dummy/solr/conf/spellings.txt +0 -2
  23. data/spec/dummy/solr/conf/stopwords.txt +0 -58
  24. data/spec/dummy/solr/conf/synonyms.txt +0 -31
  25. data/spec/dummy/solr/default/data/index/_8df.fdt +0 -0
  26. data/spec/dummy/solr/default/data/index/_8df.fdx +0 -0
  27. data/spec/dummy/solr/default/data/index/_8df.fnm +0 -0
  28. data/spec/dummy/solr/default/data/index/_8df.nvd +0 -0
  29. data/spec/dummy/solr/default/data/index/_8df.nvm +0 -0
  30. data/spec/dummy/solr/default/data/index/_8df.si +0 -0
  31. data/spec/dummy/solr/default/data/index/_8df_Lucene41_0.doc +0 -0
  32. data/spec/dummy/solr/default/data/index/_8df_Lucene41_0.pos +0 -0
  33. data/spec/dummy/solr/default/data/index/_8df_Lucene41_0.tim +0 -0
  34. data/spec/dummy/solr/default/data/index/_8df_Lucene41_0.tip +0 -0
  35. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  36. data/spec/dummy/solr/default/data/index/segments_dfb +0 -0
  37. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017389 +0 -0
  38. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017390 +0 -0
  39. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017391 +0 -0
  40. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017392 +0 -0
  41. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017393 +0 -0
  42. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017394 +0 -0
  43. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017395 +0 -0
  44. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017396 +0 -0
  45. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017397 +0 -0
  46. data/spec/dummy/solr/development/data/index/segments.gen +0 -0
  47. data/spec/dummy/solr/development/data/index/segments_1 +0 -0
  48. data/spec/dummy/solr/solr.xml +0 -8
  49. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  50. data/spec/dummy/solr/test/data/index/segments_1 +0 -0
  51. data/spec/dummy/tmp/cache/stdout +0 -43
  52. data/spec/dummy/tmp/pids/redis-test.pid +0 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: eaf9300fdaa9bc2f1f6f3fee23050f624b893b53
4
- data.tar.gz: 069d5d5de77d66c9f7eda705096ff3eb8d46a019
3
+ metadata.gz: e28fea41163e953a23b7795ba5e2544e0b8b9499
4
+ data.tar.gz: 67f915f13223995b0cace199886abd1ba72753c2
5
5
  SHA512:
6
- metadata.gz: 090251723f0115166b1a8b71667f50700d6181196b6fb7afc0b490a218825bb69e2b3af7f78894c4e58554a8d159599eaf7d2f8482378c966c2866988f82eb35
7
- data.tar.gz: b389ad232f0ce25a21c1977a97d3b3f3d526ea87f4bba6607f94e19053a75d4b75324d7c439d07ddc91233a78e63af23fba443b69de3f75beda6f6a1f3726df7
6
+ metadata.gz: 65389ba2246803d37c50b8bbdfae76a4bedfe1f4026af104f759e7184dd769fe92761aaba09b596b0c7e3091108c299b46c253cb7c6f584549e6db2900786589
7
+ data.tar.gz: 5c741d5e09449953ea957f01be5cd2e548d63b18ba3bebb372877e772b2bb464cfd6538d4ba7a33cece9275fb606d9f00db56a73e07f8804966dbdd9b799a446
@@ -21,15 +21,26 @@ class ManifestationCheckoutStatsController < ApplicationController
21
21
  else
22
22
  per_page = CheckoutStatHasManifestation.default_per_page
23
23
  end
24
- @stats = @manifestation_checkout_stat.checkout_stat_has_manifestations.order('checkouts_count DESC, manifestation_id').page(params[:page]).per(per_page)
25
- @breakdown = CheckoutStatHasManifestation.joins(:manifestation).where(
26
- manifestation_checkout_stat_id: @manifestation_checkout_stat.id
27
- ).group(:carrier_type_id).sum(:checkouts_count)
24
+ @stats = Checkout.where(
25
+ Checkout.arel_table[:created_at].gteq @manifestation_checkout_stat.start_date
26
+ ).where(
27
+ Checkout.arel_table[:created_at].lt @manifestation_checkout_stat.end_date
28
+ ).joins(item: [:manifestation]).group(:manifestation_id).merge(
29
+ Manifestation.where(carrier_type_id: CarrierType.pluck(:id))
30
+ ).order('count_id DESC').page(params[:page])
31
+ @breakdown = Checkout.where(
32
+ Checkout.arel_table[:created_at].gteq @manifestation_checkout_stat.start_date
33
+ ).where(
34
+ Checkout.arel_table[:created_at].lt @manifestation_checkout_stat.end_date
35
+ ).joins(item: [:shelf, :manifestation]).group(:carrier_type_id).merge(
36
+ Manifestation.where(carrier_type_id: CarrierType.pluck(:id))
37
+ ).order('manifestations.carrier_type_id').count(:id)
28
38
 
29
39
  respond_to do |format|
30
40
  format.html # show.html.erb
31
41
  format.json { render json: @manifestation_checkout_stat }
32
42
  format.txt
43
+ format.js
33
44
  end
34
45
  end
35
46
 
@@ -35,11 +35,7 @@ class Checkin < ActiveRecord::Base
35
35
  message = ''
36
36
  Checkin.transaction do
37
37
  item.checkin!
38
- Checkout.not_returned.where(item_id: item_id).select([
39
- :id, :item_id, :user_id, :librarian_id,
40
- :basket_id, :due_date, :lock_version, :created_at,
41
- :checkout_renewal_count
42
- ]).each do |checkout|
38
+ Checkout.not_returned.where(item_id: item_id).each do |checkout|
43
39
  # TODO: ILL時の処理
44
40
  checkout.checkin = self
45
41
  checkout.operator = current_user
@@ -1,6 +1,5 @@
1
1
  class Checkout < ActiveRecord::Base
2
2
  attr_accessible :due_date
3
- default_scope { order('checkouts.id DESC') }
4
3
  scope :not_returned, -> { where(checkin_id: nil) }
5
4
  scope :returned, -> { where('checkin_id IS NOT NULL') }
6
5
  scope :overdue, lambda {|date| where('checkin_id IS NULL AND due_date < ?', date)}
@@ -9,7 +8,7 @@ class Checkout < ActiveRecord::Base
9
8
  scope :on, lambda {|date| where('created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day)}
10
9
 
11
10
  belongs_to :user
12
- delegate :username, :user_number, :to => :user, :prefix => true
11
+ delegate :username, :user_number, to: :user, prefix: true
13
12
  belongs_to :item, touch: true
14
13
  belongs_to :checkin
15
14
  belongs_to :librarian, class_name: 'User'
@@ -107,7 +106,7 @@ class Checkout < ActiveRecord::Base
107
106
  return nil unless user
108
107
  if item
109
108
  if checkout_renewal_count <= item.checkout_status(user).checkout_renewal_limit
110
- new_due_date = Time.zone.now.advance(:days => item.checkout_status(user).checkout_period).beginning_of_day
109
+ new_due_date = Time.zone.now.advance(days: item.checkout_status(user).checkout_period).beginning_of_day
111
110
  else
112
111
  new_due_date = due_date
113
112
  end
@@ -115,7 +114,14 @@ class Checkout < ActiveRecord::Base
115
114
  end
116
115
 
117
116
  def self.manifestations_count(start_date, end_date, manifestation)
118
- completed(start_date, end_date).where(item_id: manifestation.items.pluck('items.id')).count
117
+ self.where(
118
+ self.arel_table[:created_at].gteq start_date
119
+ ).where(
120
+ self.arel_table[:created_at].lt end_date
121
+ )
122
+ .where(
123
+ item_id: manifestation.items.pluck('items.id')
124
+ ).count
119
125
  end
120
126
 
121
127
  def self.send_due_date_notification
@@ -146,11 +152,7 @@ class Checkout < ActiveRecord::Base
146
152
  end
147
153
 
148
154
  def self.remove_all_history(user)
149
- user.checkouts.returned.update_all(:user_id => nil)
150
- end
151
-
152
- def self.calculate_item
153
- joins(item: :shelf).group(:library_id).count(:id)
155
+ user.checkouts.returned.update_all(user_id: nil)
154
156
  end
155
157
  end
156
158
 
@@ -0,0 +1,19 @@
1
+ <%= paginate(stats, remote: true) -%>
2
+
3
+ <table class="table table-striped index">
4
+ <tr>
5
+ <th><%= t('activerecord.models.manifestation') -%></th>
6
+ <th><%= t('activerecord.attributes.checkout_stat_has_manifestation.checkouts_count') -%></th>
7
+ </tr>
8
+ <%- stats.count(:id).each do |stat| -%>
9
+ <tr class="line<%= cycle("0", "1") -%>">
10
+ <td>
11
+ <% manifestation = Manifestation.where(id: stat[0]).first %>
12
+ <%= render 'manifestations/show_index', manifestation: manifestation if manifestation %>
13
+ </td>
14
+ <td><%= stat[1] %></td>
15
+ </tr>
16
+ <%- end -%>
17
+ </table>
18
+
19
+ <%= paginate(stats, remote: true) -%>
@@ -18,36 +18,61 @@
18
18
  <%= localized_state(@manifestation_checkout_stat.current_state) -%>
19
19
  </p>
20
20
 
21
- <p>
22
- <strong><%= t('statistic.breakdown') -%>:</strong>
23
- <ul>
24
- <% @breakdown.each do |k, v| %>
25
- <li><%= CarrierType.find(k).display_name.localize %>: <%= v %></li>
26
- <% end %>
27
- </ul>
28
- </p>
29
-
30
21
  <p>
31
22
  <strong><%= t('activerecord.attributes.manifestation_checkout_stat.note') -%>:</strong>
32
23
  <%= @manifestation_checkout_stat.note -%>
33
24
  </p>
34
25
 
35
- <table class="table table-striped index">
36
- <tr>
37
- <th><%= t('activerecord.models.manifestation') -%></th>
38
- <th><%= t('activerecord.attributes.checkout_stat_has_manifestation.checkouts_count') -%></th>
39
- </tr>
40
- <%- @stats.each do |stat| -%>
41
- <tr class="line<%= cycle("0", "1") -%>">
42
- <td>
43
- <%= render 'manifestations/show_index', manifestation: stat.manifestation if stat.manifestation -%>
44
- </td>
45
- <td><%= stat.checkouts_count -%></td>
46
- </tr>
47
- <%- end -%>
48
- </table>
49
-
50
- <%= paginate(@stats) -%>
26
+ <div id="tabs">
27
+ <ul>
28
+ <li title="active" class="selected"><a href="#tab1"><em><%= t('statistic.by_carrier_type') -%></em></a></li>
29
+ <li><a href="#tab2"><em><%= t('statistic.by_manifestation') -%></em></a></li>
30
+ </ul>
31
+ <div id="tab1">
32
+ <table class="table table-striped index">
33
+ <tr>
34
+ <th></th>
35
+ <% CarrierType.order(:position).each do |carrier_type| %>
36
+ <th><%= carrier_type.display_name.localize %></th>
37
+ <% end %>
38
+ </tr>
39
+ <% Shelf.order(:library_id, :position).each do |shelf| %>
40
+ <tr>
41
+ <td><strong><%= shelf.display_name.localize %></strong></td>
42
+ <% results = Checkout.where(
43
+ Checkout.arel_table[:created_at].gteq @manifestation_checkout_stat.start_date
44
+ ).where(
45
+ Checkout.arel_table[:created_at].lt @manifestation_checkout_stat.end_date
46
+ ).joins(item: [:shelf, :manifestation]).group(:carrier_type_id).merge(
47
+ Manifestation.where(carrier_type_id: CarrierType.pluck(:id))
48
+ ).merge(Shelf.where(id: shelf.id)).order('manifestations.carrier_type_id').count(:id) %>
49
+ <% CarrierType.order(:position).each do |carrier_type| %>
50
+ <td>
51
+ <% results.each do |carrier_type_id, count| %>
52
+ <%= count if carrier_type_id == carrier_type.id %>
53
+ <% end %>
54
+ </td>
55
+ <% end %>
56
+ </tr>
57
+ <% end %>
58
+ <tr>
59
+ <td><strong><%= t('page.total') %></strong></td>
60
+ <% CarrierType.order(:position).each do |carrier_type| %>
61
+ <td>
62
+ <% @breakdown.each do |carrier_type_id, count| %>
63
+ <%= count if carrier_type_id == carrier_type.id %>
64
+ <% end %>
65
+ </td>
66
+ <% end %>
67
+ </tr>
68
+ </table>
69
+ </div>
70
+ <div id="tab2">
71
+ <div id="group_by_manifestation">
72
+ <%= render 'group_by_manifestation', stats: @stats %>
73
+ </div>
74
+ </div>
75
+ </div>
51
76
 
52
77
  </div>
53
78
  </div>
@@ -0,0 +1 @@
1
+ $("#group_by_manifestation").html("<%= escape_javascript(render("group_by_manifestation", stats: @stats)) %>");
@@ -1,5 +1,5 @@
1
1
  <%= @manifestation_checkout_stat.start_date -%><%= "\t" %><%= @manifestation_checkout_stat.end_date %>
2
2
  manifestation_id<%= "\t" %>title<%= "\t" %>carrier_type<%= "\t" %>count
3
- <%- @stats.each do |stat| -%>
4
- <%= stat.manifestation.id if stat.manifestation %><%= "\t" %><%= stat.manifestation.original_title if stat.manifestation -%><%= "\t" %><%= stat.manifestation.carrier_type.name %><%= "\t" %><%= stat.checkouts_count -%><%= "\n" %>
3
+ <%- @stats.count(:id).map{|manifestation_id, count| [Manifestation.where(id: manifestation_id).first, count] }.each do |stat| -%>
4
+ <%= stat[0].id if stat[0] %><%= "\t" %><%= stat[0].original_title if stat[0] -%><%= "\t" %><%= stat[0].carrier_type.name if stat[0] %><%= "\t" %><%= stat[1] %>
5
5
  <%- end -%>
@@ -102,13 +102,13 @@ en:
102
102
  note: Note
103
103
  state: State
104
104
  checkout_stat_has_user:
105
- checkouts_count: Checkout count
105
+ checkouts_count: count by user
106
106
  checkout_stat_has_manifestation:
107
- checkouts_count: Checkout count
107
+ checkouts_count: count by manifestation
108
108
  reserve_stat_has_user:
109
- reserves_count: Reserve count
109
+ reserves_count: count by user
110
110
  reserve_stat_has_manifestation:
111
- reserves_count: Reserve count
111
+ reserves_count: count by manifestation
112
112
  lending_policy:
113
113
  loan_period: Loan period
114
114
  fixed_due_date: Fixed due date
@@ -195,3 +195,5 @@ en:
195
195
  statistic:
196
196
  successfully_created: "%{model} task was created successfully. When the task is completed, its status on the list will be updated to 'completed' and you can check the results by following the 'show' link."
197
197
  breakdown: Brakedown
198
+ by_carrier_type: By carrier type
199
+ by_manifestation: By manifestation
@@ -66,7 +66,7 @@ ja:
66
66
  checkout_limit: 貸出数の上限
67
67
  checkout_period: 貸出期間
68
68
  checkout_renewal_limit: 貸出更新回数の上限
69
- reservation_limit: 予約冊数の上限
69
+ reservation_limit: 予約数の上限
70
70
  reservation_expired_period: 予約の期限切れまでの期間
71
71
  set_due_date_before_closing_day: 返却日を閉館日の前日にする
72
72
  fixed_due_date: 固定貸出期限
@@ -193,3 +193,5 @@ ja:
193
193
  statistic:
194
194
  successfully_created: "%{model}のタスクは正常に作成されました。タスクが完了すると「%{model}の一覧」の状態が「完了」となり、「表示」リンクをたどることで結果を確認できるようになります。"
195
195
  breakdown: 内訳
196
+ by_carrier_type: 資料の形態別
197
+ by_manifestation: 書誌別
@@ -1,3 +1,3 @@
1
1
  module EnjuCirculation
2
- VERSION = "0.1.0.pre39"
2
+ VERSION = "0.1.0.pre40"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_circulation
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre39
4
+ version: 0.1.0.pre40
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-03 00:00:00.000000000 Z
11
+ date: 2014-10-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_biblio
@@ -16,70 +16,70 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.1.0.pre59
19
+ version: 0.1.0.pre61
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 0.1.0.pre59
26
+ version: 0.1.0.pre61
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: enju_library
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 0.1.0.pre36
33
+ version: 0.1.0.pre37
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 0.1.0.pre36
40
+ version: 0.1.0.pre37
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: enju_message
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.1.14.pre18
47
+ version: 0.1.14.pre19
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.1.14.pre18
54
+ version: 0.1.14.pre19
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: enju_event
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.1.17.pre22
61
+ version: 0.1.17.pre23
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.1.17.pre22
68
+ version: 0.1.17.pre23
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: enju_leaf
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.1.0.rc14
75
+ version: 1.1.0.rc15
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.1.0.rc14
82
+ version: 1.1.0.rc15
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: sqlite3
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -319,10 +319,12 @@ files:
319
319
  - app/views/lending_policies/new.html.erb
320
320
  - app/views/lending_policies/show.html.erb
321
321
  - app/views/manifestation_checkout_stats/_form.html.erb
322
+ - app/views/manifestation_checkout_stats/_group_by_manifestation.html.erb
322
323
  - app/views/manifestation_checkout_stats/edit.html.erb
323
324
  - app/views/manifestation_checkout_stats/index.html.erb
324
325
  - app/views/manifestation_checkout_stats/new.html.erb
325
326
  - app/views/manifestation_checkout_stats/show.html.erb
327
+ - app/views/manifestation_checkout_stats/show.js.erb
326
328
  - app/views/manifestation_checkout_stats/show.txt.erb
327
329
  - app/views/manifestation_reserve_stats/_form.html.erb
328
330
  - app/views/manifestation_reserve_stats/edit.html.erb
@@ -487,7 +489,6 @@ files:
487
489
  - spec/dummy/config/locales/enju_ja.yml
488
490
  - spec/dummy/config/locales/ja.yml
489
491
  - spec/dummy/config/routes.rb
490
- - spec/dummy/db/development.sqlite3
491
492
  - spec/dummy/db/migrate/001_create_agents.rb
492
493
  - spec/dummy/db/migrate/005_create_manifestations.rb
493
494
  - spec/dummy/db/migrate/006_create_items.rb
@@ -614,51 +615,12 @@ files:
614
615
  - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
615
616
  - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
616
617
  - spec/dummy/db/schema.rb
617
- - spec/dummy/db/test.sqlite3
618
618
  - spec/dummy/public/404.html
619
619
  - spec/dummy/public/422.html
620
620
  - spec/dummy/public/500.html
621
621
  - spec/dummy/public/favicon.ico
622
622
  - spec/dummy/script/delayed_job
623
623
  - spec/dummy/script/rails
624
- - spec/dummy/solr/conf/admin-extra.html
625
- - spec/dummy/solr/conf/elevate.xml
626
- - spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
627
- - spec/dummy/solr/conf/protwords.txt
628
- - spec/dummy/solr/conf/schema.xml
629
- - spec/dummy/solr/conf/scripts.conf
630
- - spec/dummy/solr/conf/solrconfig.xml
631
- - spec/dummy/solr/conf/spellings.txt
632
- - spec/dummy/solr/conf/stopwords.txt
633
- - spec/dummy/solr/conf/synonyms.txt
634
- - spec/dummy/solr/default/data/index/_8df.fdt
635
- - spec/dummy/solr/default/data/index/_8df.fdx
636
- - spec/dummy/solr/default/data/index/_8df.fnm
637
- - spec/dummy/solr/default/data/index/_8df.nvd
638
- - spec/dummy/solr/default/data/index/_8df.nvm
639
- - spec/dummy/solr/default/data/index/_8df.si
640
- - spec/dummy/solr/default/data/index/_8df_Lucene41_0.doc
641
- - spec/dummy/solr/default/data/index/_8df_Lucene41_0.pos
642
- - spec/dummy/solr/default/data/index/_8df_Lucene41_0.tim
643
- - spec/dummy/solr/default/data/index/_8df_Lucene41_0.tip
644
- - spec/dummy/solr/default/data/index/segments.gen
645
- - spec/dummy/solr/default/data/index/segments_dfb
646
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017389
647
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017390
648
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017391
649
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017392
650
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017393
651
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017394
652
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017395
653
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017396
654
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017397
655
- - spec/dummy/solr/development/data/index/segments.gen
656
- - spec/dummy/solr/development/data/index/segments_1
657
- - spec/dummy/solr/solr.xml
658
- - spec/dummy/solr/test/data/index/segments.gen
659
- - spec/dummy/solr/test/data/index/segments_1
660
- - spec/dummy/tmp/cache/stdout
661
- - spec/dummy/tmp/pids/redis-test.pid
662
624
  - spec/factories/basket.rb
663
625
  - spec/factories/carrier_type.rb
664
626
  - spec/factories/carrier_type_has_checkout_type.rb
@@ -831,7 +793,6 @@ test_files:
831
793
  - spec/dummy/config/locales/ja.yml
832
794
  - spec/dummy/config/routes.rb
833
795
  - spec/dummy/config.ru
834
- - spec/dummy/db/development.sqlite3
835
796
  - spec/dummy/db/migrate/001_create_agents.rb
836
797
  - spec/dummy/db/migrate/005_create_manifestations.rb
837
798
  - spec/dummy/db/migrate/006_create_items.rb
@@ -958,7 +919,6 @@ test_files:
958
919
  - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
959
920
  - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
960
921
  - spec/dummy/db/schema.rb
961
- - spec/dummy/db/test.sqlite3
962
922
  - spec/dummy/public/404.html
963
923
  - spec/dummy/public/422.html
964
924
  - spec/dummy/public/500.html
@@ -967,44 +927,6 @@ test_files:
967
927
  - spec/dummy/README.rdoc
968
928
  - spec/dummy/script/delayed_job
969
929
  - spec/dummy/script/rails
970
- - spec/dummy/solr/conf/admin-extra.html
971
- - spec/dummy/solr/conf/elevate.xml
972
- - spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
973
- - spec/dummy/solr/conf/protwords.txt
974
- - spec/dummy/solr/conf/schema.xml
975
- - spec/dummy/solr/conf/scripts.conf
976
- - spec/dummy/solr/conf/solrconfig.xml
977
- - spec/dummy/solr/conf/spellings.txt
978
- - spec/dummy/solr/conf/stopwords.txt
979
- - spec/dummy/solr/conf/synonyms.txt
980
- - spec/dummy/solr/default/data/index/_8df.fdt
981
- - spec/dummy/solr/default/data/index/_8df.fdx
982
- - spec/dummy/solr/default/data/index/_8df.fnm
983
- - spec/dummy/solr/default/data/index/_8df.nvd
984
- - spec/dummy/solr/default/data/index/_8df.nvm
985
- - spec/dummy/solr/default/data/index/_8df.si
986
- - spec/dummy/solr/default/data/index/_8df_Lucene41_0.doc
987
- - spec/dummy/solr/default/data/index/_8df_Lucene41_0.pos
988
- - spec/dummy/solr/default/data/index/_8df_Lucene41_0.tim
989
- - spec/dummy/solr/default/data/index/_8df_Lucene41_0.tip
990
- - spec/dummy/solr/default/data/index/segments.gen
991
- - spec/dummy/solr/default/data/index/segments_dfb
992
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017389
993
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017390
994
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017391
995
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017392
996
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017393
997
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017394
998
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017395
999
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017396
1000
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000017397
1001
- - spec/dummy/solr/development/data/index/segments.gen
1002
- - spec/dummy/solr/development/data/index/segments_1
1003
- - spec/dummy/solr/solr.xml
1004
- - spec/dummy/solr/test/data/index/segments.gen
1005
- - spec/dummy/solr/test/data/index/segments_1
1006
- - spec/dummy/tmp/cache/stdout
1007
- - spec/dummy/tmp/pids/redis-test.pid
1008
930
  - spec/factories/basket.rb
1009
931
  - spec/factories/carrier_type.rb
1010
932
  - spec/factories/carrier_type_has_checkout_type.rb
Binary file
Binary file
@@ -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>