Fix two bugs : don't break on logs < last_access and -1 missed for cur day CSS

This commit is contained in:
Grégory Soutadé 2014-12-11 22:31:40 +01:00
parent e012dc1b24
commit 9ab1687c76
3 changed files with 9 additions and 5 deletions

View File

@ -10,7 +10,7 @@ display_visitor_ip = True
# Hooks used # Hooks used
pre_analysis_hooks = ['page_to_hit', 'robots'] pre_analysis_hooks = ['page_to_hit', 'robots']
post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits'] post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'top_hits', 'reverse_dns']
display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits'] display_hooks = ['top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'top_hits']
# Reverse DNS timeout # Reverse DNS timeout
@ -20,3 +20,7 @@ reverse_dns_timeout = 0.2
page_to_hit_conf = [r'^.+/logo[/]?$'] page_to_hit_conf = [r'^.+/logo[/]?$']
# Count this addresses as page # Count this addresses as page
hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$'] hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$']
# Because it's too long to build HTML when there is too much entries
max_hits_displayed = 100
max_downloads_displayed = 100

View File

@ -319,9 +319,9 @@ class DisplayHTMLBuild(object):
os.symlink(target, link_name) os.symlink(target, link_name)
for page in self.pages: for page in self.pages:
print 'Build %s' % (page.filename) # print 'Build %s' % (page.filename)
page.build(root) page.build(root)
print 'Built' # print 'Built'
# #
# Global functions # Global functions

View File

@ -366,7 +366,7 @@ class IWLA(object):
if week_day == 5 or week_day == 6: if week_day == 5 or week_day == 6:
days.setRowCSSClass(i-1, 'iwla_weekend') days.setRowCSSClass(i-1, 'iwla_weekend')
if adate == date.today(): if adate == date.today():
css = days.getCellCSSClass(i, 0) css = days.getCellCSSClass(i-1, 0)
if css: css = '%s %s' % (css, 'iwla_curday') if css: css = '%s %s' % (css, 'iwla_curday')
else: css = 'iwla_curday' else: css = 'iwla_curday'
days.setCellCSSClass(i-1, 0, css) days.setCellCSSClass(i-1, 0, css)
@ -616,7 +616,7 @@ class IWLA(object):
if groups: if groups:
if not self._newHit(groups.groupdict()): if not self._newHit(groups.groupdict()):
break continue
else: else:
print "No match for " + l print "No match for " + l
#break #break