refs #2885 added some search engines and tests

4 files changed, 39 insertions, 1 deletions

diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php
index e82b55469c..1ba4684582 100644
--- a/core/DataFiles/SearchEngines.php
+++ b/core/DataFiles/SearchEngines.php
@@ -242,6 +242,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         // Charter
         'www.charter.net'                => array('Charter', 'q', 'search/index.php?q={k}'),
 
+        // Claro Search
+        'claro-search.com'               => array('Claro Search', 'q', '?q={k}'),
+
         // Clix (Enhanced by Google)
         'pesquisa.clix.pt'               => array('Clix', 'question', 'resultado.html?in=Mundial&question={k}'),
 
@@ -437,6 +440,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         '{}.wow.com'                     => array('Google'),
         'search.leonardo.it'             => array('Google'),
         'www.optuszoo.com.au'            => array('Google'),
+        'search.smt.docomo.ne.jp'        => array('Google', 'MT'),
+        'image.search.smt.docomo.ne.jp'     => array('Google', 'MT'),
 
 
         // Google Earth
@@ -553,6 +558,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'search.b1.org'                  => array('InfoSpace', 'q'),
         'searchya.com'                   => array('InfoSpace', 'q'),
         'search.handycafe.com'           => array('InfoSpace', 'q'),
+        'search.v9.com'                  => array('InfoSpace', 'q'),
 
         /*
          * Other InfoSpace powered metasearches are handled in Common::extractSearchEngineInformationFromUrl()
@@ -705,6 +711,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
 
         // Orange
         'busca.orange.es'                => array('Orange', 'q', 'search?q={k}'),
+        'lemoteur.ke.voila.fr'           => array('Orange', 'kw', '?kw={k}'),
 
         // Paperball
         'www.paperball.de'               => array('Paperball', 'q', 'suche/s/?q={k}'),
@@ -783,6 +790,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         // Skynet
         'www.skynet.be'                  => array('Skynet', 'q', 'services/recherche/google?q={k}'),
 
+        // SmartAdressbar
+        'search.smartaddressbar.com'     => array('SmartAddressbar', 's', '?s={k}'),
+
         // Snap.do
         'search.snap.do'                 => array('Snap.do', 'q', '?q={k}'),
 
diff --git a/plugins/Referrers/images/searchEngines/claro-search.com.png b/plugins/Referrers/images/searchEngines/claro-search.com.png
new file mode 100644
index 0000000000..bd41239878
--- /dev/null
+++ b/plugins/Referrers/images/searchEngines/claro-search.com.png
diff --git a/plugins/Referrers/images/searchEngines/search.smartaddressbar.com.png b/plugins/Referrers/images/searchEngines/search.smartaddressbar.com.png
new file mode 100644
index 0000000000..588ea02dd8
--- /dev/null
+++ b/plugins/Referrers/images/searchEngines/search.smartaddressbar.com.png
diff --git a/tests/resources/extractSearchEngineInformationFromUrlTests.yml b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
index 4f855d6b5d..c4309205cb 100644
--- a/tests/resources/extractSearchEngineInformationFromUrlTests.yml
+++ b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
@@ -362,4 +362,32 @@
 
 - url: 'http://search.leonardo.it/?q=searchterm'
   engine: 'Google'
-  keywords: 'searchterm'
\ No newline at end of file
+  keywords: 'searchterm'
+
+- url: 'http://image.search.yahoo.co.jp/search?ei=UTF-8&fr=top_ga1_sa&p=%EF%BD%94%EF%BD%8F+%EF%BD%88%EF%BD%85%EF%BD%81%EF%BD%92%EF%BD%94+%EF%BD%8C%EF%BD%8F%EF%BD%87%EF%BD%8F'
+  engine: 'Yahoo!'
+  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'
+
+- url: 'http://search.smt.docomo.ne.jp/result?MT=%E3%83%AC%E3%82%B9%E3%82%AD%E3%83%A5%E3%83%BCme+ova&SID=s08&SPAGE=1&UNIT=11&IND=000&PAGE=2&URANK=11&TPLID=01'
+  engine: 'Google'
+  keywords: 'レスキューme ova'
+
+- url: 'http://image.search.smt.docomo.ne.jp/image_detail.php?FR=189&MT=%E3%81%B5%E3%81%9F%E3%82%8A%E3%81%AF%E3%83%97%E3%83%AA%E3%82%AD%E3%83%A5%E3%82%A2MaxHeart&RS=21&PT=000'
+  engine: 'Google'
+  keywords: 'ふたりはプリキュアmaxheart'
+
+- url: 'http://search.smartaddressbar.com/web.php?s=habillage+aikatsu'
+  engine: 'SmartAddressbar'
+  keywords: 'habillage aikatsu'
+
+- url: 'http://lemoteur.ke.voila.fr/?module=orange&bhv=images&kw=negi%20ma%20ala%20alba%20eva'
+  engine: 'Orange'
+  keywords: 'negi ma ala alba eva'
+
+- url: 'http://search.v9.com/image/?q=saeko&hl=mx&yahoo=0&pn=2&ab=default'
+  engine: 'InfoSpace'
+  keywords: 'saeko'
\ No newline at end of file