:Story ID:1616390: Restructured Migration Wizard according to specification file.

Committed by: Jarrett Jordaan Reviewed by: Philip Arkcoll

:Story ID:1616390: Restructured Migration Wizard according to specification file.
Committed by: Jarrett Jordaan Reviewed by: Philip Arkcoll
Jarrett Jordaan
1 parent db1c5f1c
Showing 16 changed files with 87 additions and 42 deletions
setup/migrate/config/commercial_config.xml
setup/migrate/config/community_config.xml
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateDatabase.php
setup/migrate/steps/migrateServices.php
setup/migrate/templates/database.tpl
setup/migrate/templates/installation.tpl
setup/migrate/templates/installation_confirm.tpl
setup/wizard/path.php
setup/wizard/resources/css/wizard.css
setup/wizard/steps/complete.php
setup/wizard/steps/install.php
setup/wizard/steps/installtype.php
setup/wizard/templates/complete.tpl
setup/wizard/templates/installtype.tpl
setup/wizard/templates/license.tpl
@@ -10,8 +10,8 @@
 <migrate version="3.7" type="Commercial Edition">
     <steps>
         <step name="Current Installation">installation</step>
-        <step name="Database Migration">database</step>
-       	<step name="Deactivate Services">services</step>
+        <step name="Database Export">database</step>
+       	<step name="Pre Migration">services</step>
         <step name="Complete">complete</step>
     </steps>
  </migrate>
 \ No newline at end of file
@@ -10,8 +10,8 @@
 <migrate version="3.7" type="Community Edition">
     <steps>
         <step name="Current Installation">installation</step>
-        <step name="Database Migration">database</step>
-       	<step name="Deactivate Services">services</step>
+        <step name="Database Export">database</step>
+       	<step name="Pre Migration">services</step>
         <step name="Complete">complete</step>
     </steps>
  </migrate>
 \ No newline at end of file
@@ -53,7 +53,8 @@ class migrateComplete extends Step {
     private $database_check = 'tick';
     protected $conf = array();
     protected $silent = true;
-
+	protected $mysqlServiceName = "KTMysql";
+	
     function doStep() {
     	$this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent);
         $this->doRun();
@@ -128,6 +129,9 @@ class migrateComplete extends Step {
     		$this->temp_variables['services'][$serv->getName()]['class'] = $state;
     		$this->temp_variables['services'][$serv->getName()]['name'] = $serv->getName();
     	}
+    	if(!$this->checkMysql()) {
+    		return false;
+    	}
     	if ($this->services_check != 'tick') {
     		return false;
     	}
@@ -136,6 +140,41 @@ class migrateComplete extends Step {
     }
  
     /**
+     * Check if services are uninstall
+     *
+     */
+    private function checkMysql() {
+    	$running = false;
+    	if(WINDOWS_OS) {
+			$cmd = "sc query {$this->mysqlServiceName}";
+			$response = $this->util->pexec($cmd);
+			if($response['out']) {
+				$state = preg_replace('/^STATE *\: *\d */', '', trim($response['out'][3])); // Status store in third key
+			}
+			if($state == "STARTED") {
+				return true;
+			}
+    	} else {
+    		$installation = $this->getDataFromSession("installation"); // Get installation directory
+    		$mysqlPid = $installation['location'].DS."mysql".DS."data".DS."mysqld.pid";
+    		if(file_exists($mysqlPid))
+    			$running = true;
+    	}
+    	if($running) {
+    		$this->temp_variables['services']['KTMysql']['class'] = "cross";
+    		$this->temp_variables['services']['KTMysql']['name'] = "KTMysql";
+    		$this->temp_variables['services']['KTMysql']['msg'] = "Service Running";
+    		$this->error[] = "Service : KTMysql running.<br/>";
+    		return false;
+    	} else {
+    		$this->temp_variables['services']['KTMysql']['class'] = "tick";
+    		$this->temp_variables['services']['KTMysql']['name'] = "KTMysql";
+    		$this->temp_variables['services']['KTMysql']['msg'] = "Service has been uninstalled";
+    		return true;
+    	}
+    }
+    
+    /**
      * Set all silent mode varibles
      *
      */
@@ -168,8 +168,8 @@ class migrateDatabase extends Step
 		}
 		$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
 		if($noFile) {
-			$this->error[]['error'] = "Could not connect to the KnowledgeTree Database";
-			$this->error[]['msg'] = "Make sure all KnowledgeTree Services are running.";
+			$this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database";
+			$this->error[]['msg'] = "Please ensure that all KnowledgeTree Services are running.";
 			$this->error[]['cmd'] = "<p class=\"description\">Click <b>Next</b> after resolving the above errors.</p>";
 			$this->temp_variables['manual_export'] = "";
 		} else {
@@ -187,6 +187,7 @@ class migrateServices extends Step
     }
  
     private function mysqlRunning() {
+    	$running = false;
     	if(WINDOWS_OS) {
 			$cmd = "sc query {$this->mysqlServiceName}";
 			$response = $this->util->pexec($cmd);
@@ -11,8 +11,7 @@
 			//print_r($errors);
 		?>
 		<?php if(empty($errors)) { ?>
-<p class="description">The Setup Wizard will now migrate your existing database to the new Zend Server stack. This process may take
-                        several minutes to complete.</p><br />
+<p class="description">The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.</p><br />
                         <span class="error">Please ensure that your database is backed up before proceeding. If you need assistance with backing up see the &nbsp;<a class="description_click" target="_blank" href="http://wiki.knowledgetree.com/Backing_up_and_restoring_KnowledgeTree">'Backing up and restoring KnowledgeTree'</a>&nbsp; wiki entry.
 </span>
                         <br /><br />
@@ -4,9 +4,9 @@
 	<?php
 		if(!$errors && !$warnings) {
 			?>
-				<span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+<!--				<span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
 					KnowledgeTree installation has been detected. Please click <b>Next</b> to continue.
-				<br/><br/>
+				<br/><br/>-->
 			<?php
 		}
 	?>
@@ -26,19 +26,18 @@
 	<?php } ?>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<p class="description">
-			Enter the full path of the installation you wish to upgrade:
+			The Setup Wizard will now prepare your current KnowledgeTree database for migration to the new KnowledgeTree Stack. 
+			</p>
+			
+			<p class="description">
+			Please enter the full path of the installation you wish to upgrade:
 		</p>
-		<p class="empty_space">
-			<small>The default is <b>'C:\Program Files\ktdms'</b> on Windows and <b>'/opt/ktdms'</b> or <b>'/home/<i>username</i>/ktdms/'</b> on other operating systems.</small>
-		</p>
-		<p class="empty_space">
-			<small>
-				Make sure that the KnowledgeTree services are running.
-			</small>
-		</p>
-		<br/>
+		
 		<input id="location" name="location" type="text" style="width:430px; float:left" value="<?php if($location) echo $location; ?>">
 		<br/><br/>
+		<p class="description">
+			<small>(The default is <b>'C:\Program Files\ktdms'</b> on Windows and <b>'/opt/ktdms'</b> or <b>'/home/<i>username</i>/ktdms/'</b> on other operating systems.)</small>
+		</p>
 		<?php
 		if($errors) {
 			foreach ($errors as $error) {
@@ -68,7 +68,7 @@
 		</table>
  
 	</div>
-    <input type="submit" name="Edit" value="Edit"  class="button_previous"/>
+    <input type="submit" name="Edit" value="Back"  class="button_previous"/>
     <input type="submit" name="Confirm" value="Confirm" class="button_next"/>
 </form>
 <?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -64,7 +64,6 @@
 	} else {
 		define('DS', '/');
 	}
-	$wizard = realpath(dirname(__FILE__));
 	// Define environment root
 	$wizard = realpath(dirname(__FILE__));
 	$xdir = explode(DS, $wizard);
@@ -594,4 +594,11 @@ td.dir_description {
  
 .advoptions {
 	top:0px;
+}
+
+.description_1 {
+	color:#898989;
+	font-size:100%;
+	line-height:150%;
+	font-family:sans-serif;
 }
 \ No newline at end of file
@@ -61,6 +61,10 @@ class complete extends Step {
  
     function doStep() {
     	$this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent);
+		$this->temp_variables['isCE'] = false;
+		$type = $this->util->getVersionType();
+		if($type == "community")
+		 	$this->temp_variables['isCE'] = true;
         $this->doRun();
     	return 'landing';
     }
@@ -247,20 +251,7 @@ class complete extends Step {
      *
      */
     private function registerPlugins() {
-//    	define(KT_LIB_DIR, SYSTEM_DIR);
-//    	require_once(WIZARD_DIR . "lib" . DS . "plugins". DS . "pluginutil.inc.php");
-        KTPluginUtil::_walk(KT_DIR . '/plugins', $files);
-        foreach ($files as $sFile) {
-            $plugin_ending = "Plugin.php";
-            if (substr($sFile, -strlen($plugin_ending)) === $plugin_ending) {
-            	/* Set default priority */
-            	$plugins[$sFile] = KTPluginUtil::getPluginPriority($sFile);
-            }
-        }
  
-        /* Sort the plugins by priority */
-        asort($plugins);
-    	print_r($plugins);
     }
  
     /**
@@ -64,6 +64,7 @@ class install extends step
  
     public function doStep() {
     	$this->temp_variables = array("step_name"=>"install");
+    	$this->checkInstallType(); // Set silent mode variables
     	if(!$this->inStep("install")) {
     		return 'landing';
     	}
@@ -90,7 +91,6 @@ class install extends step
     public function doRun()
     {
     	$value = 'disable';
-    	$this->checkInstallType(); // Set silent mode variables
         if(isset($_POST['Install'])) {
             if(isset($_POST['call_home'])){
                 $value = $_POST['call_home'];
@@ -45,6 +45,10 @@ class installType extends step
  
 	public function doStep() {
     	$this->temp_variables = array("step_name"=>"installtype");
+		$type = $this->util->getVersionType();
+		$this->temp_variables['isCE'] = false;
+		if($type == "community")
+		 	$this->temp_variables['isCE'] = true;
     	if(!$this->inStep("installtype")) {
     		return 'landing';
     	}
@@ -34,7 +34,11 @@
 				dmsctl.bat install<br/>
 				dmsctl.bat start
 			<?php } else { ?>
-				cd /usr/share/knowledgetree-ce<br/>
+				<?php if ($isCE) { ?>
+					cd /usr/share/knowledgetree-ce<br/>
+				<?php } else { ?>
+					cd /usr/share/knowledgetree<br/>
+				<?php } ?>
 				sudo ./dmsctl.sh start
 			<?php } ?>
 			</p>
@@ -7,16 +7,18 @@
 		<table>
 			<tr>
 				<td> <input type="radio" name="installtype" value="Clean Install" checked id="clean" /> </td>
-				<td> <label for="clean"><b>Install KnowledgeTree (Default)</b> <br/>Install KnowledgeTree for the first time</label> </td>
+				<td> <label for="clean"><b>Install KnowledgeTree (Default)</b> <br/>Choose this option if you are installing KnowledgeTree for the first time</label> </td>
 			</tr>
 			<tr>
 				<td> <input type="radio" name="installtype" value="Upgrade Installation" id="migrate" /> </td>
-				<td> <label for="migrate"><b>Upgrade KnowledgeTree Stack Install</b> <br/>Migrate KnowledgeTree to the new Zend Server Stack and then perform the upgrade</label></td>
+				<td> <label for="migrate"><b>Upgrade KnowledgeTree Stack Install</b> <br/>Choose this option if you are upgrading from a previous version of the KnowledgeTree Stack</label></td>
 			</tr>
+			<?php if ($isCE) { ?>
 			<tr>
 				<td> <input type="radio" name="installtype" value="Upgrade Only" id="upgrade" /> </td>
-				<td> <label for="upgrade"><b>Upgrade KnowledgeTree Source Only Install</b> <br/> Upgrade from a Source Only installation of KnowledgeTree</label></td>
+				<td> <label for="upgrade"><b>Upgrade KnowledgeTree Source Only Install</b> <br/>Choose this option if you are upgrading from a previous Source Only installation of KnowledgeTree</label></td>
 			</tr>
+			<?php } ?>
 		</table>
 	</div>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
@@ -6,7 +6,7 @@
         }
         //print_r($errors);
     }?>
-<p class="description">
+<p class="description_1">
 Please read and accept the license agreement below before continuing with the setup.
 </p>