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

[<jb...@us...>]

Revision: 436
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=436&view=rev
Author:   jblance
Date:     2009-12-25 23:11:26 +0000 (Fri, 25 Dec 2009)

Log Message:
-----------
Add garmintools to setup.py, html encode start/finish info windows for Googlemaps 3 display

Modified Paths:
--------------
    pytrainer/trunk/pytrainer/extensions/googlemaps.py
    pytrainer/trunk/pytrainer/main.py
    pytrainer/trunk/setup.py

Modified: pytrainer/trunk/pytrainer/extensions/googlemaps.py
===================================================================
--- pytrainer/trunk/pytrainer/extensions/googlemaps.py	2009-12-25 22:59:39 UTC (rev 435)
+++ pytrainer/trunk/pytrainer/extensions/googlemaps.py	2009-12-25 23:11:26 UTC (rev 436)
@@ -89,6 +89,8 @@
 					time = "%d%s %02d%s" % (timeHours, _("h"), timeMin, _("min"))
 					startinfo = "<div id='info_content'>%s: %s</div>" % (info[0][0], info[0][9])
 					finishinfo = "<div id='info_content'>%s: %s<br>%s: %s%s</div>" % (_("Time"), time, _("Distance"), info[0][2], _("km"))
+					startinfo = startinfo.encode('ascii', 'xmlcharrefreplace') #Encode for html
+					finishinfo = finishinfo.encode('ascii', 'xmlcharrefreplace') #Encode for html
 					self.createHtml_api3(polyline, minlat, minlon, maxlat, maxlon, startinfo, finishinfo, laps)
 				else:
 					logging.debug("Using Google Maps version 2 API")

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2009-12-25 22:59:39 UTC (rev 435)
+++ pytrainer/trunk/pytrainer/main.py	2009-12-25 23:11:26 UTC (rev 436)
@@ -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#435"
+		self.version ="1.7.0_svn#436"
 		self.date = Date()
 		main_dir = os.path.realpath(os.path.dirname(__file__)) #why?
 		sys.path.insert(0, main_dir) #why?

Modified: pytrainer/trunk/setup.py
===================================================================
--- pytrainer/trunk/setup.py	2009-12-25 22:59:39 UTC (rev 435)
+++ pytrainer/trunk/setup.py	2009-12-25 23:11:26 UTC (rev 436)
@@ -36,6 +36,7 @@
 		install_plugin("garmin-hr-file"),
 		install_plugin("garmin-tcxv2"),
 		install_plugin("googleearth"),
+		install_plugin("garmintools"),
 		install_extension("wordpress"),
 		(install_locale("es")),
 		(install_locale("ca")),


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