From 6175ad3b59344794edd2c3f9924eaaec695474bc Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Mon, 18 Sep 2017 12:38:16 +0200
Subject: [PATCH] The new directory structure was not applied when migrating to
 DMS 1.6.0

---
 ...rb => 20170422104901_migrate_documents.rb} | 56 ++++++++++++++-----
 1 file changed, 42 insertions(+), 14 deletions(-)
 rename db/migrate/{20170418104901_migrate_documents.rb => 20170422104901_migrate_documents.rb} (62%)

diff --git a/db/migrate/20170418104901_migrate_documents.rb b/db/migrate/20170422104901_migrate_documents.rb
similarity index 62%
rename from db/migrate/20170418104901_migrate_documents.rb
rename to db/migrate/20170422104901_migrate_documents.rb
index 9f9e7a79..879af8f6 100644
--- a/db/migrate/20170418104901_migrate_documents.rb
+++ b/db/migrate/20170422104901_migrate_documents.rb
@@ -36,25 +36,39 @@ class MigrateDocuments < ActiveRecord::Migration
                     folder = self.storage_base_path(dmsf_file_revision)
                     Dir.rmdir(folder) if (folder && (Dir.entries(folder).size == 2))
                   rescue Exception => e
-                    say "DmsfFileRevisions ID #{dmsf_file_revision.id}: #{e.message}"
+                    msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: #{e.message}"
+                    say msg
+                    Rails.logger.error msg
                   end
                 else
-                  say "DmsfFileRevisions ID #{dmsf_file_revision.id}: Target '#{target}' exists"
+                  msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: Target '#{target}' exists"
+                  say msg
+                  Rails.logger.error msg
                 end
               else
-                say "DmsfFileRevisions ID #{dmsf_file_revision.id}: target = nil"
+                msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: target = nil"
+                say msg
+                Rails.logger.error msg
               end
             else
-              say "DmsfFileRevisions ID #{dmsf_file_revision.id}: Origin '#{origin}' doesn't exist"
+              msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: Origin '#{origin}' doesn't exist"
+              say msg
+              Rails.logger.error msg
             end
           else
-            say "DmsfFileRevisions ID #{dmsf_file_revision.id}: disk_file = nil"
+            msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: disk_file = nil"
+            say msg
+            Rails.logger.error msg
           end
         else
-          say "DmsfFile ID #{dmsf_file_revision.dmsf_file.id}: project = nil"
+          msg = "DmsfFile ID #{dmsf_file_revision.dmsf_file.id}: project = nil"
+          say msg
+          Rails.logger.error msg
         end
       else
-        say "DmsfFileRevisions ID #{dmsf_file_revision.id}: dmsf_file = nil"
+        msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: dmsf_file = nil"
+        say msg
+        Rails.logger.error msg
       end
     end
   end
@@ -75,25 +89,39 @@ class MigrateDocuments < ActiveRecord::Migration
                     folder = dmsf_file_revision.storage_base_path
                     Dir.rmdir(folder) if (folder && (Dir.entries(folder).size == 2))
                   rescue Exception => e
-                    say "DmsfFileRevisions ID #{dmsf_file_revision.id}: #{e.message}"
+                    msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: #{e.message}"
+                    say msg
+                    Rails.logger.error msg
                   end
                 else
-                  say "DmsfFileRevisions ID #{dmsf_file_revision.id}: Target '#{target}' exists"
+                  msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: Target '#{target}' exists"
+                  say msg
+                  Rails.logger.error msg
                 end
               else
-                say "DmsfFileRevisions ID #{dmsf_file_revision.id}: target = nil"
+                msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: target = nil"
+                say msg
+                Rails.logger.error msg
               end
             else
-              say "DmsfFileRevisions ID #{dmsf_file_revision.id}: Origin '#{origin}' doesn't exist"
+              msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: Origin '#{origin}' doesn't exist"
+              say msg
+              Rails.logger.error msg
             end
           else
-            say "DmsfFileRevisions ID #{dmsf_file_revision.id}: disk_file = nil"
+            msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: disk_file = nil"
+            say msg
+            Rails.logger.error msg
           end
         else
-          say "DmsfFile ID #{dmsf_file_revision.dmsf_file.id}: project = nil"
+          msg = "DmsfFile ID #{dmsf_file_revision.dmsf_file.id}: project = nil"
+          say msg
+          Rails.logger.error msg
         end
       else
-        say "DmsfFileRevisions ID #{dmsf_file_revision.id}: dmsf_file = nil"
+        msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: dmsf_file = nil"
+        say msg
+        Rails.logger.error msg
       end
     end
   end