enju_biblio 0.1.0.pre11 → 0.1.0.pre12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (40) hide show
  1. data/app/models/manifestation.rb +4 -16
  2. data/app/models/resource_import_file.rb +9 -23
  3. data/app/views/accepts/_list.html.erb +1 -1
  4. data/app/views/accepts/index.html.erb +1 -1
  5. data/app/views/items/index.html.erb +1 -1
  6. data/app/views/items/index.mobile.erb +1 -1
  7. data/app/views/manifestations/_index_form.html.erb +1 -1
  8. data/app/views/manifestations/_index_form_contributor.html.erb +1 -1
  9. data/app/views/manifestations/_index_form_creator.html.erb +1 -1
  10. data/app/views/manifestations/_index_form_item.html.erb +1 -1
  11. data/app/views/manifestations/_index_form_manifestation.html.erb +1 -1
  12. data/app/views/manifestations/_index_form_publisher.html.erb +1 -1
  13. data/app/views/manifestations/_index_form_series_statement.html.erb +1 -1
  14. data/app/views/manifestations/_list.html.erb +1 -1
  15. data/app/views/manifestations/_paginate_id_link.html.erb +1 -1
  16. data/app/views/manifestations/_show_holding.html.erb +1 -1
  17. data/app/views/manifestations/index.mobile.erb +1 -1
  18. data/app/views/patrons/_index.html.erb +1 -1
  19. data/app/views/patrons/_index_expression.html.erb +1 -1
  20. data/app/views/patrons/_index_manifestation.html.erb +1 -1
  21. data/app/views/patrons/_index_patron.html.erb +1 -1
  22. data/app/views/patrons/_index_patron_merge_list.html.erb +1 -1
  23. data/app/views/patrons/_index_work.html.erb +1 -1
  24. data/app/views/patrons/index.mobile.erb +1 -1
  25. data/app/views/series_statements/_index.html.erb +1 -1
  26. data/app/views/series_statements/_index_manifestation.html.erb +1 -1
  27. data/app/views/series_statements/_index_parent.html.erb +1 -1
  28. data/app/views/series_statements/_index_series_statement_merge_list.html.erb +1 -1
  29. data/app/views/series_statements/_refine_search_form.html.erb +1 -1
  30. data/lib/enju_biblio/version.rb +1 -1
  31. data/spec/dummy/db/development.sqlite3 +0 -0
  32. data/spec/dummy/db/schema.rb +0 -1
  33. data/spec/dummy/db/test.sqlite3 +0 -0
  34. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  35. data/spec/dummy/solr/data/test/index/segments_bf9 +0 -0
  36. data/spec/fixtures/manifestations.yml +0 -1
  37. data/spec/models/manifestation_spec.rb +0 -1
  38. metadata +12 -13
  39. data/db/migrate/20120516020924_add_online_isbn_to_manifestation.rb +0 -5
  40. data/spec/dummy/solr/data/test/index/segments_b72 +0 -0
@@ -9,9 +9,9 @@ class Manifestation < ActiveRecord::Base
9
9
  :title_alternative_transcription, :description, :abstract, :available_at,
10
10
  :valid_until, :date_submitted, :date_accepted, :date_captured, :ndl_bib_id,
11
11
  :pub_date, :edition_string, :volume_number, :issue_number, :serial_number,
12
- :ndc, :content_type_id, :online_isbn, :attachment,
12
+ :ndc, :content_type_id, :attachment,
13
13
  :series_has_manifestation_attributes
14
- attr_accessible :fulltext_content, :online_isbn,
14
+ attr_accessible :fulltext_content,
15
15
  :doi, :number_of_page_string
16
16
 
17
17
  scope :periodical_master, where(:periodical => false)
@@ -66,7 +66,7 @@ class Manifestation < ActiveRecord::Base
66
66
  publisher.join('').gsub(/\s/, '').downcase
67
67
  end
68
68
  string :isbn, :multiple => true do
69
- [isbn, isbn10, wrong_isbn, online_isbn]
69
+ [isbn, isbn10, wrong_isbn]
70
70
  end
71
71
  string :issn, :multiple => true do
72
72
  if series_statement
@@ -163,7 +163,7 @@ class Manifestation < ActiveRecord::Base
163
163
  end
164
164
  end
165
165
  text :isbn do # 前方一致検索のためtext指定を追加
166
- [isbn, isbn10, wrong_isbn, online_isbn]
166
+ [isbn, isbn10, wrong_isbn]
167
167
  end
168
168
  text :issn do # 前方一致検索のためtext指定を追加
169
169
  if series_statement
@@ -230,11 +230,6 @@ class Manifestation < ActiveRecord::Base
230
230
  errors.add(:isbn)
231
231
  end
232
232
  end
233
- if online_isbn.present?
234
- unless StdNum::ISBN.valid?(online_isbn)
235
- errors.add(:online_isbn)
236
- end
237
- end
238
233
  end
239
234
 
240
235
  def check_issn
@@ -430,12 +425,6 @@ class Manifestation < ActiveRecord::Base
430
425
  end
431
426
 
432
427
  def self.find_by_isbn(isbn)
433
- online_lisbn = Lisbn.new(isbn.to_s)
434
- if online_lisbn.valid?
435
- manifestation = Manifestation.where(:online_isbn => online_lisbn.isbn).first || Manifestation.where(:online_isbn => online_lisbn.isbn10).first
436
- return manifestation if manifestation
437
- end
438
-
439
428
  lisbn = Lisbn.new(isbn.to_s)
440
429
  if lisbn.valid?
441
430
  Manifestation.where(:isbn => lisbn.isbn13).first || Manifestation.where(:isbn => lisbn.isbn10).first
@@ -707,7 +696,6 @@ end
707
696
  # year_of_publication :integer
708
697
  # attachment_meta :text
709
698
  # month_of_publication :integer
710
- # online_isbn :string(255)
711
699
  # fulltext_content :boolean
712
700
  # doi :string(255)
713
701
  #
@@ -69,7 +69,7 @@ class ResourceImportFile < ActiveRecord::Base
69
69
  row_num = 2
70
70
 
71
71
  field = rows.first
72
- if [field['print_isbn'], field['online_isbn'], field['isbn'], field['original_title']].reject{|field| field.to_s.strip == ""}.empty?
72
+ if [field['isbn'], field['original_title']].reject{|field| field.to_s.strip == ""}.empty?
73
73
  raise "You should specify isbn or original_tile in the first line"
74
74
  end
75
75
 
@@ -96,15 +96,14 @@ class ResourceImportFile < ActiveRecord::Base
96
96
  end
97
97
 
98
98
  unless manifestation
99
- if row['online_isbn'].present?
100
- isbn = StdNum::ISBN.normalize(row['online_isbn'])
101
- m = Manifestation.find_by_isbn(isbn)
102
- end
103
- if row['print_isbn'].present? and !m
104
- isbn = StdNum::ISBN.normalize(row['print_isbn'])
105
- m = Manifestation.find_by_isbn(isbn)
99
+ if row['doi'].present?
100
+ doi = URI.parse(row['doi']).path.gsub(/^\//, "")
101
+ manifestation = Manifestation.where(:doi => doi).first if doi.present?
106
102
  end
107
- if row['isbn'].present? and !m
103
+ end
104
+
105
+ unless manifestation
106
+ if row['isbn'].present?
108
107
  isbn = StdNum::ISBN.normalize(row['isbn'])
109
108
  m = Manifestation.find_by_isbn(isbn)
110
109
  end
@@ -463,23 +462,11 @@ class ResourceImportFile < ActiveRecord::Base
463
462
  return nil
464
463
  end
465
464
 
466
- lisbn = Lisbn.new(row['print_isbn'].to_s.strip)
465
+ lisbn = Lisbn.new(row['isbn'].to_s.strip)
467
466
  if lisbn.isbn.valid?
468
467
  isbn = lisbn.isbn
469
468
  end
470
469
 
471
- unless isbn
472
- lisbn = Lisbn.new(row['isbn'].to_s.strip)
473
- if lisbn.isbn.valid?
474
- isbn = lisbn.isbn
475
- end
476
- end
477
-
478
- online_lisbn = Lisbn.new(row['online_isbn'].to_s.strip)
479
- if online_lisbn.isbn.valid?
480
- online_isbn = lisbn.isbn
481
- end
482
-
483
470
  # TODO: 小数点以下の表現
484
471
  width = NKF.nkf('-eZ1', row['width'].to_s).gsub(/\D/, '').to_i
485
472
  height = NKF.nkf('-eZ1', row['height'].to_s).gsub(/\D/, '').to_i
@@ -546,7 +533,6 @@ class ResourceImportFile < ActiveRecord::Base
546
533
  :title_alternative => title[:title_alternative],
547
534
  :title_alternative_transcription => title[:title_alternative_transcription],
548
535
  :isbn => isbn,
549
- :online_isbn => online_isbn,
550
536
  :wrong_isbn => row['wrong_isbn'],
551
537
  :issn => row['issn'],
552
538
  :lccn => row['lccn'],
@@ -4,7 +4,7 @@
4
4
  <%= form_for(@accept, :url => basket_accepts_path(@basket), :remote => true) do |f| %>
5
5
  <%= f.error_messages %>
6
6
  <p>
7
- <%= t('activerecord.attributes.item.item_identifier') -%>:
7
+ <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
8
8
  <%= f.search_field :item_identifier, :class => 'resource_item_identifier', :value => nil -%>
9
9
  <%= f.submit t('accept.accept'), 'data-disable-with' => t('page.saving') -%>
10
10
  </p>
@@ -5,7 +5,7 @@
5
5
  <div class="search_form">
6
6
  <%= form_for(:accept, :html => {:method => :get}) do |f| %>
7
7
  <p>
8
- <%= t('activerecord.attributes.item.item_identifier') -%>:
8
+ <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
9
9
  <%= f.search_field :item_identifier, :value => @query, :class => 'resource_item_identifier' -%>
10
10
  <%= f.submit t('page.search') -%>
11
11
  </p>
@@ -8,7 +8,7 @@
8
8
  <div class="search_form">
9
9
  <%= form_for :items, :url => items_path, :html => {:method => 'get'} do -%>
10
10
  <p>
11
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
11
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
12
12
  <%= hidden_field_tag :manifestation_id, @manifestation.id if @manifestation -%>
13
13
  <%= submit_tag t('page.search') -%>
14
14
  <%= set_focus_on_search_form -%>
@@ -6,7 +6,7 @@
6
6
  <div data-role="detail">
7
7
  <%= form_for :items, :url => items_path, :html => {:method => 'get'} do -%>
8
8
  <p>
9
- <label for="search_form_top"><%= t('page.search_term') -%>:</label>
9
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
10
10
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
11
11
  <%= submit_tag t('page.search') -%>
12
12
  </p>
@@ -1,7 +1,7 @@
1
1
  <div class="search_form">
2
2
  <%= form_for :manifestations, :url => manifestations_path, :html => {:method => 'get'} do -%>
3
3
  <p>
4
- <%= t('page.search_term') -%>:
4
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
5
5
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
6
6
  <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
7
7
  <%= submit_tag t('page.search') -%>
@@ -1,7 +1,7 @@
1
1
  <div class="search_form">
2
2
  <%= form_for :manifestations, :url => contributor_manifestations_path(@index_patron[:contributor]), :html => {:method => 'get'} do -%>
3
3
  <p>
4
- <%= t('page.search_term') -%>:
4
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
5
5
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
6
6
  <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
7
7
  <% if can? :create, Realize %>
@@ -1,7 +1,7 @@
1
1
  <div class="search_form">
2
2
  <%= form_for :manifestations, :url => creator_manifestations_path(@index_patron[:creator]), :html => {:method => 'get'} do -%>
3
3
  <p>
4
- <%= t('page.search_term') -%>:
4
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
5
5
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
6
6
  <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
7
7
  <% if can? :create, Create %>
@@ -1,7 +1,7 @@
1
1
  <div class="search_form">
2
2
  <%= form_for :manifestations, :url => item_manifestations_path(@item), :html => {:method => 'get'} do -%>
3
3
  <p>
4
- <%= t('page.search_term') -%>:
4
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
5
5
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
6
6
  <% if can? :create, Create %>
7
7
  <%= render 'page/add' %>
@@ -1,6 +1,6 @@
1
1
  <%= form_for :manifestations, :url => manifestation_manifestations_path(@manifestation), :html => {:method => 'get'} do -%>
2
2
  <p>
3
- <%= t('page.search_term') -%>:
3
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
4
4
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
5
5
  <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
6
6
  <% if can? :create, ManifestationRelationship %>
@@ -1,7 +1,7 @@
1
1
  <div class="search_form">
2
2
  <%= form_for :manifestations, :url => publisher_manifestations_path(@index_patron[:publisher]), :html => {:method => 'get'} do -%>
3
3
  <p>
4
- <%= t('page.search_term') -%>:
4
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
5
5
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
6
6
  <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
7
7
  <% if can? :create, Produce %>
@@ -6,7 +6,7 @@
6
6
  <div class="search_form">
7
7
  <%= form_for :manifestations, :url => series_statement_manifestations_path(@series_statement), :html => {:method => 'get'} do -%>
8
8
  <p>
9
- <%= t('page.search_term') -%>:
9
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
10
10
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
11
11
  <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
12
12
  <% if can? :update, Manifestation %>
@@ -9,7 +9,7 @@
9
9
  <%- if manifestations and manifestations.size > @manifestations.limit_value.div(2) -%>
10
10
  <%= form_for :manifestations, :html => {:method => 'get'} do -%>
11
11
  <p>
12
- <%= t('page.search_term') -%>:
12
+ <%= label_tag :search_form_bottom, t('page.search_term') -%>:
13
13
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_bottom', :class => 'search_form', :placeholder => t('page.search_term')} -%>
14
14
  <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
15
15
  <%= submit_tag t('page.search') -%>
@@ -22,7 +22,7 @@
22
22
  <span id="next_link"><%= t('page.next') %></span>
23
23
  <span id="prev_link"><%= t('page.previous') %></span>
24
24
  <%= back_to_manifestation_index -%>
25
- <%= t('page.search_term') -%>:
25
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
26
26
  <%= search_field_tag 'query', @query, {:id => 'search_form_top', :class => 'search_form_short', :placeholder => t('page.search_term')} -%>
27
27
  <%= submit_tag t('page.search') -%>
28
28
  <%= link_to t('page.advanced_search'), page_advanced_search_path -%>
@@ -1,4 +1,4 @@
1
- <div id="holding">
1
+ <div class="holding">
2
2
  <table class="table table-striped holding">
3
3
  <tr>
4
4
  <th><%= t('activerecord.attributes.item.item_identifier') -%></th>
@@ -5,7 +5,7 @@
5
5
  <div data-role="content">
6
6
  <div data-role="fieldcontain">
7
7
  <%= form_for :manifestations, :html => {:method => 'get'} do -%>
8
- <label for="search_form_top"><%= t('page.search_term') -%>:</label>
8
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
9
9
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
10
10
  <%= submit_tag t('page.search') -%>
11
11
  <% end %>
@@ -5,7 +5,7 @@
5
5
  <div class="search_form">
6
6
  <%= form_for :patrons, :url => patrons_path, :html => {:method => 'get'} do -%>
7
7
  <p>
8
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
8
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
9
9
  <%= submit_tag t('page.search') -%>
10
10
  </p>
11
11
  <%- end -%>
@@ -10,7 +10,7 @@
10
10
  <div class="search_form">
11
11
  <%= form_for :patrons, :url => expression_patrons_path(expression), :html => {:method => 'get'} do -%>
12
12
  <p>
13
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
13
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
14
14
  <%- if can? :update, expression -%>
15
15
  <%= render 'page/add' %>
16
16
  <%- end -%>
@@ -6,7 +6,7 @@
6
6
  <div class="search_form">
7
7
  <%= form_for :patrons, :url => manifestation_patrons_path(manifestation), :html => {:method => 'get'} do -%>
8
8
  <p>
9
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
9
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
10
10
  <%- if can? :update, manifestation -%>
11
11
  <%= render 'page/add' %>
12
12
  <%- end -%>
@@ -9,7 +9,7 @@
9
9
  <div class="search_form">
10
10
  <%= form_for :patrons, :url => patron_patrons_path(patron), :html => {:method => 'get'} do -%>
11
11
  <p>
12
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
12
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
13
13
  <%- if can? :update, patron -%>
14
14
  <%= render 'page/add' %>
15
15
  <%- end -%>
@@ -5,7 +5,7 @@
5
5
  <div class="search_form">
6
6
  <%= form_for :patrons, :url => patron_merge_list_patrons_path(@patron_merge_list), :html => {:method => 'get'} do -%>
7
7
  <p>
8
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
8
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
9
9
  <%- if can? :update, @patron_merge_list -%>
10
10
  <%= render 'page/add' %>
11
11
  <%- end -%>
@@ -13,7 +13,7 @@
13
13
  <div class="search_form">
14
14
  <%= form_for :patrons, :url => work_patrons_path(work), :html => {:method => 'get'} do -%>
15
15
  <p>
16
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
16
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
17
17
  <%- if can? :update, work -%>
18
18
  <%= render 'page/add' %>
19
19
  <% end %>
@@ -6,7 +6,7 @@
6
6
  <div data-role="fieldcontain">
7
7
  <%= form_for :patrons, :url => patrons_path, :html => {:method => 'get'} do -%>
8
8
  <p>
9
- <label for="search_form_top"><%= t('page.search_term') -%>:</label>
9
+ <%= label_tag :search_form_top, t('page.search_term') -%>:
10
10
  <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
11
11
  <%= submit_tag t('page.search') -%>
12
12
  </p>
@@ -5,7 +5,7 @@
5
5
  <div class="search_form">
6
6
  <%= form_for :series_statements, :url => series_statements_path, :html => {:method => 'get'} do -%>
7
7
  <p>
8
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
8
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
9
9
  <%= submit_tag t('page.search') -%>
10
10
  <%= set_focus_on_search_form -%>
11
11
  </p>
@@ -6,7 +6,7 @@
6
6
  <div class="search_form">
7
7
  <%= form_for :series_statements, :url => series_statements_path, :html => {:method => 'get'} do -%>
8
8
  <p>
9
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
9
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
10
10
  <%= hidden_field_tag 'manifestation_id', @manifestation.id -%>
11
11
  <%= render 'page/add' %>
12
12
  <%= submit_tag t('page.search') -%>
@@ -6,7 +6,7 @@
6
6
  <h2>[S] <%= link_to @parent.original_title, @parent %></h2>
7
7
  <%= form_for :series_statements, :url => series_statements_path, :html => {:method => 'get'} do -%>
8
8
  <p>
9
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
9
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
10
10
  <%- if can? :update, @parent -%>
11
11
  <%= render 'page/add' %>
12
12
  <%- end -%>
@@ -5,7 +5,7 @@
5
5
  <div class="search_form">
6
6
  <%= form_for :series_statements, :url => series_statement_merge_list_series_statements_path(@series_statement_merge_list), :html => {:method => 'get'} do -%>
7
7
  <p>
8
- <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
8
+ <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
9
9
  <%- if can? :update, @series_statement_merge_list -%>
10
10
  <%= render 'page/add' %>
11
11
  <%- end -%>
@@ -1,7 +1,7 @@
1
1
  <div class="search_form">
2
2
  <%= form_for :manifestatioins, :url => series_statement_manifestations_path(series_statement), :html => {:method => 'get'} do -%>
3
3
  <p>
4
- <%= t('page.refine_by') -%>:
4
+ <%= label_tag :search_form_top, t('page.refine_by') -%>:
5
5
  <%= search_field_tag 'query', nil, {:id => 'search_form_top', :class => 'search_form_short', :placeholder => t('page.search_term')} -%>
6
6
  <%= submit_tag t('page.search') -%>
7
7
  </p>
@@ -1,3 +1,3 @@
1
1
  module EnjuBiblio
2
- VERSION = "0.1.0.pre11"
2
+ VERSION = "0.1.0.pre12"
3
3
  end
Binary file
@@ -646,7 +646,6 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
646
646
  t.integer "year_of_publication"
647
647
  t.text "attachment_meta"
648
648
  t.integer "month_of_publication"
649
- t.string "online_isbn"
650
649
  t.boolean "fulltext_content"
651
650
  t.string "doi"
652
651
  end
Binary file
@@ -2009,7 +2009,6 @@ manifestation_00216:
2009
2009
  # year_of_publication :integer
2010
2010
  # attachment_meta :text
2011
2011
  # month_of_publication :integer
2012
- # online_isbn :string(255)
2013
2012
  # fulltext_content :boolean
2014
2013
  # doi :string(255)
2015
2014
  #
@@ -298,7 +298,6 @@ end
298
298
  # year_of_publication :integer
299
299
  # attachment_meta :text
300
300
  # month_of_publication :integer
301
- # online_isbn :string(255)
302
301
  # fulltext_content :boolean
303
302
  # doi :string(255)
304
303
  #
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_biblio
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre11
4
+ version: 0.1.0.pre12
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-19 00:00:00.000000000 Z
12
+ date: 2012-12-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -370,7 +370,7 @@ dependencies:
370
370
  requirements:
371
371
  - - ~>
372
372
  - !ruby/object:Gem::Version
373
- version: 0.1.0.pre4
373
+ version: 0.1.0.pre5
374
374
  type: :development
375
375
  prerelease: false
376
376
  version_requirements: !ruby/object:Gem::Requirement
@@ -378,7 +378,7 @@ dependencies:
378
378
  requirements:
379
379
  - - ~>
380
380
  - !ruby/object:Gem::Version
381
- version: 0.1.0.pre4
381
+ version: 0.1.0.pre5
382
382
  - !ruby/object:Gem::Dependency
383
383
  name: enju_inventory
384
384
  requirement: !ruby/object:Gem::Requirement
@@ -386,7 +386,7 @@ dependencies:
386
386
  requirements:
387
387
  - - ~>
388
388
  - !ruby/object:Gem::Version
389
- version: 0.1.11.pre2
389
+ version: 0.1.11.pre4
390
390
  type: :development
391
391
  prerelease: false
392
392
  version_requirements: !ruby/object:Gem::Requirement
@@ -394,7 +394,7 @@ dependencies:
394
394
  requirements:
395
395
  - - ~>
396
396
  - !ruby/object:Gem::Version
397
- version: 0.1.11.pre2
397
+ version: 0.1.11.pre4
398
398
  - !ruby/object:Gem::Dependency
399
399
  name: enju_bookmark
400
400
  requirement: !ruby/object:Gem::Requirement
@@ -402,7 +402,7 @@ dependencies:
402
402
  requirements:
403
403
  - - ~>
404
404
  - !ruby/object:Gem::Version
405
- version: 0.1.2.pre3
405
+ version: 0.1.2.pre4
406
406
  type: :development
407
407
  prerelease: false
408
408
  version_requirements: !ruby/object:Gem::Requirement
@@ -410,7 +410,7 @@ dependencies:
410
410
  requirements:
411
411
  - - ~>
412
412
  - !ruby/object:Gem::Version
413
- version: 0.1.2.pre3
413
+ version: 0.1.2.pre4
414
414
  - !ruby/object:Gem::Dependency
415
415
  name: enju_event
416
416
  requirement: !ruby/object:Gem::Requirement
@@ -418,7 +418,7 @@ dependencies:
418
418
  requirements:
419
419
  - - ~>
420
420
  - !ruby/object:Gem::Version
421
- version: 0.1.17.pre3
421
+ version: 0.1.17.pre4
422
422
  type: :development
423
423
  prerelease: false
424
424
  version_requirements: !ruby/object:Gem::Requirement
@@ -426,7 +426,7 @@ dependencies:
426
426
  requirements:
427
427
  - - ~>
428
428
  - !ruby/object:Gem::Version
429
- version: 0.1.17.pre3
429
+ version: 0.1.17.pre4
430
430
  - !ruby/object:Gem::Dependency
431
431
  name: enju_manifestation_viewer
432
432
  requirement: !ruby/object:Gem::Requirement
@@ -977,7 +977,6 @@ files:
977
977
  - db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb
978
978
  - db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb
979
979
  - db/migrate/20120511072422_add_patron_identifier_to_patron.rb
980
- - db/migrate/20120516020924_add_online_isbn_to_manifestation.rb
981
980
  - db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
982
981
  - db/migrate/20120728204337_create_series_statement_relationships.rb
983
982
  - db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb
@@ -1192,7 +1191,7 @@ files:
1192
1191
  - spec/dummy/solr/conf/stopwords.txt
1193
1192
  - spec/dummy/solr/conf/synonyms.txt
1194
1193
  - spec/dummy/solr/data/test/index/segments.gen
1195
- - spec/dummy/solr/data/test/index/segments_b72
1194
+ - spec/dummy/solr/data/test/index/segments_bf9
1196
1195
  - spec/dummy/solr/data/test/spellchecker/segments.gen
1197
1196
  - spec/dummy/solr/data/test/spellchecker/segments_1
1198
1197
  - spec/factories/accepts.rb
@@ -1631,7 +1630,7 @@ test_files:
1631
1630
  - spec/dummy/solr/conf/stopwords.txt
1632
1631
  - spec/dummy/solr/conf/synonyms.txt
1633
1632
  - spec/dummy/solr/data/test/index/segments.gen
1634
- - spec/dummy/solr/data/test/index/segments_b72
1633
+ - spec/dummy/solr/data/test/index/segments_bf9
1635
1634
  - spec/dummy/solr/data/test/spellchecker/segments.gen
1636
1635
  - spec/dummy/solr/data/test/spellchecker/segments_1
1637
1636
  - spec/factories/accepts.rb
@@ -1,5 +0,0 @@
1
- class AddOnlineIsbnToManifestation < ActiveRecord::Migration
2
- def change
3
- add_column :manifestations, :online_isbn, :string
4
- end
5
- end