fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM-2795: I solved the problem with port

Browse Source
This commit is contained in:
Paula V. Quispe
2015-05-21 15:19:42 -04:00
parent 815d622258
commit 210b4c4883
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -75,6 +75,7 @@ CLI::taskOpt("multiple", "Restore from multiple compresed enumerated files.", "m
CLI::taskOpt("workspace", "Select which workspace to restore if multiple workspaces are present in the archive.", CLI::taskOpt("workspace", "Select which workspace to restore if multiple workspaces are present in the archive.",
"w:", "workspace="); "w:", "workspace=");
CLI::taskOpt("lang", "You must specify language on which rebuild of the case cache list builder will be done; if you don't specify this, it will use 'en' by default", "l:","lang="); CLI::taskOpt("lang", "You must specify language on which rebuild of the case cache list builder will be done; if you don't specify this, it will use 'en' by default", "l:","lang=");
CLI::taskOpt("port", "You must specify mysql port.", "p:");
CLI::taskRun("run_workspace_restore"); CLI::taskRun("run_workspace_restore");
CLI::taskName('cacheview-repair'); CLI::taskName('cacheview-repair');
@@ -551,6 +552,7 @@ function run_workspace_restore($args, $opts) {
} }
$info = array_key_exists("info", $opts); $info = array_key_exists("info", $opts);
$lang = array_key_exists("lang", $opts) ? $opts['lang'] : 'en'; $lang = array_key_exists("lang", $opts) ? $opts['lang'] : 'en';
$port = array_key_exists("port", $opts) ? $opts['port'] : '';
if ($info) { if ($info) {
workspaceTools::getBackupInfo($filename); workspaceTools::getBackupInfo($filename);
} else { } else {
@@ -578,7 +580,7 @@ function run_workspace_restore($args, $opts) {
CLI::error("Please, you should use -m parameter to restore them.\n"); CLI::error("Please, you should use -m parameter to restore them.\n");
return; return;
} }
workspaceTools::restore($filename, $workspace, $dstWorkspace, $overwrite, $lang); workspaceTools::restore($filename, $workspace, $dstWorkspace, $overwrite, $lang, $port );
} }
} }
} }

6
workflow/engine/classes/class.wsTools.php
View File

@@ -1434,7 +1434,7 @@ class workspaceTools
* @param string $newWorkspaceName if defined, supplies the name for the * @param string $newWorkspaceName if defined, supplies the name for the
* workspace to restore to * workspace to restore to
*/ */
static public function restore($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true, $lang = 'en') static public function restore($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true, $lang = 'en', $port = '')
{ {
G::LoadThirdParty('pear/Archive', 'Tar'); G::LoadThirdParty('pear/Archive', 'Tar');
$backup = new Archive_Tar($filename); $backup = new Archive_Tar($filename);
@@ -1553,6 +1553,9 @@ class workspaceTools
CLI::logging(CLI::error("Could not get the shared folder permissions, not changing workspace permissions") . "\n"); CLI::logging(CLI::error("Could not get the shared folder permissions, not changing workspace permissions") . "\n");
} }
list ($dbHost, $dbUser, $dbPass) = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH)); list ($dbHost, $dbUser, $dbPass) = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
if($port != ''){
$dbHost = $dbHost.$port;
}
$aParameters = array('dbHost'=>$dbHost,'dbUser'=>$dbUser,'dbPass'=>$dbPass); $aParameters = array('dbHost'=>$dbHost,'dbUser'=>$dbUser,'dbPass'=>$dbPass);
CLI::logging("> Connecting to system database in '$dbHost'\n"); CLI::logging("> Connecting to system database in '$dbHost'\n");
$link = mysql_connect($dbHost, $dbUser, $dbPass); $link = mysql_connect($dbHost, $dbUser, $dbPass);
@@ -2011,6 +2014,7 @@ class workspaceTools
$data = $row; $data = $row;
$data["DEL_INDEX"] = $row["APP_DEL_INDEX"]; $data["DEL_INDEX"] = $row["APP_DEL_INDEX"];
$listPaused = new ListPaused(); $listPaused = new ListPaused();
$listPaused ->remove($row["APP_UID"],$row["APP_DEL_INDEX"],$data);
$listPaused->setDeleted(false); $listPaused->setDeleted(false);
$listPaused->create($data); $listPaused->create($data);
} }