enju_biblio 0.1.0.pre36 → 0.1.0.pre37

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

@@ -36,18 +36,8 @@
                     <% end %>
                   <% else %>
                     <% case %>
-                    <% when @index_patron[:creator] %>
-                      <%= link_to t('page.add'), new_patron_create_path(@index_patron[:creator], :work_id => manifestation.id) unless manifestation.creators.include?(@index_patron[:creator]) -%>
-                    <% when @index_patron[:contributor] %>
-                      <%= link_to t('page.add'), new_patron_realize_path(@index_patron[:contributor], :expression_id => manifestation.id) unless manifestation.contributors.include?(@index_patron[:contributor]) -%>
-                    <% when @index_patron[:publisher] %>
-                      <%= link_to t('page.add'), new_patron_produce_path(@index_patron[:publisher], :manifestation_id => manifestation.id) unless manifestation.publishers.include?(@index_patron[:publisher]) -%>
-                    <% when @series_statement %>
-                      <% unless manifestation.series_statements.exists? -%>
-                        <%= link_to t('page.add'), new_manifestation_path(:parent_id => @series_statement.root_manifestation.id) if @series_statement.root_manifestation -%>
-                      <% end %>
-                    <% when @manifestation %>
-                      <%= link_to t('page.add'), new_manifestation_manifestation_relationship_path(@manifestation, :child_id => manifestation.id) unless @manifestation.derived_manifestations.include?(manifestation) or @manifestation == manifestation -%>
+                    <% when @parent %>
+                      <%= link_to t('page.add'), new_manifestation_manifestation_relationship_path(@parent, :child_id => manifestation.id) unless @parent.derived_manifestations.include?(manifestation) or @parent == manifestation -%>
                     <% when @item %>
                       <%= link_to t('page.change'), edit_exemplify_path(@item.exemplify, :manifestation_id => manifestation.id) unless @item.manifestation == manifestation -%>
                     <% else %>

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

@@ -10,26 +10,15 @@
             <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
-        <%- if manifestation.series_statements.exists? -%>
           <tr>
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
-              <ul>
-                <% manifestation.series_statements.each do |series_statement| %>
-                  <% if series_statement.root_manifestation %>
-                    <li><%= link_to series_statement.original_title, series_statement.root_manifestation -%></li>
-                  <% else %>
-                    <li><%= series_statement.original_title -%></li>
-                  <% end %>
-                <% end %>
-              </ul>
-              <%= manifestation.volume_number_string %>
+              <%= render 'show_series_detail', :manifestation => manifestation %>
               <%- if manifestation.issn.present? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
               <%- end -%>
             </td>
           </tr>
-        <% end %>
         <%= render 'edition_and_number', :manifestation => manifestation %>
         <tr>
           <td style="width: 200px"><%= t('page.form') -%>:</td>
@@ -60,27 +49,8 @@
           <td><%= manifestation.price -%></td>
         </tr>
         <% if defined?(EnjuSubject) %>
-          <tr>
-            <td><%= t('activerecord.models.subject') -%>:</td>
-            <td>
-              <%- unless manifestation.subjects.empty? -%>
-                <ul>
-                  <%- manifestation.subjects.each do |subject| -%>
-                    <li>
-                      <%= link_to subject.term, subject -%>
-                      <%- unless subject.classifications.empty? -%>
-                        (
-                        <%- subject.classifications.each do |classification| -%>
-                          <%= classification.classification_type.name -%>: <%= link_to classification.category, classification -%>
-                        <%- end -%>
-                        )
-                      <%- end -%>
-                    </li>
-                  <%- end -%>
-                </ul>
-              <%- end -%>
-            </td>
-          </tr>
+          <%= render 'manifestations/subject_detail', :manifestation => manifestation %>
+          <%= render 'manifestations/classification_detail', :manifestation => manifestation %>
         <% end %>
         <%- unless manifestation.periodical? -%>
           <tr>

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

@@ -10,22 +10,15 @@
             <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
-        <%- if manifestation.series_statements.exists? -%>
           <tr>
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
-              <ul>
-                <% manifestation.series_statements.each do |series_statement| %>
-                  <li><%= link_to series_statement.original_title, series_statement -%></li>
-                <% end %>
-              </ul>
-              <%= manifestation.volume_number_string %>
+              <%= render 'show_series_detail', :manifestation => manifestation %>
               <%- if manifestation.issn.present? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
               <%- end -%>
             </td>
           </tr>
-        <% end %>
         <%= render 'edition_and_number', :manifestation => manifestation %>
         <tr>
           <td style="width: 200px"><%= t('page.form') -%>:</td>
@@ -58,16 +51,8 @@
           </tr>
         <% end %>
         <% if defined?(EnjuSubject) %>
-          <%- unless manifestation.subjects.empty? -%>
-            <tr>
-              <td><%= t('activerecord.models.subject') -%>:</td>
-              <td>
-                <%- manifestation.subjects.each do |subject| -%>
-                  <%= link_to subject.term, subject -%>
-                <%- end -%>
-              </td>
-            </tr>
-          <%- end -%>
+          <%= render 'manifestations/subject_detail', :manifestation => manifestation %>
+          <%= render 'manifestations/classification_detail', :manifestation => manifestation %>
         <% end %>
         <%- unless manifestation.periodical? -%>
           <tr>

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

@@ -3,22 +3,10 @@
           <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_transcription') -%></td>
           <td style="width: 490px"><%= @parent.title_transcription %></td>
         </tr>
-        <tr>
-          <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_subseries') -%></td>
-          <td style="width: 490px"><%= @parent.root_series_statement.title_subseries %>
-            <% if @parent.root_series_statement.title_subseries_transcription? %>
-              (<%= @parent.root_series_statement.title_subseries_transcription %>)
-            <% end %>
-          </td>
-        </tr>
         <tr>
           <td><%= t('activerecord.attributes.series_statement.series_master') -%></td>
           <td><%= localized_boolean(@parent.series_master?) %></td>
         </tr>
-        <tr>
-          <td><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></td>
-          <td><%= @parent.root_series_statement.series_statement_identifier %></td>
-        </tr>
         <tr>
           <td><%= t('activerecord.attributes.series_statement.note') -%></td>
           <td><%= @parent.note %></td>

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

@@ -0,0 +1,26 @@
+<ul>
+  <% manifestation.original_manifestations.each do |m| %>
+    <li>
+      <%= link_to m.original_title, m %>
+      <% if can? :create, Manifestation and m.periodical? %>
+        (<%= link_to t('manifestation.add_next_issue'), new_manifestation_path(:parent_id => m.id) %>)
+      <% end %>
+      <% if m.series_statements.exists? %>
+        <ul>
+          <% m.series_statements.each do |s| %>
+            <li>
+              <%= s.original_title %>
+              <%= s.volume_number_string %>
+            </li>
+          <% end %>
+        </ul>
+      <% end %>
+    </li>
+  <% end %>
+</ul>
+
+<ul>
+  <% manifestation.series_statements.each do |series_statement| %>
+    <li><%= link_to series_statement.original_title, manifestations_path(:query => series_statement.original_title) %></li>
+  <% end %>
+</ul>

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

@@ -73,33 +73,7 @@
       </ul>
 
       <%- if current_user.try(:has_role?, 'Librarian') -%>
-        <ul>
-          <li>
-            <%- case when @expression -%>
-              <%= link_to t('page.edit'), edit_expression_manifestation_path(@expression, @manifestation) -%>
-            <%- when @patron -%>
-              <%= link_to t('page.edit'), edit_publisher_manifestation_path(@patron, @manifestation) -%>
-            <%- else -%>
-              <%= link_to t('page.edit'), edit_manifestation_path(@manifestation) -%>
-            <%- end -%>
-            <ul>
-              <li><%= link_to t('manifestation.edit_creator'), work_patrons_path(@manifestation) -%></li>
-              <li><%= link_to t('manifestation.edit_contributor'), expression_patrons_path(@manifestation) -%></li>
-              <li><%= link_to t('manifestation.edit_publisher'), manifestation_patrons_path(@manifestation) -%></li>
-              <%- if @manifestation.periodical? -%>
-                <li><%= link_to t('manifestation.add_next_issue'), new_series_statement_manifestation_path(@manifestation.root_series_statement) if @manifestation.root_series_statement -%></li>
-              <%- end -%>
-            </ul>
-          </li>
-          <% if can? :delete, @manifestation %>
-            <li><%= link_to t('page.destroy'), @manifestation, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
-          <% end %>
-          <li><%= link_to t('manifestation.add_derivation'), manifestation_manifestations_path(@manifestation, :mode => 'add') -%></li>
-          <% if defined?(EnjuSubject) %>
-            <li><%= link_to t('page.listing', :model => t('activerecord.models.subject')), work_subjects_path(@manifestation) -%></li>
-          <% end %>
-          <li><%= link_to t('manifestation.edit_item'), manifestation_items_path(@manifestation) -%></li>
-        </ul>
+        <%= render 'manifestations/edit_detail' %>
       <% end %>
   </div>
 </div>

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

@@ -33,11 +33,11 @@
     <%= f.label :numbering_subseries -%><br />
     <%= f.text_field :numbering_subseries %>
   </div>
-  -->
   <div class="field">
     <%= f.label :series_statement_identifier -%><br />
     <%= f.text_field :series_statement_identifier, :class => 'resource_identifier' %>
   </div>
+  -->
   <div class="field">
     <%= f.label :note -%><br />
     <%= f.text_area :note, :class => 'resource_textarea' -%>

data/app/views/series_statements/_index.html.erb

@@ -17,7 +17,6 @@
     <th id="position"></th>
     <th><%= t('activerecord.attributes.series_statement.original_title') -%></th>
     <th></th>
-    <th></th>
   </tr>
 
 <% @series_statements.each do |series_statement| %>
@@ -29,15 +28,6 @@
     </td>
     <td>
       <strong><%= link_to series_statement.original_title, series_statement %></strong>
-      <% if series_statement.manifestation -%>
-        <% if series_statement.manifestation.publishers.exists? %>
-          <br />
-          <%= patrons_list(series_statement.manifestation.publishers.readable_by(current_user)) %>
-        <% end %>
-      <% end %>
-    </td>
-    <td>
-      <%= link_to t('page.new', :model => t('activerecord.models.manifestation')), new_series_statement_manifestation_path(series_statement) -%>
     </td>
     <td>
       <%= link_to t('page.edit'), edit_series_statement_path(series_statement) if can? :update, series_statement -%>
@@ -54,6 +44,8 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.series_statement')), new_series_statement_path -%></li>
+    <% if can? :create, SeriesStatement %>
+      <li><%= link_to t('page.new', :model => t('activerecord.models.series_statement')), new_series_statement_path -%></li>
+    <% end %>
   </ul>
 </div>

data/app/views/series_statements/show.html.erb

@@ -2,41 +2,33 @@
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.series_statement')) -%></h1>
 <div id="content_list">
   <p id="notice"><%= notice %></p>
+  <% if @series_statement.root_manifestation and @manifestation_ids %>
+    <%= render 'manifestations/paginate_id_link', :manifestation => @series_statement.root_manifestation , :manifestation_ids => @manifestation_ids %>
+  <% end %>
 
   <h2 class="resource_title">
     <%= @series_statement.original_title %>
+    <%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.serial')) if @series_statement.periodical -%>
   </h2>
 
-  <div id="tabs">
-    <%= render 'tab_menu', :series_statement => @series_statement %>
-    <div id="detail">
-      <table class="table table-striped" id="resource_detail">
-        <tr>
-          <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_transcription') -%></td>
-          <td style="width: 490px"><%= @series_statement.title_transcription %></td>
-        </tr>
-        <tr>
-          <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_subseries') -%></td>
-          <td style="width: 490px"><%= @series_statement.title_subseries %>
-            <% if @series_statement.title_subseries_transcription? %>
-              (<%= @series_statement.title_subseries_transcription %>)
-            <% end %>
-          </td>
-        </tr>
-        <tr>
-          <td><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></td>
-          <td><%= @series_statement.series_statement_identifier %></td>
-        </tr>
-        <tr>
-          <td><%= t('activerecord.attributes.series_statement.note') -%></td>
-          <td><%= @series_statement.note %></td>
-        </tr>
-    </table>
-  </div>
-</div>
-
-  <%= render 'series_statements/refine_search_form', :series_statement => @series_statement %>
-  <%= render 'manifestation_list' -%>
+  <table id="resource_detail">
+    <tr>
+      <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_transcription') -%></td>
+      <td style="width: 490px"><%= @series_statement.title_transcription %></td>
+    </tr>
+    <tr>
+      <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_subseries') -%></td>
+      <td style="width: 490px"><%= @series_statement.title_subseries %>
+        <% if @series_statement.title_subseries_transcription? %>
+          (<%= @series_statement.title_subseries_transcription %>)
+        <% end %>
+      </td>
+    </tr>
+    <tr>
+      <td><%= t('activerecord.attributes.series_statement.note') -%></td>
+      <td><%= @series_statement.note %></td>
+    </tr>
+  </table>
 </div>
 </div>
 

data/config/locales/translation_en.yml

@@ -82,6 +82,8 @@ en:
         series_statement_string: Series statement
         periodical: Periodical
         series_master: Series master
+        subject: Subject
+        classification: Classification
       item:
         call_number: Call number
         item_identifier: Item identifier

data/config/locales/translation_ja.yml

@@ -82,6 +82,8 @@ ja:
         series_statement_string: シリーズ情報
         periodical: 定期刊行物
         series_master: シリーズ情報マスタ
+        subject: 件名
+        classification: 分類
       item:
         call_number: 請求記号
         item_identifier: 所蔵情報ID

data/config/routes.rb

@@ -1,10 +1,12 @@
 Rails.application.routes.draw do
+  resources :people
+
+
   resources :manifestations do
     resources :patrons
     resources :produces
     resources :exemplifies
     resources :series_statements
-    resources :series_has_manifestations
     resources :items
     resources :picture_files
     resources :manifestations
@@ -64,16 +66,10 @@ Rails.application.routes.draw do
 
   resources :donates
 
-  resources :series_has_manifestations
-
   resources :series_statements do
     resources :manifestations
-    resources :series_has_manifestations
-    resources :series_statement_relationships
   end
 
-  resources :series_statement_relationships
-
   resources :countries
   resources :languages
   resources :form_of_works

data/db/migrate/005_create_manifestations.rb

@@ -28,9 +28,9 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :issn
       t.integer :price # TODO: 通貨単位
       t.text :fulltext
-      t.string :volume_number_list
-      t.string :issue_number_list
-      t.string :serial_number_list
+      t.string :volume_number_string
+      t.string :issue_number_string
+      t.string :serial_number_string
       t.integer :edition
       t.text :note
       t.boolean :repository_content, :default => false, :null => false
@@ -52,5 +52,6 @@ class CreateManifestations < ActiveRecord::Migration
     #add_index :manifestations, :frequency_id
     add_index :manifestations, :manifestation_identifier
     add_index :manifestations, :updated_at
+    add_index :manifestations, :date_of_publication
   end
 end

data/db/migrate/20081028083142_create_patron_import_files.rb

@@ -6,7 +6,7 @@ class CreatePatronImportFiles < ActiveRecord::Migration
       t.integer :size
       t.integer :user_id
       t.text :note
-      t.datetime :imported_at
+      t.datetime :executed_at
       t.string :state
       t.string :patron_import_file_name
       t.string :patron_import_content_type

data/db/migrate/20081028083208_create_resource_import_files.rb

@@ -6,7 +6,7 @@ class CreateResourceImportFiles < ActiveRecord::Migration
       t.integer :size
       t.integer :user_id
       t.text :note
-      t.datetime :imported_at
+      t.datetime :executed_at
       t.string :state
       t.string :resource_import_file_name
       t.string :resource_import_content_type

data/lib/enju_biblio/biblio_helper.rb

@@ -51,7 +51,7 @@ module EnjuBiblio
       if options[:nolink]
         patrons_list = patrons.map{|patron| patron.full_name}
       else
-        patrons_list = patrons.map{|patron| link_to(patron.full_name, patron, options)}
+        patrons_list = patrons.map{|patron| link_to(patron.full_name, manifestations_path(:query => patron.full_name), options)}
       end
       patrons_list.join(" ").html_safe
     end

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre36"
+  VERSION = "0.1.0.pre37"
 end

data/spec/controllers/import_requests_controller_spec.rb

@@ -171,7 +171,7 @@ describe ImportRequestsController do
       describe "with valid params", :vcr => true do
         it "assigns a newly created import_request as @import_request" do
           post :create, :import_request => @attrs
-          assigns(:import_request).should be_valid
+          assigns(:import_request).manifestation.save! #should be_valid
         end
 
         it "redirects to the created import_request" do

data/spec/controllers/manifestations_controller_spec.rb

@@ -118,12 +118,6 @@ describe ManifestationsController do
         assigns(:manifestations).collect(&:id).should eq assigns(:manifestation).derived_manifestations.collect(&:id)
       end
 
-      it "should get index with publisher_id" do
-        get :index, :publisher_id => 1
-        response.should be_success
-        assigns(:manifestations).collect(&:id).should eq Patron.find(1).manifestations.order('created_at DESC').collect(&:id)
-      end
-
       it "should get index with query" do
         get :index, :query => '2005'
         response.should be_success

data/spec/controllers/series_statements_controller_spec.rb

@@ -55,7 +55,7 @@ describe SeriesStatementsController do
         series_statement = FactoryGirl.create(:series_statement)
         get :show, :id => series_statement.id
         assigns(:series_statement).should eq(series_statement)
-        response.should redirect_to series_statement_manifestations_url(assigns(:series_statement))
+        response.should be_success
       end
     end
 
@@ -66,7 +66,7 @@ describe SeriesStatementsController do
         series_statement = FactoryGirl.create(:series_statement)
         get :show, :id => series_statement.id
         assigns(:series_statement).should eq(series_statement)
-        response.should redirect_to series_statement_manifestations_url(assigns(:series_statement))
+        response.should be_success
       end
     end
 
@@ -77,7 +77,7 @@ describe SeriesStatementsController do
         series_statement = FactoryGirl.create(:series_statement)
         get :show, :id => series_statement.id
         assigns(:series_statement).should eq(series_statement)
-        response.should redirect_to series_statement_manifestations_url(assigns(:series_statement))
+        response.should be_success
       end
     end
 
@@ -86,7 +86,7 @@ describe SeriesStatementsController do
         series_statement = FactoryGirl.create(:series_statement)
         get :show, :id => series_statement.id
         assigns(:series_statement).should eq(series_statement)
-        response.should redirect_to series_statement_manifestations_url(assigns(:series_statement))
+        response.should be_success
       end
     end
   end

data/spec/dummy/app/controllers/application_controller.rb

@@ -10,6 +10,7 @@ class ApplicationController < ActionController::Base
   enju_library
   enju_inventory
   enju_event
+  enju_subject
 
   private
   def render_403

data/spec/dummy/app/models/ability.rb

@@ -36,8 +36,7 @@
           Realize,
           RealizeType,
           ResourceImportFile,
-          SeriesStatement,
-          SeriesStatementRelationship
+          SeriesStatement
         ]
         can :update, [
           ContentType,
@@ -95,8 +94,7 @@
           Produce,
           Realize,
           ResourceImportFile,
-          SeriesStatement,
-          SeriesStatementRelationship
+          SeriesStatement
         ]
         can :read, [
           CarrierType,

data/spec/dummy/config/application.rb

@@ -62,5 +62,6 @@ require 'enju_event'
 require 'enju_manifestation_viewer'
 require 'enju_export'
 require 'enju_ndl'
+require 'enju_subject'
 require 'mobylette'
 require 'plugins'

data/spec/dummy/db/migrate/029_create_subjects.rb

@@ -0,0 +1,27 @@
+class CreateSubjects < ActiveRecord::Migration
+  def self.up
+    create_table :subjects do |t|
+      t.integer :parent_id
+      t.integer :use_term_id
+      t.string :term
+      t.text :term_transcription
+      t.integer :subject_type_id, :null => false
+      t.text :scope_note
+      t.text :note
+      t.integer :required_role_id, :default => 1, :null => false
+      t.integer :lock_version, :default => 0, :null => false
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.datetime :deleted_at
+    end
+    add_index :subjects, :term
+    add_index :subjects, :parent_id
+    add_index :subjects, :use_term_id
+    add_index :subjects, :subject_type_id
+    add_index :subjects, :required_role_id
+  end
+
+  def self.down
+    drop_table :subjects
+  end
+end

data/spec/dummy/db/migrate/142_create_classifications.rb

@@ -0,0 +1,19 @@
+class CreateClassifications < ActiveRecord::Migration
+  def self.up
+    create_table :classifications do |t|
+      t.integer :parent_id
+      t.string :category, :null => false
+      t.text :note
+      t.integer :classification_type_id, :null => false
+
+      t.timestamps
+    end
+    add_index :classifications, :parent_id
+    add_index :classifications, :category
+    add_index :classifications, :classification_type_id
+  end
+
+  def self.down
+    drop_table :classifications
+  end
+end

data/spec/dummy/db/migrate/144_create_classification_types.rb

@@ -0,0 +1,16 @@
+class CreateClassificationTypes < ActiveRecord::Migration
+  def self.up
+    create_table :classification_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :classification_types
+  end
+end

data/spec/dummy/db/migrate/145_create_subject_heading_types.rb

@@ -0,0 +1,16 @@
+class CreateSubjectHeadingTypes < ActiveRecord::Migration
+  def self.up
+    create_table :subject_heading_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :subject_heading_types
+  end
+end

data/spec/dummy/db/migrate/146_create_subject_types.rb

@@ -0,0 +1,16 @@
+class CreateSubjectTypes < ActiveRecord::Migration
+  def self.up
+    create_table :subject_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :subject_types
+  end
+end