[Pytrainer-svn] SF.net SVN: pytrainer:[480] pytrainer/trunk/pytrainer/main.py

[<dg...@us...>]

Revision: 480
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=480&view=rev
Author:   dgranda
Date:     2010-01-17 00:19:42 +0000 (Sun, 17 Jan 2010)

Log Message:
-----------
DB check relies in own DB version. Removed deprecated stuff

Modified Paths:
--------------
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2010-01-17 00:16:08 UTC (rev 479)
+++ pytrainer/trunk/pytrainer/main.py	2010-01-17 00:19:42 UTC (rev 480)
@@ -101,7 +101,8 @@
 	def __init__(self,filename = None, data_path = None): 
 		logging.debug('>>')
 		self.data_path = data_path
-		self.version ="1.7.0_svn#476"
+		self.version ="1.7.0_svn#480"
+		self.DB_version = 1
 		self.date = Date()
 		# Checking profile
 		self.profile = Profile(self.data_path,self)
@@ -131,10 +132,16 @@
 		self.ddbb.connect()		
 		
 		# DB check can be triggered either via new version (mandatory) or as runtime parameter (--check)
-		if self.isNewVersion() or self.check:
+		currentDB_version = self.configuration.getValue("pytraining","DB_version")
+		logging.debug("Current DB version: "+str(currentDB_version))
+		
+		if currentDB_version is None or self.check:
 			self.sanityCheck() # Deprecates migrationCheck. Review first installation and version control
 		else:
-			logging.info('No sanity check requested')
+			if self.DB_version > int(currentDB_version):
+				self.sanityCheck() # Deprecates migrationCheck. Review first installation and version control
+			else:
+				logging.info('No sanity check requested')
 
 		self.record = Record(data_path,self)
 
@@ -442,65 +449,7 @@
 		logging.debug('>>')
 		self.profile.editProfile()
 		logging.debug('<<')
-		
-	def migrationCheck(self):
-		"""22.06.2008 - dgranda (reviewed 31.07.2008)
-		Checks if it is necessary to run migration scripts for new features
-		args: none
-		returns: none"""
-		logging.debug('>>')
-		self.filename = self.conf.getValue("conffile")
-		logging.debug('Retrieving data from '+ self.filename)
-		version_tmp = self.configuration.getOption("version")
-		logging.info('Old version: '+version_tmp+' | New version: '+self.version)
-		if version_tmp == "0.0":
-			logging.info('Nothing to do, first installation')
-		else:
-			if version_tmp=="1.0":
-				logging.debug('updating month data')
-				self.ddbb.updatemonth()
-			if version_tmp<="0.9.8":
-				logging.debug('updating date format')
-				self.ddbb.updateDateFormat()
-			if version_tmp<="0.9.8.2":
-				logging.debug('updating DB title')
-				self.ddbb.addTitle2ddbb()
-			if version_tmp<="1.3.1":
-				self.ddbb.addUnevenness2ddbb()
-			if version_tmp<="1.4.2":
-				self.ddbb.addWaypoints2ddbb()
-			if version_tmp<="1.5.0.1":
-				self.ddbb.addweightandmet2ddbb()
-			if version_tmp<="1.5.0.2":
-				logging.info('Adding maxspeed, maxpace, pace and maxbeats columns')
-				self.ddbb.addpaceandmax2ddbb()
-			if version_tmp < "1.6.0.1":
-				logging.info('Adding date_time_utc column and retrieving data from local GPX files')
-				self.addDateTimeUTC()
-			if version_tmp < "1.6.0.3":
-				logging.info('Checking pace and max pace stored in DB')
-				self.checkPacesDB()
-		logging.info('Checking configuration file integrity')
-		self.profile.checkProfile()
-		if version_tmp < self.version:
-			self.configuration.setVersion(self.version)
-		logging.debug('<<')
 
-	def isNewVersion(self):
-		"""16.01.2010 - dgranda
-		Checks if executed version is new
-		args: none
-		returns: boolean. True if version is newer, False otherwise"""
-		logging.debug('>>')
-		version_tmp = self.configuration.getValue("pytraining","version")
-		logging.info('Old version: '+version_tmp+' | New version: '+self.version)
-		isNew = False
-		if version_tmp < self.version:
-			isNew = True
-			self.configuration.setVersion(self.version)
-		logging.debug('<<')
-		return isNew
-
 	def sanityCheck(self):
 		"""23.11.2009 - dgranda
 		Checks database and configuration file if flag "--check" is enabled at start


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