Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert _has_webpage_extension to what it was before.

Browse Source 
svn: r12048
This commit is contained in:
Kees Bakker 2009-02-19 20:42:13 +00:00
parent beda493165
commit 9da589e7b7
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/webreport/WebCal.py
View File

@ -400,7 +400,7 @@ class WebCalReport(Report):
if not (url.startswith('http:') or url.startswith('/')): if not (url.startswith('http:') or url.startswith('/')):
url = '/'.join(subdirs + [url_fname]) url = '/'.join(subdirs + [url_fname])
if not _has_webpage_extension(url, self.ext): if not _has_webpage_extension(url):
url += self.ext url += self.ext
# Figure out if we need <li id="CurrentSection"> or just plain <li> # Figure out if we need <li id="CurrentSection"> or just plain <li>
@ -756,7 +756,7 @@ class WebCalReport(Report):
fname = os.path.join(self.html_dir, subdir, fname) fname = os.path.join(self.html_dir, subdir, fname)
if not _has_webpage_extension(fname, self.ext): if not _has_webpage_extension(fname):
fname += self.ext fname += self.ext
destdir = os.path.dirname(fname) destdir = os.path.dirname(fname)
@ -1560,17 +1560,16 @@ def get_next_day(year, month, day_col):
next_month_day = firstweek_nextmonth[day_col] next_month_day = firstweek_nextmonth[day_col]
return next_month_day return next_month_day
# TODO. Eliminate this function, or make it do something useful. def _has_webpage_extension(url):
def _has_webpage_extension(url, ext):
""" """
determine if a filename has an extension or not... determine if a filename has an extension or not...
url = filename to be checked url = filename to be checked
ext -- extension to process if there is one or not
""" """
if url.endswith(ext): for ext in ['.html', '.htm', '.shtml', '.php', '.php3', '.cgi']:
return True if url.endswith(ext):
return True
return False return False
#------------------------------------------------------------------------- #-------------------------------------------------------------------------