Menu
▾
▴
[Pytrainer-svn] SF.net SVN: pytrainer:[440] pytrainer/trunk/pytrainer
|
From: <jb...@us...> - 2009-12-26 01:47:06
|
Revision: 440
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=440&view=rev
Author: jblance
Date: 2009-12-26 01:46:55 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Initial changes for timezone support
Modified Paths:
--------------
pytrainer/trunk/pytrainer/lib/ddbb.py
pytrainer/trunk/pytrainer/lib/gpx.py
pytrainer/trunk/pytrainer/lib/sqliteUtils.py
pytrainer/trunk/pytrainer/main.py
pytrainer/trunk/pytrainer/record.py
Modified: pytrainer/trunk/pytrainer/lib/ddbb.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/ddbb.py 2009-12-26 01:15:32 UTC (rev 439)
+++ pytrainer/trunk/pytrainer/lib/ddbb.py 2009-12-26 01:46:55 UTC (rev 440)
@@ -237,6 +237,7 @@
"maxpace":"float",
"pace":"float",
"maxbeats":"float",
+ "date_time_local":"varchar2(20)",
"date_time_utc":"varchar2(20)"}
columnsWaypoints = {"id_waypoint":"integer primary key autoincrement",
"lat":"float",
Modified: pytrainer/trunk/pytrainer/lib/gpx.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/gpx.py 2009-12-26 01:15:32 UTC (rev 439)
+++ pytrainer/trunk/pytrainer/lib/gpx.py 2009-12-26 01:46:55 UTC (rev 440)
@@ -174,7 +174,8 @@
return retorno
date_ = tree.find(timeTag).text
- mk_time = self.getDateTime(date_)[0]
+ #mk_time = self.getDateTime(date_)[0] #UTC Date
+ mk_time = self.getDateTime(date_)[1] #Local Date
self.date = mk_time.strftime("%Y-%m-%d")
for trkpoint in trkpoints:
@@ -291,10 +292,12 @@
if date_time is None:
print "Problems when retrieving start time from "+gpxFile+". Please check data integrity"
return 0
- zuluDateTime = self.getDateTime(date_time.text)[0].strftime("%Y-%m-%dT%H:%M:%SZ")
+ dateTime = self.getDateTime(date_time.text)
+ zuluDateTime = dateTime[0].strftime("%Y-%m-%dT%H:%M:%SZ")
+ localDateTime = dateTime[1]
logging.debug(gpxFile+" | "+ date_time.text +" | " + zuluDateTime)
- print zuluDateTime
+ print localDateTime
#return date_time.text
logging.debug("<<")
- return zuluDateTime
+ return (zuluDateTime, localDateTime)
Modified: pytrainer/trunk/pytrainer/lib/sqliteUtils.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/sqliteUtils.py 2009-12-26 01:15:32 UTC (rev 439)
+++ pytrainer/trunk/pytrainer/lib/sqliteUtils.py 2009-12-26 01:46:55 UTC (rev 440)
@@ -231,9 +231,8 @@
#Test for columns that are not in the DB that should be
result2 = [x for x in tempDict if x not in columnsDB]
- #print result, result2
- logging.debug("Comparison result: "+str(result))
- logging.debug("Comparison result: "+str(result2))
+ logging.debug("Columns in DB that shouldnt be: "+str(result))
+ logging.debug("Columns missing from DB: "+str(result2))
table_ok = True
if len(result) > 0:
Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py 2009-12-26 01:15:32 UTC (rev 439)
+++ pytrainer/trunk/pytrainer/main.py 2009-12-26 01:46:55 UTC (rev 440)
@@ -97,7 +97,7 @@
def __init__(self,filename = None, data_path = None):
logging.debug('>>')
self.data_path = data_path
- self.version ="1.7.0_svn#439"
+ self.version ="1.7.0_svn#440"
self.date = Date()
main_dir = os.path.realpath(os.path.dirname(__file__)) #why?
sys.path.insert(0, main_dir) #why?
Modified: pytrainer/trunk/pytrainer/record.py
===================================================================
--- pytrainer/trunk/pytrainer/record.py 2009-12-26 01:15:32 UTC (rev 439)
+++ pytrainer/trunk/pytrainer/record.py 2009-12-26 01:46:55 UTC (rev 440)
@@ -116,7 +116,7 @@
logging.debug('>>')
time = self.date.time2second(list_options["rcd_time"])
average = self.parseFloatRecord(list_options["rcd_average"])
- keys= "date,sport,distance,time,beats,comments,average,calories,title,upositive,unegative,maxspeed,maxpace,pace,maxbeats,date_time_utc"
+ keys= "date,sport,distance,time,beats,comments,average,calories,title,upositive,unegative,maxspeed,maxpace,pace,maxbeats,date_time_utc,date_time_local"
if (list_options["rcd_beats"] == ""):
list_options["rcd_beats"] = 0
@@ -140,6 +140,7 @@
self.parseFloatRecord(list_options["rcd_pace"]),
self.parseFloatRecord(list_options["rcd_maxbeats"]),
list_options["date_time_utc"],
+ list_options["date_time_local"],
)
logging.debug('<<')
return keys,values
@@ -208,9 +209,11 @@
summaryRecord['rcd_upositive'] = upositive
summaryRecord['rcd_unegative'] = unegative
if entry[1]=="": # coming from new track dialog (file opening)
- summaryRecord['date_time_utc'] = gpx.getStartTimeFromGPX(gpxOrig)
+ summaryRecord['date_time_utc'], summaryRecord['date_time_local'] = gpx.getStartTimeFromGPX(gpxOrig)
else: # coming from GPS device
summaryRecord['date_time_utc'] = entry[1]
+ summaryRecord['date_time_local'] = entry[1]
+ print "#TODO fix record summaryRecord local and utc time..."
logging.debug('summary: '+str(summaryRecord))
logging.debug('<<')
return summaryRecord
@@ -244,13 +247,13 @@
def getrecordInfo(self,id_record):
logging.debug('--')
return self.ddbb.select("records,sports",
- "sports.name,date,distance,time,beats,comments,average,calories,id_record,title,upositive,unegative,maxspeed,maxpace,pace,maxbeats,date_time_utc",
+ "sports.name,date,distance,time,beats,comments,average,calories,id_record,title,upositive,unegative,maxspeed,maxpace,pace,maxbeats,date_time_utc,date_time_local",
"id_record=\"%s\" and records.sport=sports.id_sports" %id_record)
def getrecordList(self,date):
logging.debug('--')
return self.ddbb.select("records,sports",
- "sports.name,date,distance,time,beats,comments,average,calories,id_record,maxspeed,maxbeats,date_time_utc",
+ "sports.name,date,distance,time,beats,comments,average,calories,id_record,maxspeed,maxbeats,date_time_utc,date_time_local",
"date=\"%s\" and records.sport=sports.id_sports" %date)
def getrecordPeriod(self,date_ini, date_end, sport=None):
@@ -484,7 +487,7 @@
for gpxFile in os.listdir(gpxDir):
#logging.debug('File: '+gpxFile)
gpx = Gpx()
- date_time = gpx.getStartTimeFromGPX(gpxDir+"/"+gpxFile)
+ date_time = gpx.getStartTimeFromGPX(gpxDir+"/"+gpxFile)[0]
if date_time != 0:
logging.debug('File: '+gpxFile+' | Date: '+date_time)
id_record = gpxFile.partition('.')[0]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
