enju_biblio 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0785940d4a8dcfe3c9e349ce3dec613a89a2969d'
-  data.tar.gz: aa2203a5c519a56368ef69c67f540f2b55ca8def
+  metadata.gz: d2f12a2708c3326ac6d4ef0bbc4a62a8c0d656c8
+  data.tar.gz: 9d6e7a191c6ce4bab308b751a2183e960b015efe
 SHA512:
-  metadata.gz: 9411c7b99237bf3e84b1a2196351dc10d67f295d6adf7c8e260852cc80c555f8166974c2d91d54c29c3820ee01067fe75113a2b81a6e19581bb1e1169d370596
-  data.tar.gz: c6dda1dff919d4a866c32aeae49c78ece33b1ab3146cf0938374cd4392746e924608b5e7ea94a02c22e5ee44828fd6fe2257ea861c603ddc008aef4268e6fd2a
+  metadata.gz: ce432c54b88f2411c4b39edf21dd724f23757fca0b2cb8ebe96aa28fb121a7fb7f06ce47f3b256f663d40da9bae8ce40232c852efa61f2759b03ff77c14fa562
+  data.tar.gz: 2c5750574eb3df90f4bd4a881f69563ea2a633ef996e6d0d96518a401888593cd1d246bf69e41eab19afb6970bfd335cfbf606ab31bd28d46c52f7471c98a833

data/app/controllers/picture_files_controller.rb

@@ -31,7 +31,7 @@ class PictureFilesController < ApplicationController
       size = 'medium'
     end
 
-    if @picture_file.picture.path
+    if @picture_file.picture.exists?
       if ENV['ENJU_STORAGE'] == 's3'
         file = Faraday.get(@picture_file.picture.expiring_url).body.force_encoding('UTF-8')
       else

data/app/models/item.rb

@@ -118,5 +118,5 @@ end
 #  binding_item_identifier :string
 #  binding_call_number     :string
 #  binded_at               :datetime
-#  manifestation_id        :integer
+#  manifestation_id        :integer          not null
 #

data/app/models/manifestation.rb

@@ -539,12 +539,18 @@ class Manifestation < ActiveRecord::Base
       manifestation_updated_at
       manifestation_identifier
       access_address
+      description
       note
       extent
       dimensions
       carrier_type
       edition
       edition_string
+      volume_number
+      volume_number_string
+      issue_number
+      issue_number_string
+      serial_number
     )
 
     header += IdentifierType.order(:position).pluck(:name)
@@ -557,6 +563,7 @@ class Manifestation < ActiveRecord::Base
       item_id
       item_identifier
       call_number
+      item_note
     )
     case role.to_sym
     when :Administrator, :Librarian
@@ -615,12 +622,18 @@ class Manifestation < ActiveRecord::Base
         item_lines << updated_at
         item_lines << manifestation_identifier
         item_lines << access_address
-        item_lines << note
+        item_lines << description.try(:gsub, /\r?\n/, '\n')
+        item_lines << note.try(:gsub, /\r?\n/, '\n')
         item_lines << extent
         item_lines << dimensions
         item_lines << carrier_type.name
         item_lines << edition
         item_lines << edition_string
+        item_lines << volume_number
+        item_lines << volume_number_string
+        item_lines << issue_number
+        item_lines << issue_number_string
+        item_lines << serial_number
 
         IdentifierType.order(:position).pluck(:name).each do |identifier_type|
           if identifier_contents(identifier_type.to_sym).first
@@ -649,6 +662,7 @@ class Manifestation < ActiveRecord::Base
         item_lines << i.id
         item_lines << i.item_identifier
         item_lines << i.call_number
+        item_lines << i.note.try(:gsub, /\r?\n/, '\n')
         case options[:role].to_sym
         when :Administrator, :Librarian
           item_lines << i.price
@@ -695,12 +709,18 @@ class Manifestation < ActiveRecord::Base
       line << updated_at
       line << manifestation_identifier
       line << access_address
-      line << note
+      line << description.try(:gsub, /\r?\n/, '\n')
+      line << note.try(:gsub, /\r?\n/, '\n')
       line << extent
       line << dimensions
       line << carrier_type.name
       line << edition
       line << edition_string
+      line << volume_number
+      line << volume_number_string
+      line << issue_number
+      line << issue_number_string
+      line << serial_number
 
       IdentifierType.order(:position).pluck(:name).each do |identifier_type|
         if identifier_contents(identifier_type.to_sym).first

data/app/models/resource_import_file.rb

@@ -338,7 +338,7 @@ class ResourceImportFile < ActiveRecord::Base
         end
 
         item.price = row['item_price'] if row['item_price'].present?
-        item.note = row['item_note'] if row['item_note'].present?
+        item.note = row['item_note'].try(:gsub, /\\n/, "\n") if row['item_note'].present?
         item.url = row['item_url'] if row['item_url'].present?
 
         if row['include_supplements']
@@ -522,7 +522,7 @@ class ResourceImportFile < ActiveRecord::Base
       binding_call_number: row['binding_call_number'],
       binded_at: binded_at,
       url: row['item_url'],
-      note: row['item_note']
+      note: row['item_note'].try(:gsub, /\\n/, "\n")
     )
     manifestation.items << item
     if defined?(EnjuCirculation)
@@ -641,9 +641,9 @@ class ResourceImportFile < ActiveRecord::Base
         :depth => row['depth'],
         :height => row['height'],
         :price => row['manifestation_price'],
-        :description => row['description'],
+        :description => row['description'].try(:gsub, /\\n/, "\n"),
         #:description_transcription => row['description_transcription'],
-        :note => row['note'],
+        :note => row['note'].try(:gsub, /\\n/, "\n"),
         :statement_of_responsibility => row['statement_of_responsibility'],
         :access_address => row['access_address'],
         :manifestation_identifier => row['manifestation_identifier'],

data/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb

@@ -0,0 +1,5 @@
+class SetNotNullToManifestationIdOnItems < ActiveRecord::Migration
+  def change
+    change_column_null :items, :manifestation_id, false
+  end
+end

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end