Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05

[pettanr/pettanr.git] / app / controllers / provider_statuses_controller.rb

diff --git a/app/controllers/provider_statuses_controller.rb b/app/controllers/provider_statuses_controller.rb
index e55c673..ab5c043 100644 (file)
--- a/app/controllers/provider_statuses_controller.rb
+++ b/app/controllers/provider_statuses_controller.rb
@@ -1,36 +1,6 @@
 class ProviderStatusesController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
-  before_filter :authenticate_admin!, :only => [:index, :show, :edit, :update, :destroy, :licenses_import, :artists_import, :original_pictures_import, :import]
-  
-  private
-  
-  def licenses_port
-    licenses = export_by('licenses_export', @provider_status, params[:date])
-    return nil unless licenses
-    ProviderLicense.import @provider_status.provider.id, licenses
-  end
-  
-  def artists_port
-    artists = export_by('artists_export', @provider_status, params[:date])
-    return nil unless artists
-    ProviderArtist.import @provider_status.provider.id, artists
-  end
-  
-  def original_pictures_port
-    original_pictures = export_by('original_pictures_export', @provider_status, params[:date])
-    return nil unless original_pictures
-    pictures = export_by('pictures_export', @provider_status, params[:date])
-    return nil unless pictures
-    ProviderOriginalPicture.import @provider_status.provider.id, original_pictures, pictures
-  end
-  
-  def port
-    exports = export_by('export', @provider_status, params[:date])
-    return nil unless exports
-    ProviderStatus.import @provider_status.provider.id, exports
-  end
-  
-  public
+  before_filter :authenticate_admin!, :only => [:index, :show, :edit, :update, :destroy, :licenses_import, :artists_import, :original_pictures_import, :import, :import_all]
   
   def index
     @page = ProviderStatus.page params[:page]
@@ -99,7 +69,7 @@ class ProviderStatusesController < ApplicationController
   def licenses_import
     @provider_status = ProviderStatus.show(params[:id], @admin)
     raise ActiveRecord::Forbidden if @provider_status.status == 0
-    @failures = licenses_port
+    @failures = @provider_status.licenses_import params[:date]
     respond_to do |format|
       format.html # show.html.erb
       format.json { render :json => @failures.to_json() }
@@ -109,7 +79,7 @@ class ProviderStatusesController < ApplicationController
   def artists_import
     @provider_status = ProviderStatus.show(params[:id], @admin)
     raise ActiveRecord::Forbidden if @provider_status.status == 0
-    @failures = artists_port
+    @failures = @provider_status.artists_import params[:date]
     respond_to do |format|
       format.html # show.html.erb
       format.json { render :json => @failures.to_json() }
@@ -119,7 +89,7 @@ class ProviderStatusesController < ApplicationController
   def original_pictures_import
     @provider_status = ProviderStatus.show(params[:id], @admin)
     raise ActiveRecord::Forbidden if @provider_status.status == 0
-    @failures = original_pictures_port
+    @failures = @provider_status.original_pictures_import params[:date]
     respond_to do |format|
       format.html # show.html.erb
       format.json { render :json => @failures.to_json() }
@@ -136,4 +106,16 @@ class ProviderStatusesController < ApplicationController
     end
   end
   
+  def import_all
+    ProviderStatus.find(:all).each do |provider_status|
+      next unless provider_status.status == 3
+      @provider_status = provider_status
+      @failures = port
+    end
+    respond_to do |format|
+      format.html { render :text => 'ok'}
+      format.json { render :json => {}.to_json() }
+    end
+  end
+  
 end