enju_biblio 0.1.0.pre63 → 0.1.0.pre64

data/app/models/resource_import_file.rb

@@ -1,15 +1,14 @@
 # -*- encoding: utf-8 -*-
 class ResourceImportFile < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include ImportFile
-  attr_accessible :resource_import, :edit_mode, :user_encoding, :mode,
-    :default_shelf_id, :library_id
   default_scope { order('resource_import_files.id DESC') }
   scope :not_imported, -> { in_state(:pending) }
   scope :stucked, -> { in_state(:pending).where('resource_import_files.created_at < ?', 1.hour.ago) }
 
   if Setting.uploaded_file.storage == :s3
-    has_attached_file :resource_import, storage: :s3, s3_credentials: "#{Setting.amazon}",
+    has_attached_file :resource_import, storage: :s3,
+      s3_credentials: Setting.amazon,
       s3_permissions: :private
   else
     has_attached_file :resource_import,
@@ -105,21 +104,27 @@ class ResourceImportFile < ActiveRecord::Base
       unless manifestation
         if row['doi'].present?
           doi = URI.parse(row['doi']).path.gsub(/^\//, "")
-          manifestation = Identifier.where(body: doi, identifier_type_id: IdentifierType.where(name: 'doi').first_or_create.id).first.try(:manifestation)
+          identifier_type_doi = IdentifierType.where(name: 'doi').first
+          identifier_type_doi = IdentifierType.where(name: 'doi').create! unless identifier_type_doi
+          manifestation = Identifier.where(body: doi, identifier_type_id: identifier_type_doi.id).first.try(:manifestation)
         end
       end
 
       unless manifestation
         if row['jpno'].present?
           jpno = row['jpno'].to_s.strip
-          manifestation = Identifier.where(body: jpno, identifier_type_id: IdentifierType.where(name: 'jpno').first_or_create.id).first.try(:manifestation)
+          identifier_type_jpno = IdentifierType.where(name: 'jpno').first
+          identifier_type_jpno = IdentifierType.where(name: 'jpno').create! unless identifier_type_jpno
+          manifestation = Identifier.where(body: jpno, identifier_type_id: identifier_type_jpno.id).first.try(:manifestation)
         end
       end
 
       unless manifestation
         if row['isbn'].present?
           isbn = StdNum::ISBN.normalize(row['isbn'])
-          m = Identifier.where(body: isbn, identifier_type_id: IdentifierType.where(name: 'isbn').first_or_create.id).first.try(:manifestation)
+          identifier_type_isbn = IdentifierType.where(name: 'isbn').first
+          identifier_type_isbn = IdentifierType.where(name: 'isbn').create! unless identifier_type_isbn
+          m = Identifier.where(body: isbn, identifier_type_id: identifier_type_isbn.id).first.try(:manifestation)
         end
         if m
           if m.series_statements.exists?
@@ -301,13 +306,14 @@ class ResourceImportFile < ActiveRecord::Base
         item.binded_at = binded_at if binded_at
 
         item_columns = %w(
-          call_number item_price
+          call_number
           binding_item_identifier binding_call_number binded_at
         )
         item_columns.each do |column|
-          item.assign_attributes(:"#{column}" => row[column], as: :admin)
+          item.assign_attributes(:"#{column}" => row[column])
         end
 
+        item.price = row['item_price'] if row['item_price'].present?
         item.note = row['item_note'] if row['item_note'].present?
         item.url = row['item_url'] if row['item_url'].present?
 
@@ -723,7 +729,9 @@ class ResourceImportFile < ActiveRecord::Base
     %w(isbn issn doi jpno).each do |id_type|
       if row["#{id_type}"].present?
         import_id = Identifier.new(body: row["#{id_type}"])
-        import_id.identifier_type = IdentifierType.where(name: id_type).first_or_create
+        identifier_type = IdentifierType.where(name: id_type).first
+        identifier_type = IdentifierType.where(name: id_type).create! unless identifier_type
+        import_id.identifier_type = identifier_type
         identifier[:"#{id_type}"] = import_id if import_id.valid?
       end
     end

data/app/models/resource_import_file_transition.rb

@@ -3,7 +3,7 @@ class ResourceImportFileTransition < ActiveRecord::Base
 
   
   belongs_to :resource_import_file, inverse_of: :resource_import_file_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/resource_import_result.rb

@@ -1,5 +1,4 @@
 class ResourceImportResult < ActiveRecord::Base
-  attr_accessible :resource_import_file_id, :manifestation_id, :item_id, :body
   default_scope { order('resource_import_results.id') }
   scope :file_id, proc{|file_id| where(resource_import_file_id: file_id)}
   scope :failed, -> { where(manifestation_id: nil) }

data/app/models/series_statement.rb

@@ -1,11 +1,4 @@
 class SeriesStatement < ActiveRecord::Base
-  attr_accessible :original_title, :numbering, :title_subseries,
-    :numbering_subseries, :title_transcription, :title_alternative,
-    :series_statement_identifier, :note,
-    :root_manifestation_id, :url,
-    :title_subseries_transcription, :creator_string, :volume_number_string
-  attr_accessible :series_master
-
   has_many :series_statement_merges, dependent: :destroy
   has_many :series_statement_merge_lists, through: :series_statement_merges
   belongs_to :manifestation, touch: true

data/app/models/series_statement_merge.rb

@@ -1,5 +1,4 @@
 class SeriesStatementMerge < ActiveRecord::Base
-  attr_accessible :series_statement_id, :series_statement_merge_list_id
   belongs_to :series_statement, validate: true
   belongs_to :series_statement_merge_list, validate: true
   validates_presence_of :series_statement, :series_statement_merge_list

data/app/models/series_statement_merge_list.rb

@@ -1,5 +1,4 @@
 class SeriesStatementMergeList < ActiveRecord::Base
-  attr_accessible :title
   has_many :series_statement_merges, dependent: :destroy
   has_many :series_statements, through: :series_statement_merges
   validates_presence_of :title

data/app/views/items/index.html.erb

@@ -76,4 +76,15 @@
       <li><%= link_to t('page.new', model: t('activerecord.models.item')), new_item_path(manifestation_id: @manifestation.id) -%></li>
     <%- end -%>
   </ul>
+  <% if defined?(EnjuCirculation) %>
+    <h4><%= t('activerecord.models.circulation_status') -%></h4>
+    <ul>
+      <%- @circulation_status_facet.each do |facet| -%>
+        <li><%= circulation_status_facet(facet) %></li>
+      <%- end -%>
+      <%- if params[:circulation_status] -%>
+        <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(circulation_status: nil, page: nil, view: nil, only_path: true)) -%></li>
+      <%- end -%>
+    </ul>
+  <% end %>
 </div>

data/app/views/layouts/items.html.erb

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= @locale.to_s -%>" lang="<%= @locale.to_s -%>">
+<head>
+  <meta charset="UTF-8" />
+  <%= render 'page/include' %>
+  <title><%= title(controller.controller_name) %></title>
+  <% if %w(index show new edit).include?(controller.action_name) %>
+    <%= book_jacket_header(Setting.book_jacket.source) %>
+    <% if Setting.book_jacket.source == :google %>
+      <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+      <%= render 'manifestations/google_book_thumbnail_header', manifestation: @manifestation if @manifestation %>
+    <% end %>
+  <% end %>
+</head>
+<body itemscope itemtype="http://schema.org/WebPage">
+
+<%= render 'page/header' %>
+<%= render 'page/menu' %>
+
+<div id="content">
+
+<%= yield %>
+
+</div>
+
+<%= render 'page/footer' %>
+
+</body>
+</html>

data/app/views/manifestations/_form.html.erb

@@ -146,9 +146,9 @@
     <p><%= f.link_to_add t('page.add'), :identifiers %></p>
   </div>
 
-<% if defined?(EnjuSubject) %>
-  <%= render 'manifestations/subject_form', f: f %>
-<% end %>
+  <% if defined?(EnjuSubject) %>
+    <%= render 'manifestations/subject_form', f: f %>
+  <% end %>
 
 <!--
   <div class="field">

data/app/views/manifestations/_index_form_series_statement.html.erb

@@ -9,7 +9,7 @@
     <%= 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')} -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-    <% if can? :update, Manifestation %>
+    <% if can? :create, Manifestation %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>

data/app/views/manifestations/_list.html.erb

@@ -4,3 +4,18 @@
 
 <%= paginate(manifestations) -%>
 <br />
+
+<div>
+  <%- if manifestations and manifestations.size > @manifestations.limit_value.div(2) -%>
+    <%= form_for :manifestations, html: {method: 'get'} do -%>
+      <p>
+        <%= label_tag :search_form_bottom, t('page.search_term') -%>:
+        <%= search_field_tag 'query', h(@query), {id: 'search_form_bottom', class: 'search_form', placeholder: t('page.search_term')} -%>
+        <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
+        <%= submit_tag t('page.search') -%>
+        <br />
+        <%= link_to t('page.advanced_search'), page_advanced_search_path -%>
+      </p>
+    <%- end -%>
+  <%- end -%>
+</div>

data/app/views/manifestations/_manifestation.html.erb

@@ -1,44 +1,65 @@
-        <tr class="line<%= cycle("0", "1") -%>">
-          <td style="width: 30px"><%= @manifestations.offset_value + 1 + manifestation_counter -%></td>
-            <td style="480px">
-              <% if manifestation.root_series_statement %>
-                <%= render 'manifestations/show_series_index', manifestation: manifestation, series_statement: manifestation.root_series_statement -%>
+      <tr class="line<%= cycle("0", "1") -%>">
+        <td style="width: 30px"><%= @manifestations.offset_value + 1 + manifestation_counter -%></td>
+        <% cache([manifestation, fragment: 'manifestation_html', role: current_user_role_name, locale: @locale]) do %>
+          <td style="480px">
+            <% if manifestation.root_series_statement %>
+              <%= render 'manifestations/show_series_index', manifestation: manifestation, series_statement: manifestation.root_series_statement -%>
+            <% else %>
+              <%= render 'manifestations/show_index', manifestation: manifestation -%>
+              <div class="access_address">
+                <%= link_to manifestation.access_address, manifestation.access_address if manifestation.access_address.present? -%>
+              </div>
+              <% if current_user.try(:has_role?, 'Librarian') %>
+                <%- unless manifestation.items.empty? -%>
+                  (<%= link_to "#", { onclick: "$('#holding_#{manifestation.id}').toggle(); return false;"} do t('page.holding') end %>)
+                <% end %>
               <% else %>
-                <%= render 'manifestations/show_index', manifestation: manifestation -%>
-                <div class="access_address">
-                  <%= link_to manifestation.access_address, manifestation.access_address if manifestation.access_address.present? -%>
-                </div>
+                <%- unless manifestation.items.for_checkout.on_shelf.empty? -%>
+                  (<%= link_to "#", { onclick: "$('#holding_#{manifestation.id}').toggle(); return false;"} do t('page.holding') end %>)
+                <%- end -%>
+              <%- end -%>
+              <% if defined?(EnjuBookmark) %>
+                <%- if manifestation.tags.first -%>
+                  (<%= link_to "#", { onclick: "$('#tag_#{manifestation.id}').toggle(); return false;" } do t('activerecord.models.tag') end %>)
+                <%- end -%>
+                <%= render 'manifestations/show_tag', manifestation: manifestation -%>
               <% end %>
-            </td>
-            <% if signed_in? %>
-              <td id="edit_icons">
-                <% if defined?(EnjuCirculation) %>
-                  <% unless params[:mode] == 'add' %>
-                    <% if manifestation.is_reservable_by?(current_user) %>
-                      <%- reserve = manifestation.is_reserved_by?(current_user) -%>
-                      <%- if reserve -%>
-                        <%= link_to t('reserve.show'), reserve -%>
-                      <%- else -%>
-                        <%= link_to t('activerecord.models.reserve'), new_reserve_path(manifestation_id: manifestation.id) if can? :create, Reserve -%>
-                      <%- end -%>
-                    <% end %>
-                    <br />
+            <% end %>
+            <%= render 'manifestations/holding', manifestation: manifestation -%>
+          </td>
+          <% if signed_in? %>
+            <td id="edit_icons">
+              <% if defined?(EnjuCirculation) %>
+                <% unless params[:mode] == 'add' %>
+                  <% if manifestation.is_reservable_by?(current_user) %>
+                    <%- reserve = manifestation.is_reserved_by?(current_user) -%>
+                    <%- if reserve -%>
+                      <%= link_to t('reserve.show'), reserve -%>
+                    <%- else -%>
+                      <%= link_to t('activerecord.models.reserve'), new_reserve_path(manifestation_id: manifestation.id) if can? :create, Reserve -%>
+                    <%- end -%>
                   <% end %>
+                  <br />
                 <% end %>
-                <%- if can? :update, manifestation -%>
-                  <% unless params[:mode] == 'add' %>
-                    <%= link_to image_tag('icons/book_edit.png', size: '16x16', alt: t('page.edit')), edit_manifestation_path(manifestation) -%>
+              <% end %>
+              <%- if can? :update, manifestation -%>
+                <% unless params[:mode] == 'add' %>
+                  <% if manifestation.serial? && manifestation.series_master? %>
+                    <%= link_to t('page.new_acquisition'), new_manifestation_path(parent_id: manifestation.id) %>
+                  <% end %>
+                  <%= link_to t('page.edit'), edit_manifestation_path(manifestation) -%>
+                <% else %>
+                  <% case %>
+                  <% when @parent %>
+                    <%= link_to t('page.add'), new_manifestation_relationship_path(manifestation_id: @parent.id, child_id: manifestation.id) unless @parent.derived_manifestations.include?(manifestation) or @parent == manifestation -%>
+                  <% when @item %>
+                    <%= link_to t('page.change'), edit_item_path(@item, manifestation_id: manifestation.id) unless @item.manifestation == manifestation -%>
                   <% else %>
-                    <% case %>
-                    <% when @parent %>
-                      <%= link_to t('page.add'), new_manifestation_relationship_path(manifestation_id: @parent.id, child_id: manifestation.id) unless @parent.derived_manifestations.include?(manifestation) or @parent == manifestation -%>
-                    <% when @item %>
-                      <%= link_to t('page.change'), edit_item_path(@item, manifestation_id: manifestation.id) unless @item.manifestation == manifestation -%>
-                    <% else %>
-                      <%= link_to image_tag('icons/arrow_divide.png', size: '16x16', alt: t('manifestation.add_derivation')), new_manifestation_path(parent_id: manifestation.id) -%>
-                    <% end %>
-                  <%- end -%>
+                    <%= link_to image_tag('icons/arrow_divide.png', size: '16x16', alt: t('manifestation.add_derivation')), new_manifestation_path(parent_id: manifestation.id) -%>
+                  <% end %>
                 <%- end -%>
-              </td>
-            <% end %>
-        </tr>
+              <%- end -%>
+            </td>
+          <% end %>
+        <% end %>
+      </tr>

data/app/views/manifestations/_pickup.html.erb

@@ -12,6 +12,14 @@
           <%- end -%>
         </p>
       <% end %>
+      <% if defined?(EnjuBookmark) %>
+        <p>
+          <strong><%= t('page.tag') -%>:</strong>
+          <%- manifestation.tags.each do |tag| -%>
+            <%= link_to tag.name, manifestations_path(tag: tag.name) -%>
+         <%- end -%>
+        </p>
+      <% end %>
     </div>
     <div style="clear: both"></div>
     <div style="margin-top: 5px">

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -58,6 +58,14 @@
           <%= render 'manifestations/subject_detail', manifestation: manifestation %>
           <%= render 'manifestations/classification_detail', manifestation: manifestation %>
         <% end %>
+        <% if defined?(EnjuBookmark) %>
+          <tr>
+            <td><%= t('activerecord.models.tag') -%>:</td>
+            <td>
+              <%= render 'manifestations/tag_list', manifestation: manifestation -%>
+            </td>
+          </tr>
+        <% end %>
         <%- unless manifestation.serial? -%>
           <tr>
             <td><%= t('page.identifier') -%>:</td>

data/app/views/manifestations/_show_detail_user.html.erb

@@ -60,6 +60,14 @@
           <%= render 'manifestations/subject_detail', manifestation: manifestation %>
           <%= render 'manifestations/classification_detail', manifestation: manifestation %>
         <% end %>
+        <% if defined?(EnjuBookmark) %>
+          <tr>
+            <td><%= t('activerecord.models.tag') -%>:</td>
+            <td>
+              <%= render 'manifestations/tag_list', manifestation: manifestation -%>
+            </td>
+          </tr>
+        <% end %>
         <%- unless manifestation.serial? -%>
           <tr>
             <td><%= t('page.identifier') -%>:</td>

data/app/views/manifestations/_show_holding.html.erb

@@ -51,7 +51,26 @@
         </td>
       <% end %>
     </tr>
+    <% if can? :update, item %>
+      <script>
+        $(function(){
+          $('a#item_identifier_item_<%= item.id %>').data(
+            'powertip',
+            'item_identifier: <%= item.item_identifier %>'
+          );
+          $('a#item_identifier_item_<%= item.id %>').powerTip({
+            placement: 'e',
+            mouseOnToPopup: true
+          });
+        });
+      </script>
+      <%= render 'items/tooltip', item: item %>
+    <% end %>
   <%- end -%>
 </table>
+
+<%- if can? :create, Item -%>
+  <p><%= link_to t('page.new', model: t('activerecord.models.item')), new_item_path(manifestation_id: manifestation.id) -%></p>
+<%- end -%>
 </div>
 <% end %>

data/app/views/manifestations/_submenu_parent.html.erb

@@ -5,4 +5,7 @@
     <% if can? :update, @parent %>
       <li><%= link_to t('page.edit'), edit_manifestation_path(@parent) %></li>
     <% end %>
+    <% if can? :delete, @parent %>
+      <li><%= link_to t('page.destroy'), manifestation_path(@parent), data: {confirm: t('page.are_you_sure')}, method: :delete %></li>
+    <% end %>
   </ul>

data/app/views/manifestations/index.atom.builder

@@ -5,6 +5,9 @@ atom_feed(url: manifestations_url(format: :atom)) do |feed|
   @manifestations.each do |manifestation|
     feed.entry(manifestation) do |entry|
       entry.title(manifestation.original_title)
+      if defined?(EnjuBookmark)
+        entry.content(manifestation.tags.join(' '), type: 'html')
+      end
 
       manifestation.creators.readable_by(current_user).each do |agent|
         entry.author do |author|

data/app/views/manifestations/index.html.erb

@@ -62,7 +62,14 @@
       <%= paginate(@manifestations) -%>
       <br />
     </div>
-
+    <% if defined?(EnjuBookmark) %>
+      <div id="tag_cloud">
+        <h3 class="resource_title"><%= t('activerecord.models.tag') -%></h3>
+        <div id="tag_cloud_list"></div>
+        <%= image_tag 'spinner.gif', id: 'spinner_tag_cloud',
+          style: 'padding-bottom: 15px; padding-left: 40px;' -%>
+      </div>
+    <% end %>
   <%- else -%>
     <!-- TODO: 検索結果が少ない場合にも表示させる -->
     <%= render 'manifestations/not_found' -%>
@@ -77,8 +84,31 @@
   <% if @parent and can?(:update, @parent) %>
     <%= render 'submenu_parent' %>
   <% end %>
+  <h3><%= link_to h("#{t('page.total')}: #{@count[:query_result]}"), url_for(params.merge(action: 'index', view: nil, carrier_type: nil, library: nil, language: nil, subject: nil, only_path: true))  -%></h3>
+    <%- if @manifestations.total_count > 0 -%>
+      <%= render 'manifestations/all_facet' -%>
+    <%- end -%>
+  <div>
+    <%- if params[:library_id].blank? -%>
+      <%= link_to((image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), url_for(params.merge(format: :rss, page: nil, library_id: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(format: :rss, page: nil, library_id: nil, commit: nil, only_path: true)) -%>
+    <%- else -%>
+      <%= link_to((image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), url_for(params.merge(format: :rss, page: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(format: :rss, page: nil, commit: nil, only_path: true)) -%>
+    <%- end -%>
+  </div>
 </div>
 
+<% if defined?(EnjuBookmark) %>
+  <script type="text/javascript">
+    window.onload = function() {
+      $("#tag_cloud_list").load('<%= url_for(params.merge(view: "tag_cloud", only_path: true)) -%>', hideTagCloudSpinner);
+    }
+
+    function hideTagCloudSpinner(){
+      $("#spinner_tag_cloud").hide();
+    }
+  </script>
+<% end %>
+
 <% if @manifestation_ids and @search_query %>
   <%= render 'session_ids' %>
 <% end %>