From 157868dc3eee5ec842fbc65b5794c1e50d31f349 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 8 Apr 2015 14:04:59 +0200 Subject: [PATCH] Update istats_diff, the key used in hashtable can be changed (using uri() for example) --- conf.py | 4 ++-- plugins/display/browsers.py | 4 ++-- plugins/display/istats_diff.py | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/conf.py b/conf.py index 9db8439..ca01691 100644 --- a/conf.py +++ b/conf.py @@ -11,13 +11,13 @@ display_visitor_ip = True # Hooks used pre_analysis_hooks = ['page_to_hit', 'robots'] post_analysis_hooks = ['referers', 'top_pages', 'top_downloads', 'operating_systems', 'browsers', 'feeds', 'hours_stats', 'reverse_dns'] -display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers', 'feeds', 'hours_stats'] +display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_pages', 'top_downloads', 'referers_diff', 'operating_systems', 'browsers', 'feeds', 'hours_stats', 'top_downloads_diff'] # Reverse DNS timeout reverse_dns_timeout = 0.2 # Count this addresses as hit -page_to_hit_conf = [r'^.+/logo[/]?$'] +page_to_hit_conf = [r'^.+/logo[/]?$', r'^.+/search[/]?.*$'] # Count this addresses as page hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$', r'^.+/source/file/.*$', r'^.+/search/1$'] diff --git a/plugins/display/browsers.py b/plugins/display/browsers.py index 52d4f13..3d1202d 100644 --- a/plugins/display/browsers.py +++ b/plugins/display/browsers.py @@ -102,7 +102,7 @@ class IWLADisplayBrowsers(IPlugin): display.addPage(page) - title = 'Top Browsers' + title = self.iwla._(u'Top Browsers') if self.create_browsers: link = '%s' % (filename, self.iwla._(u'All Browsers')) title = '%s - %s' % (title, link) @@ -120,7 +120,7 @@ class IWLADisplayBrowsers(IPlugin): icon = '' % (self.icon_path) else: icon = '' % (self.icon_path) - browser = 'Unknown' + browser = self.iwla._(u'Unknown') table.appendRow([icon, browser, entrance]) total_browsers[2] -= entrance if total_browsers[2]: diff --git a/plugins/display/istats_diff.py b/plugins/display/istats_diff.py index 333de6d..c5d50ca 100644 --- a/plugins/display/istats_diff.py +++ b/plugins/display/istats_diff.py @@ -73,7 +73,9 @@ class IWLADisplayStatsDiff(IPlugin): path = self.iwla.getCurDisplayPath(self.filename) page = display.getPage(path) - if not page: return + if not page: + self.logger.error('No page for %s' % (path)) + return title = self.iwla._(self.block_name) block = page.getBlock(title) if not block: @@ -94,5 +96,6 @@ class IWLADisplayStatsDiff(IPlugin): stats_diff[k] = 'iwla_new' for (idx, row) in enumerate(block.rows): - if row[0] in stats_diff.keys(): - block.setCellCSSClass(idx, 0, stats_diff[row[0]]) + for k in stats_diff.keys(): + if k in row[0]: + block.setCellCSSClass(idx, 0, stats_diff[k])