From e10a1ec3831bd644235f14832fe6992e4cc8352f Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Tue, 25 Jun 2013 13:50:38 -0400
Subject: [PATCH] BUG-8665 32K Issue - Maximum of folder in shared/sites/files
 IMPROVEMENT

- No se modificaba la estructura porque no se tenia seteado la variable ENVIRONMENT_SETTINGS.
- Se modifico la funcion upgradeCasesDirectoryStructure para que cree la variable si no existe.
- Se movio la funcion upgradeCasesDirectoryStructure para que sea independiente al realizar el upgrade.
- se creo la funcion update-structure-directories para ejecutar por consola teniendo como parametro el workspace.
---
 workflow/engine/bin/tasks/cliWorkspaces.php | 32 ++++++++++++++++++++-
 workflow/engine/classes/class.wsTools.php   | 17 +++++++----
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php
index 661396509..c922b89cd 100755
--- a/workflow/engine/bin/tasks/cliWorkspaces.php
+++ b/workflow/engine/bin/tasks/cliWorkspaces.php
@@ -160,6 +160,18 @@ EOT
 CLI::taskArg('workspace-name', true, true);
 CLI::taskRun(run_translation_upgrade);
 
+CLI::taskName('update-structure-directories');
+CLI::taskDescription(<<<EOT
+  Updating the structure directories of a workspaces
+
+  Specify the WORKSPACE to updating to a different workspace name.
+EOT
+);
+//CLI::taskArg('workspace', true);
+CLI::taskOpt("workspace", "Select which workspace to updating the structure of directories, if multiple workspaces are present in the archive.",
+             "w:", "workspace=");
+CLI::taskRun(runStructureDirectories);
+
   /**
    * Function run_info
    * access public
@@ -460,4 +472,22 @@ function run_workspace_restore($args, $opts) {
   }
 }
 
-?>
+function runStructureDirectories($command, $args) {
+    $workspaces = get_workspaces_from_args($command);
+    $count = count($workspaces);
+    $errors = false;
+    $countWorkspace = 0;
+    foreach ($workspaces as $index => $workspace) {
+        try {
+            $countWorkspace++;
+            CLI::logging("Updating workspaces ($countWorkspace/$count): " . CLI::info($workspace->name) . "\n");
+            $workspace->updateStructureDirectories($workspace->name);
+            $workspace->close();
+        } catch (Exception $e) {
+            CLI::logging("Errors upgrading workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n");
+            $errors = true;
+        }
+    }
+}
+
+
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index bafa964fd..1cbc00d91 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -89,7 +89,14 @@ class workspaceTools
         $stop = microtime(true);
         $final = $stop - $start;
         CLI::logging("<*>   Updating cache view Process took $final seconds.\n");
+    }
 
+    /**
+     * Updating cases directories structure
+     *
+     */
+    public function updateStructureDirectories($workSpace = SYS_SYS)
+    {
         $start = microtime(true);
         CLI::logging("> Updating cases directories structure...\n");
         $this->upgradeCasesDirectoryStructure($workSpace);
@@ -583,13 +590,11 @@ class workspaceTools
         $this->initPropel(true);
         G::LoadClass("configuration");
         $conf = new Configurations();
-        if ($conf->exists("ENVIRONMENT_SETTINGS")) {
-            $conf->setDirectoryStructureVer(2);
-            CLI::logging(CLI::info("Version Directory Structure is 2 now.\n"));
-        } else {
-            CLI::logging(CLI::error("Error: found at try to use ENVIRONMENT_SETTINGS row.\n"));
-            return;
+        if (!$conf->exists("ENVIRONMENT_SETTINGS")) {
+            $conf->saveConfig( 'ENVIRONMENT_SETTINGS', '' );
         }
+        $conf->setDirectoryStructureVer(2);
+        CLI::logging(CLI::info("Version Directory Structure is 2 now.\n"));
     }
 
     /**