enju_biblio 0.1.0.pre46 → 0.1.0.pre47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9f724ae9bc949082a242108f0b9763eca797c1
-  data.tar.gz: 0655a86c9ca4d9b17402c083cd2c36ffb5f2e90b
+  metadata.gz: 970476b1a332a001fdc9a9d03fde20c5c43a90bb
+  data.tar.gz: be0f519d6b1ce53fca5c3e160992ca57adad4bd8
 SHA512:
-  metadata.gz: c1b83d9791c1147dccbbdd1e56e0b97aa771d0f8b323109f13211c5d3b79ce031796fa5146edeeebcb737ec32c1319fab791dc3192ce3903098776bec66f4bc3
-  data.tar.gz: 215fa31378a4b9ec227c65c0aedfa70d8545f038c2688d26ca952ce4d2266cfa3128899f2ab3e2625759394f30468667f44c50fe3bfa3cb3f92c4d15bc6c16e8
+  metadata.gz: 29c997f432d291626f016647c2500c4b87496aabc19cb7424bc7371614cf4a5fd9af527e354b20c64c8a881ca4de97c8063487f25e3269bde7b5ec7b1b4f71eb
+  data.tar.gz: b60c74322468dfd9bd5eef82a90188a16d248df23b645bba1e3507620f256ab4a042bcfbf19f2e61f233e8a818a30b9d53a876c72d0131001a54651615d38b09

data/app/models/resource_import_file.rb

@@ -405,6 +405,20 @@ class ResourceImportFile < ActiveRecord::Base
     subjects
   end
 
+  def import_classification(row)
+    classifications = []
+    classification_number = YAML.load(row['classification'].to_s)
+    return nil unless classification_number
+    classification_number.map{|k, v|
+      classification_type = ClassificationType.where(:name => k.downcase).first
+      classification = Classification.new(:category => v.to_s)
+      classification.classification_type = classification_type
+      classification.save!
+      classifications << classification
+    }
+    classifications
+  end
+
   def create_item(row, manifestation)
     shelf = Shelf.where(:name => row['shelf'].to_s.strip).first || Shelf.web
     bookstore = Bookstore.where(:name => row['bookstore'].to_s.strip).first
@@ -520,7 +534,6 @@ class ResourceImportFile < ActiveRecord::Base
       creator_agents = Agent.import_agents(creators_list)
       contributor_agents = Agent.import_agents(contributors_list)
       publisher_agents = Agent.import_agents(publishers_list)
-      #classification = Classification.where(:category => row['classification'].to_s.strip).first
       subjects = import_subject(row) if defined?(EnjuSubject)
       case options[:edit_mode]
       when 'create'
@@ -614,6 +627,13 @@ class ResourceImportFile < ActiveRecord::Base
         end
       end
 
+      if defined?(EnjuSubject)
+        classifications = import_classification(row)
+        if classifications.present?
+          manifestation.classifications << classifications
+        end
+      end
+
       manifestation.save!
 
       if options[:edit_mode] == 'create'

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

@@ -118,6 +118,6 @@
     <%- end -%>
   </ul>
   <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.manifestation')), manifestations_path(:query => @agent.full_name) -%></li>
+    <li><%= link_to t('page.listing', :model => t('activerecord.models.manifestation')), manifestations_path(:query => "\"#{@agent.full_name}\"") -%></li>
   </ul>
 </div>

data/app/views/import_requests/new.html.erb

@@ -7,7 +7,7 @@
   <%= f.error_messages -%>
   <div class="field">
     <%= f.label :isbn -%><br />
-    <%= f.text_field :isbn, :class => 'resource_isbn_issn' -%>
+    <%= f.search_field :isbn, :class => 'resource_isbn_issn' -%>
 
     <%= f.submit 'data-disable-with' => t('page.saving') %>
   </div>

data/app/views/manifestations/_show.mods.builder

@@ -71,16 +71,16 @@
           xml.topic subject.term
         end
       }
-      manifestation.subjects.collect(&:classifications).flatten.each do |classification|
+      manifestation.classifications.each do |classification|
         xml.classification classification.category, 'authority' => classification.classification_type.name
       end
     end
     xml.abstract manifestation.description
     xml.note manifestation.note
-    manifestation.identifier_content(:isbn).each do |i|
+    manifestation.identifier_contents(:isbn).each do |i|
       xml.identifier i, :type => 'isbn'
     end
-    manifestation.identifier_content(:lccn).each do |l|
+    manifestation.identifier_contents(:lccn).each do |l|
       xml.identifier l, :type => 'lccn'
     end
     xml.recordInfo{

data/app/views/manifestations/_show.rdf.builder

@@ -71,16 +71,16 @@
           xml.topic subject.term
         end
       }
-      manifestation.subjects.collect(&:classifications).flatten.each do |classification|
+      manifestation.classifications.each do |classification|
         xml.classification classification.category, 'authority' => classification.classification_type.name
       end
     end
     xml.abstract manifestation.description
     xml.note manifestation.note
-    manifestation.identifier_content(:isbn).each do |i|
+    manifestation.identifier_contents(:isbn).each do |i|
       xml.identifier i, :type => 'isbn'
     end
-    manifestation.identifier_content(:lccn).each do |l|
+    manifestation.identifier_contents(:lccn).each do |l|
       xml.identifier l, :type => 'lccn'
     end
     xml.recordInfo{

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

@@ -31,12 +31,17 @@
       <% if defined?(EnjuCirculation) %>
         <td>
           <%= item.circulation_status.display_name.localize if item.circulation_status -%>
-          <%- if item.rent? -%>
+          <% if item.retained? %>
+            <br />
+            <%= t('reserve.retained') %>
+          <% end %>
+          <% if item.rent? %>
+            <br />
             (
               <%= t('activerecord.attributes.checkout.due_date') -%>:
               <%= l(item.checkouts.first.due_date, :format => :short) -%>
             )
-          <%- end -%>
+          <% end %>
         </td>
       <% end %>
     </tr>

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre46"
+  VERSION = "0.1.0.pre47"
 end