[CS-Project-svn_notify] SF.net SVN: cs-project: [894] trunk/1.2

[<cra...@us...>]

Revision: 894
          http://cs-project.svn.sourceforge.net/cs-project/?rev=894&view=rev
Author:   crazedsanity
Date:     2008-05-15 20:26:15 -0700 (Thu, 15 May 2008)

Log Message:
-----------
Fix issue #188 (revert invalid fix for cs-phpxml problem; see issue #189).

Modified Paths:
--------------
    trunk/1.2/lib/upgradeClass.php
    trunk/1.2/upgrade/upgrade.xml

Modified: trunk/1.2/lib/upgradeClass.php
===================================================================
--- trunk/1.2/lib/upgradeClass.php	2008-05-13 00:21:44 UTC (rev 893)
+++ trunk/1.2/lib/upgradeClass.php	2008-05-16 03:26:15 UTC (rev 894)
@@ -178,20 +178,6 @@
 		
 		$config = $xmlParser->get_tree(TRUE);
 		$this->config = $config['UPGRADE'];
-		
-		//now fix the "MATCHING" section as needed.
-		$matchingKeys = $this->config['MATCHING'];
-		
-		$myMatching = $this->config['MATCHING'];
-		unset($this->config['MATCHING']);
-		if(!preg_match('/^V/', $matchingKeys[0])) {
-			foreach($myMatching as $index=>$data) {
-				$keys = array_keys($data);
-				$this->config['MATCHING'][$keys[0]] = $myMatching[$index][$keys[0]];
-			}
-		}
-		debug_print($this->config);
-		
 	}//end read_upgrade_config_file()
 	//=========================================================================
 	
@@ -286,8 +272,7 @@
 	
 	//=========================================================================
 	public function parse_version_string($versionString) {
-		if(is_null($versionString) || !(strlen($versionString) > 4)) {
-			cs_debug_backtrace(1);
+		if(is_null($versionString) || !strlen($versionString)) {
 			throw new exception(__METHOD__ .": invalid version string ($versionString)");
 		}
 		$tmp = explode('.', $versionString);
@@ -337,16 +322,6 @@
 			$retval['version_suffix'] = "";
 		}
 		
-		//double-check our data matches the initial version string.
-		$checkThis = $retval['version_major'] .".". $retval['version_minor'] .".". $retval['version_maintenance'];
-		if(strlen($retval['version_suffix'])) {
-			$checkThis .= "-". $retval['version_suffix'];
-		}
-		
-		if($checkThis != $versionString) {
-			throw new exception(__METHOD__ .": initial version string (". $versionString .") doesn't match final (". $checkThis .")");
-		}
-		
 		return($retval);
 	}//end parse_version_string()
 	//=========================================================================
@@ -743,7 +718,7 @@
 					}
 					else {
 						//TODO: should there maybe be an option to throw an exception (freak out) here?
-						debug_print(__METHOD__ .": while checking ". $index .", realized the new version (". $checkIfHigher .") is LOWER than current (". $versionNumber .")",1);
+						debug_print(__METHOD__ .": while checking ". $index .", realized the new version (". $checkIfHigher .") is LOWER than current (". $version .")",1);
 					}
 				}
 				else {
@@ -839,10 +814,6 @@
 		$dbVersion = $this->databaseVersion;
 		$newVersion = $this->versionFileVersion;
 		
-		if((strlen($dbVersion) <= 4) || (strlen($newVersion) <= 4)) {
-			throw new exception(__METHOD__ .": invalid data in dbVersion (". $dbVersion .") or newVersion (". $newVersion .")");
-		}
-		
 		$retval = array();
 		if(!$this->is_higher_version($dbVersion, $newVersion)) {
 			throw new exception(__METHOD__ .": version (". $newVersion .") isn't higher than (". $dbVersion .")... something is broken");

Modified: trunk/1.2/upgrade/upgrade.xml
===================================================================
--- trunk/1.2/upgrade/upgrade.xml	2008-05-13 00:21:44 UTC (rev 893)
+++ trunk/1.2/upgrade/upgrade.xml	2008-05-16 03:26:15 UTC (rev 894)
@@ -25,8 +25,6 @@
 			<class_name>upgrade_to_1_2_0_ALPHA4</class_name>
 			<call_method>run_upgrade</call_method>
 		</v1.2.0-ALPHA3>
-	</matching>
-	<matching>
 		<v1.2.0-ALPHA6>
 			<target_version>1.2.0-ALPHA7</target_version>
 			<script_name>upgradeTo1.2.0-ALPHA7.php</script_name>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.