added new staticCache to remove a lot of duplicated code and to have a nice interface, by caching the default metrics we reduce the calls to translate from 50k to 2k resulting in good performance improvement...

6 files changed, 6 insertions, 6 deletions

diff --git a/plugins/Actions/Reports/GetDownloads.php b/plugins/Actions/Reports/GetDownloads.php
index 49241243e9..f168cba878 100644
--- a/plugins/Actions/Reports/GetDownloads.php
+++ b/plugins/Actions/Reports/GetDownloads.php
@@ -21,7 +21,7 @@ class GetDownloads extends Base
         $this->dimension     = new DownloadUrl();
         $this->name          = Piwik::translate('General_Downloads');
         $this->documentation = Piwik::translate('Actions_DownloadsReportDocumentation', '<br />');
-        $this->metrics       = array_keys($this->getMetrics());
+        $this->metrics       = array('nb_visits', 'nb_hits');
 
         $this->actionToLoadSubTables = $this->action;
         $this->order = 9;
diff --git a/plugins/Actions/Reports/GetOutlinks.php b/plugins/Actions/Reports/GetOutlinks.php
index 2a6c8c64f6..9c048b6a5c 100644
--- a/plugins/Actions/Reports/GetOutlinks.php
+++ b/plugins/Actions/Reports/GetOutlinks.php
@@ -28,7 +28,7 @@ class GetOutlinks extends Base
                              . Piwik::translate('Actions_OutlinkDocumentation') . '<br />'
                              . Piwik::translate('General_UsePlusMinusIconsDocumentation');
 
-        $this->metrics = array_keys($this->getMetrics());
+        $this->metrics = array('nb_visits', 'nb_hits');
         $this->order   = 8;
 
         $this->actionToLoadSubTables = $this->action;
diff --git a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
index cd29a406aa..51177e7878 100644
--- a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
+++ b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
@@ -20,7 +20,7 @@ class GetPageTitlesFollowingSiteSearch extends SiteSearchBase
         $this->dimension     = new DestinationPage();
         $this->name          = Piwik::translate('Actions_WidgetPageTitlesFollowingSearch');
         $this->documentation = Piwik::translate('Actions_SiteSearchFollowingPagesDoc') . '<br/>' . Piwik::translate('General_UsePlusMinusIconsDocumentation');
-        $this->metrics       = array_keys($this->getMetrics());
+        $this->metrics       = array('nb_hits_following_search', 'nb_hits');
         $this->order = 19;
         $this->widgetTitle  = 'Actions_WidgetPageTitlesFollowingSearch';
     }
diff --git a/plugins/Actions/Reports/GetSiteSearchCategories.php b/plugins/Actions/Reports/GetSiteSearchCategories.php
index 83e833eaff..5acf9e93ae 100644
--- a/plugins/Actions/Reports/GetSiteSearchCategories.php
+++ b/plugins/Actions/Reports/GetSiteSearchCategories.php
@@ -22,7 +22,7 @@ class GetSiteSearchCategories extends SiteSearchBase
         $this->dimension     = new SearchCategory();
         $this->name          = Piwik::translate('Actions_WidgetSearchCategories');
         $this->documentation = Piwik::translate('Actions_SiteSearchCategories1') . '<br/>' . Piwik::translate('Actions_SiteSearchCategories2');
-        $this->metrics       = array_keys($this->getMetrics());
+        $this->metrics       = array('nb_visits', 'nb_pages_per_search', 'exit_rate');
         $this->order = 17;
         $this->widgetTitle  = 'Actions_WidgetSearchCategories';
     }
diff --git a/plugins/Actions/Reports/GetSiteSearchKeywords.php b/plugins/Actions/Reports/GetSiteSearchKeywords.php
index cfaf426867..61fc0a84ed 100644
--- a/plugins/Actions/Reports/GetSiteSearchKeywords.php
+++ b/plugins/Actions/Reports/GetSiteSearchKeywords.php
@@ -21,7 +21,7 @@ class GetSiteSearchKeywords extends SiteSearchBase
         $this->name          = Piwik::translate('Actions_WidgetSearchKeywords');
         $this->documentation = Piwik::translate('Actions_SiteSearchKeywordsDocumentation') . '<br/><br/>' . Piwik::translate('Actions_SiteSearchIntro') . '<br/><br/>'
                              . '<a href="http://piwik.org/docs/site-search/" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>';
-        $this->metrics       = array_keys($this->getMetrics());
+        $this->metrics       = array('nb_visits', 'nb_pages_per_search', 'exit_rate');
         $this->order = 15;
         $this->widgetTitle  = 'Actions_WidgetSearchKeywords';
     }
diff --git a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
index 39e55c3d8f..df39684c2e 100644
--- a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
+++ b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
@@ -20,7 +20,7 @@ class GetSiteSearchNoResultKeywords extends SiteSearchBase
         $this->dimension     = new KeywordwithNoSearchResult();
         $this->name          = Piwik::translate('Actions_WidgetSearchNoResultKeywords');
         $this->documentation = Piwik::translate('Actions_SiteSearchIntro') . '<br /><br />' . Piwik::translate('Actions_SiteSearchKeywordsNoResultDocumentation');
-        $this->metrics       = array_keys($this->getMetrics());
+        $this->metrics       = array('nb_visits', 'exit_rate');
         $this->order = 16;
         $this->widgetTitle  = 'Actions_WidgetSearchNoResultKeywords';
     }