end
def self.import pid, original_pictures, pictures
- res = {:original_pictures => [], :pictures => [], :resource_pictures => []}
+ res = nil
ProviderOriginalPicture.transaction do
r = ProviderOriginalPicture.import_original_pictures(pid, original_pictures)
- res[:original_pictures] = r
- raise ActiveRecord::Rollback if r.any?
+ if r.any?
+ res = OriginalPictureImportResult.new r
+ raise ActiveRecord::Rollback
+ end
r = ProviderOriginalPicture.import_pictures(pid, pictures)
- res[:pictures] = r
- raise ActiveRecord::Rollback if r.any?
+ if r.any?
+ res = PictureImportResult.new r
+ raise ActiveRecord::Rollback
+ end
r = ProviderOriginalPicture.import_resource_pictures(pid, original_pictures)
- res[:resource_pictures] = r
- raise ActiveRecord::Rollback if r.any?
+ if r.any?
+ res = ResourcePictureImportResult.new r
+ raise ActiveRecord::Rollback
+ end
+ res = OriginalPictureImportResult.new []
end
res
end