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:26:15 +0400
committersgiehl <stefan@piwik.org>2014-05-20 23:26:15 +0400
commit0bb0079f147c50f06732f0ce65bcf0e7ada45ec4 (patch)
tree9e78bdeacda6e632c0bc02cf49d43a0a44e6e0c8
parenta46d84eab1af92756a80c55f478ccb674812fcd2 (diff)
refs #5114 fixed detection for nifty.com
-rw-r--r--core/DataFiles/SearchEngines.php3
-rw-r--r--tests/resources/extractSearchEngineInformationFromUrlTests.yml4
2 files changed, 6 insertions, 1 deletions
diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php
index 84843a49b9..1768c214d6 100644
--- a/core/DataFiles/SearchEngines.php
+++ b/core/DataFiles/SearchEngines.php
@@ -444,6 +444,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
'{}.wow.com' => array('Google'),
'search.leonardo.it' => array('Google'),
'www.optuszoo.com.au' => array('Google'),
+ 'search.dolphin-browser.jp' => array('Google'),
'search.smt.docomo.ne.jp' => array('Google', 'MT'),
'image.search.smt.docomo.ne.jp' => array('Google', 'MT'),
@@ -703,7 +704,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
'www.neti.ee' => array('Neti', 'query', 'cgi-bin/otsing?query={k}', 'iso-8859-1'),
// Nifty
- 'search.nifty.com' => array('Nifty', 'q', 'websearch/search?q={k}'),
+ 'search.nifty.com' => array('Nifty', array('q', 'Text'), 'websearch/search?q={k}'),
// Nigma
'nigma.ru' => array('Nigma', 's', 'index.php?s={k}'),
diff --git a/tests/resources/extractSearchEngineInformationFromUrlTests.yml b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
index 89c9cfe084..94f727fff2 100644
--- a/tests/resources/extractSearchEngineInformationFromUrlTests.yml
+++ b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
@@ -394,6 +394,10 @@
engine: 'auone'
keywords: 'piwik'
+- url: 'http://search.nifty.com/websearch/search?select=2&ss=up&cflg=%E6%A4%9C%E7%B4%A2&chartype=&Text=%E3%82%A6%E3%82%A7%E3%83%96%E6%A4%9C%E7%B4%A2%E7%B5%90%E6%9E%9C%E7%B4%84'
+ engine: 'Nifty'
+ keywords: 'ウェブ検索結果約'
+
- url: 'http://www.claro-search.com/?q=logiciels+pour+%C3%A9crire+en+japonais+avec+windows+xp&s=web&as=0&rlz=0&babsrc=SP_clro'
engine: 'Claro Search'
keywords: 'logiciels pour écrire en japonais avec windows xp'