OSDN Git Service

t#30516:fix import rp
[pettanr/pettanr.git] / app / models / provider_original_picture.rb
index e8e87a0..86e6df2 100644 (file)
@@ -22,9 +22,9 @@ class ProviderOriginalPicture < ActiveRecord::Base
   end
   
   def self.modify_picture attr
-    p = Picture.find_by_original_picture_id_and_revision(attr['original_picture_id'], attr['revision']) || Picture.new
-    p.attributes = attr
-    p
+    pc = Picture.find_by_original_picture_id_and_revision(attr['original_picture_id'], attr['revision']) || Picture.new
+    pc.attributes = attr
+    pc
   end
   
   def self.modify_resource_picture attr
@@ -126,7 +126,8 @@ class ProviderOriginalPicture < ActiveRecord::Base
     imager = PettanImager.load(picture_data)
     return providers_resource_picture_attr unless imager
     resource_picture = ProviderOriginalPicture.modify_resource_picture providers_resource_picture_attr
-    return providers_resource_picture_attr unless resource_picture.store(imager)
+    return providers_resource_picture_attr unless resource_picture.store_picture_with_gif(imager)
+    return providers_resource_picture_attr unless resource_picture.save
     nil
   end