From 9ab1687c7613d4d4423140a8e362f6d19abd08f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 11 Dec 2014 22:31:40 +0100 Subject: [PATCH] Fix two bugs : don't break on logs < last_access and -1 missed for cur day CSS --- conf.py | 6 +++++- display.py | 4 ++-- iwla.py | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/conf.py b/conf.py index d3c7dfc..87043ac 100644 --- a/conf.py +++ b/conf.py @@ -10,7 +10,7 @@ display_visitor_ip = True # Hooks used 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'] # Reverse DNS timeout @@ -20,3 +20,7 @@ reverse_dns_timeout = 0.2 page_to_hit_conf = [r'^.+/logo[/]?$'] # Count this addresses as page 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 diff --git a/display.py b/display.py index ed5546f..6343849 100644 --- a/display.py +++ b/display.py @@ -319,9 +319,9 @@ class DisplayHTMLBuild(object): os.symlink(target, link_name) for page in self.pages: - print 'Build %s' % (page.filename) + # print 'Build %s' % (page.filename) page.build(root) - print 'Built' + # print 'Built' # # Global functions diff --git a/iwla.py b/iwla.py index 44ea4b4..c41f06b 100755 --- a/iwla.py +++ b/iwla.py @@ -366,7 +366,7 @@ class IWLA(object): if week_day == 5 or week_day == 6: days.setRowCSSClass(i-1, 'iwla_weekend') if adate == date.today(): - css = days.getCellCSSClass(i, 0) + css = days.getCellCSSClass(i-1, 0) if css: css = '%s %s' % (css, 'iwla_curday') else: css = 'iwla_curday' days.setCellCSSClass(i-1, 0, css) @@ -616,7 +616,7 @@ class IWLA(object): if groups: if not self._newHit(groups.groupdict()): - break + continue else: print "No match for " + l #break