Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2014-05-20 23:44:54 +0400
committersgiehl <stefan@piwik.org>2014-05-20 23:44:54 +0400
commit73deedca967f3d2667f8c3a3e3b67d77b23424c7 (patch)
treebcdb16ecd90ccf1cadf995bb6d89a98102c79292
parentea21ab8f2598f883c24416f030f36fc2e572590b (diff)
refs #5114 added detection for seesaa.jp
-rw-r--r--core/DataFiles/SearchEngines.php5
-rw-r--r--tests/resources/extractSearchEngineInformationFromUrlTests.yml6
2 files changed, 9 insertions, 2 deletions
diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php
index 4aaa90bca8..7688d9af35 100644
--- a/core/DataFiles/SearchEngines.php
+++ b/core/DataFiles/SearchEngines.php
@@ -809,9 +809,12 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
// Snap.do
'search.snap.do' => array('Snap.do', 'q', '?q={k}'),
+ // SeeSaa
+ 'search.seesaa.jp' => array('SeeSaa', '/\/([^\/]+)\/index\.html/', '{k}/index.html'),
+
// So-net
'www.so-net.ne.jp' => array('So-net', 'query', 'search/web/?query=k{}'),
- 'video.so-net.ne.jp' => array('So-net Video', 'kw', 'search/?kw=k{}'),
+ 'video.so-net.ne.jp' => array('So-net Videos', 'kw', 'search/?kw=k{}'),
// Sogou
'www.sogou.com' => array('Sogou', 'query', 'web?query={k}', 'gb2312'),
diff --git a/tests/resources/extractSearchEngineInformationFromUrlTests.yml b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
index 736b2d7ced..04ef7b70c7 100644
--- a/tests/resources/extractSearchEngineInformationFromUrlTests.yml
+++ b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
@@ -427,9 +427,13 @@
keywords: 'piwik'
- url: 'http://video.so-net.ne.jp/search/?kw=piwik&from='
- engine: 'So-net Video'
+ engine: 'So-net Videos'
keywords: 'piwik'
+- url: 'http://search.seesaa.jp/%E6%97%A5%E6%9C%AC%E3%83%86%E3%83%AC%E3%83%93%E6%94%BE%E9%80%81%E7%B6%B2/index.html'
+ engine: 'SeeSaa'
+ keywords: '日本テレビ放送網'
+
- url: 'http://search.smartaddressbar.com/web.php?s=habillage+aikatsu'
engine: 'SmartAddressbar'
keywords: 'habillage aikatsu'