[Pytrainer-svn] SF.net SVN: pytrainer:[311] pytrainer/trunk/pytrainer

[<jli...@us...>]

Revision: 311
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=311&view=rev
Author:   jliljenfeldt
Date:     2009-04-03 06:18:02 +0000 (Fri, 03 Apr 2009)

Log Message:
-----------
Could not import while using MySQL. freeexec did not work and datetime.date objects seems to need explicit conversion to strings.

Modified Paths:
--------------
    pytrainer/trunk/pytrainer/gui/windowmain.py
    pytrainer/trunk/pytrainer/lib/mysqlUtils.py
    pytrainer/trunk/pytrainer/record.py

Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py	2009-04-02 21:44:35 UTC (rev 310)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py	2009-04-03 06:18:02 UTC (rev 311)
@@ -190,7 +190,7 @@
 				self.record_maxpace.set_text("%0.2f" %maxpace)
 			
 			self.record_sport.set_text(sport)
-			self.record_date.set_text(date)
+			self.record_date.set_text(date.isoformat())
 			hour,min,sec=self.parent.date.second2time(int(record_list[3]))
 			self.record_hour.set_text("%d" %hour)
 			self.record_minute.set_text("%d" %min)
@@ -306,7 +306,7 @@
 			self.day_pace.set_text(pace)
 			self.day_maxpace.set_text(maxpace)
 			self.day_calories.set_text("%0.0f" %calories)
-			self.day_topic.set_text(record[1])
+			self.day_topic.set_text(record[1].isoformat())
 			
 		else:
 			self.dayview.set_sensitive(0)

Modified: pytrainer/trunk/pytrainer/lib/mysqlUtils.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/mysqlUtils.py	2009-04-02 21:44:35 UTC (rev 310)
+++ pytrainer/trunk/pytrainer/lib/mysqlUtils.py	2009-04-03 06:18:02 UTC (rev 311)
@@ -18,7 +18,9 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-import _mysql
+#import _mysql
+import MySQLdb
+from logs import Log
 
 # Fixed some issues with MySql tables creation (email from Jonas Liljenfeldt)
 class Sql:
@@ -28,13 +30,14 @@
 		self.ddbb_host = host
 		self.ddbb = ddbb
 		self.db = None
+		self.log = Log()
 	
 	def connect(self):
 		#si devolvemos 1 ha ido todo con exito
 		#con 0 es que no estaba la bbdd creada
 		#con -1 imposible conectar a la maquina.
 		try:
-			self.db=_mysql.connect(
+			self.db=MySQLdb.connect(
 				host=self.ddbb_host,
 				user=self.ddbb_user,
 				passwd=self.ddbb_pass,
@@ -130,7 +133,15 @@
 		self.db.query("""insert into %s (%s) values (%s)"""  %(table,cells,string))
 
 	def freeExec(self,sql):
-		self.db.query(sql)
+		#self.db.query(sql)
+		self.log.run(sql)
+		cur = self.db.cursor()
+		cur.execute(sql)
+		retorno = []
+		for row in cur.fetchall():
+			retorno.append(row)
+	       	self.db.commit()
+		return retorno
 	
 	def delete(self,table,condition):
 		sql = "delete from %s where %s"  %(table,condition)

Modified: pytrainer/trunk/pytrainer/record.py
===================================================================
--- pytrainer/trunk/pytrainer/record.py	2009-04-02 21:44:35 UTC (rev 310)
+++ pytrainer/trunk/pytrainer/record.py	2009-04-03 06:18:02 UTC (rev 311)
@@ -324,8 +324,8 @@
 		logging.debug('Found '+str(len(records))+' entries')
 		day_list = []
 		for i in records:
-			record = i[0].split("-")
-			logging.debug('date:'+i[0])
+			record = i[0].isoformat().split("-")
+			logging.debug('date:'+i[0].isoformat())
 			day_list.append(record[2])
 		logging.debug('<<')
 		return day_list


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