diff options
author | sgiehl <stefan@piwik.org> | 2013-06-02 01:22:27 +0400 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2013-06-02 01:22:27 +0400 |
commit | 9a31213523ba6dda20bef3b4937a195d1b9683af (patch) | |
tree | 2193d43a2f9f118f26486195787cd3261fa5a5d2 | |
parent | 631bacf0b31dde12531d39a57a0e6eaf7a0e0388 (diff) |
added some more search engines & tests
-rw-r--r-- | core/DataFiles/SearchEngines.php | 9 | ||||
-rw-r--r-- | plugins/Referers/images/searchEngines/search.snap.do.png | bin | 0 -> 570 bytes | |||
-rw-r--r-- | plugins/Referers/images/searchEngines/www.talimba.com.png | bin | 0 -> 735 bytes | |||
-rw-r--r-- | tests/resources/extractSearchEngineInformationFromUrlTests.yml | 30 |
4 files changed, 38 insertions, 1 deletions
diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php index 1e6d4c236a..2b7e11cd8b 100644 --- a/core/DataFiles/SearchEngines.php +++ b/core/DataFiles/SearchEngines.php @@ -433,6 +433,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { 'search.1und1.de' => array('Google', 'q', 'web?q={k}'), 'search.zonealarm.com' => array('Google'), 'start.lenovo.com' => array('Google', 'q', 'search/index.php?q={k}'), + 'wow.com' => array('Google'), + '{}.wow.com' => array('Google'), // Google Earth // - 2010-09-13: are these redirects now? @@ -767,6 +769,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { // Skynet 'www.skynet.be' => array('Skynet', 'q', 'services/recherche/google?q={k}'), + // Snap.do + 'search.snap.do' => array('Snap.do', 'q', '?q={k}'), + // Sogou 'www.sogou.com' => array('Sogou', 'query', 'web?query={k}', 'gb2312'), @@ -791,6 +796,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { // Suchnase 'www.suchnase.de' => array('Suchnase', 'q'), + // talimba + 'www.talimba.com' => array('talimba', 'search', 'index.php?page=search/web&search={k}'), + // TalkTalk 'www.talktalk.co.uk' => array('TalkTalk', 'query', 'search/results.html?query={k}'), @@ -915,6 +923,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { // Powered by Yahoo APIs 'www.cercato.it' => array('Yahoo!', 'q'), 'search.offerbox.com' => array('Yahoo!', 'q'), + 'www.benefind.de' => array('Yahoo!', 'q'), // Powered by Yahoo! Search Marketing (Overture) 'ys.mirostart.com' => array('Yahoo!', 'q'), diff --git a/plugins/Referers/images/searchEngines/search.snap.do.png b/plugins/Referers/images/searchEngines/search.snap.do.png Binary files differnew file mode 100644 index 0000000000..fc8131e8bc --- /dev/null +++ b/plugins/Referers/images/searchEngines/search.snap.do.png diff --git a/plugins/Referers/images/searchEngines/www.talimba.com.png b/plugins/Referers/images/searchEngines/www.talimba.com.png Binary files differnew file mode 100644 index 0000000000..4403a249b1 --- /dev/null +++ b/plugins/Referers/images/searchEngines/www.talimba.com.png diff --git a/tests/resources/extractSearchEngineInformationFromUrlTests.yml b/tests/resources/extractSearchEngineInformationFromUrlTests.yml index 3e26491540..b406853510 100644 --- a/tests/resources/extractSearchEngineInformationFromUrlTests.yml +++ b/tests/resources/extractSearchEngineInformationFromUrlTests.yml @@ -305,7 +305,7 @@ keywords: '검색 질문형 검색어 결혼 후 걱정 1위' - url: 'http://search.daum.net/search?w=tot&DA=UMEF&t__nil_searchbox=suggest&sug=&q=%EA%B2%80%EC%83%89+++%EC%A7%88%EB%AC%B8%ED%98%95+%EA%B2%80%EC%83%89%EC%96%B4+%EA%B2%B0%ED%98%BC+%ED%9B%84+%EA%B1%B1%EC%A0%95+1%EC%9C%84' - engine: 'Daum' + engine: 'Daum' keywords: '검색 질문형 검색어 결혼 후 걱정 1위' # DDG @@ -327,3 +327,31 @@ - url: 'http://images.search.conduit.com/ImagePreview/?q=test+5&ctid=CT2431245&SearchSource=13&PageSource=HomePage&start=105&pos=33' engine: 'Conduit.com' keywords: 'test 5' + +# web.de +- url: 'http://suche.web.de/web?origin=HP&q=test+5&jsenabled=true' + engine: 'Web.de' + keywords: 'test 5' + +- url: 'http://avira-int.ask.com/web?q=piwik&gct=serp&qsrc=0&o=APN10261&l=dis&locale=de_DE&qid=E17EE997A2AD0B90FF6771B4873C379E&frstpgo=0&page=2&jss=1' + engine: 'Ask' + keywords: 'piwik' + +- url: 'http://de.wow.com/search?s_pt=aolsem&s_it=aolsem&s_chn=7&q=piwik%20analytics' + engine: 'Google' + keywords: 'piwik analytics' + +# Snap.do +- url: 'http://search.snap.do/?q=piwik&category=Web' + engine: 'Snap.do' + keywords: 'piwik' + +# benefind (Yahoo! powered) +- url: 'http://www.benefind.de/web.php?q=piwik' + engine: 'Yahoo!' + keywords: 'piwik' + +# talimba +- url: 'http://www.talimba.com/index.php?page=search/web&search=piwik&type=Web&fl=0' + engine: 'talimba' + keywords: 'piwik'
\ No newline at end of file |