GeoView: escape error in event view. some cleaning.

svn: r14331
This commit is contained in:
Serge Noiraud 2010-02-12 10:04:49 +00:00
parent f731980e8e
commit dce394ca37

View File

@ -1585,14 +1585,8 @@ class GeoView(HtmlView):
self.mapview.write("%s<br>" % _escape(mark[0])) self.mapview.write("%s<br>" % _escape(mark[0]))
if formatype == 1: if formatype == 1:
self.mapview.write("<br>%s" % _escape(mark[5])) self.mapview.write("<br>%s" % _escape(mark[5]))
elif formatype == 2: else:
self.mapview.write("<br>%s - %s" % (_escape(mark[7]), self.mapview.write("<br>%s - %s" % (mark[7],
_escape(mark[5])))
elif formatype == 3:
self.mapview.write("<br>%s - %s" % (_escape(mark[7]),
_escape(mark[5])))
elif formatype == 4:
self.mapview.write("<br>%s - %s" % (_escape(mark[7]),
_escape(mark[5]))) _escape(mark[5])))
else: # This marker already exists. add info. else: # This marker already exists. add info.
if ( mark[8] and savetype != mark[8] ): if ( mark[8] and savetype != mark[8] ):
@ -1600,7 +1594,7 @@ class GeoView(HtmlView):
if indm > last: if indm > last:
divclose = True divclose = True
else: else:
self.mapview.write("<br>%s - %s" % (_escape(mark[7]), _escape(mark[5]))) self.mapview.write("<br>%s - %s" % (mark[7], _escape(mark[5])))
ret = 1 ret = 1
for year in self.yearinmarker: for year in self.yearinmarker:
if year == mark[7]: if year == mark[7]: