diff --git a/bridges/AcrimedBridge.php b/bridges/AcrimedBridge.php index c84544c2..8ddbc853 100644 --- a/bridges/AcrimedBridge.php +++ b/bridges/AcrimedBridge.php @@ -11,12 +11,11 @@ class AcrimedBridge extends RssExpander{ } public function collectData(){ - $param=$this->parameters[$this->queriedContext]; - parent::collectExpandableDatas($param, "http://www.acrimed.org/spip.php?page=backend"); + parent::collectExpandableDatas("http://www.acrimed.org/spip.php?page=backend"); } - + protected function parseRSSItem($newsItem) { $hs = new HTMLSanitizer(); diff --git a/bridges/CpasbienBridge.php b/bridges/CpasbienBridge.php index c0583cfc..d41d4423 100644 --- a/bridges/CpasbienBridge.php +++ b/bridges/CpasbienBridge.php @@ -1,8 +1,6 @@ maintainer = "lagaisse"; @@ -23,13 +21,11 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{ public function collectData(){ $param=$this->parameters[$this->queriedContext]; - $this->loadMetadatas(); $html = ''; if (isset($param['q']['value'])) { /* keyword search mode */ - $this->request = str_replace(" ","-",trim($param['q']['value'])); - $html = $this->getSimpleHTMLDOM($this->uri.'/recherche/'.urlencode($this->request).'.html') or $this->returnServerError('No results for this query.'); - } - else { + $request = str_replace(" ","-",trim($param['q']['value'])); + $html = $this->getSimpleHTMLDOM($this->uri.'/recherche/'.urlencode($request).'.html') or $this->returnServerError('No results for this query.'); + } else { $this->returnClientError('You must specify a keyword (?q=...).'); } @@ -46,8 +42,7 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{ $textefiche=$htmlepisode->find('#textefiche', 0)->find('p',1); if (isset($textefiche)) { $item['content'] = $textefiche->text(); - } - else { + } else { $p=$htmlepisode->find('#textefiche',0)->find('p'); if(!empty($p)){ $item['content'] = $htmlepisode->find('#textefiche', 0)->find('p',0)->text(); @@ -59,13 +54,12 @@ class CpasbienBridge extends HttpCachingBridgeAbstract{ $this->items[] = $item; } } - - } public function getName(){ - return (!empty($this->request) ? $this->request .' - ' : '') . $this->name; + return $this->parameters[$this->queriedContext]['q']['value'] + .' : '.$this->name; } public function getCacheDuration(){ diff --git a/bridges/FreenewsBridge.php b/bridges/FreenewsBridge.php index f84dc7ac..bc2c193b 100644 --- a/bridges/FreenewsBridge.php +++ b/bridges/FreenewsBridge.php @@ -15,8 +15,7 @@ class FreenewsBridge extends RssExpander { } public function collectData(){ - $param=$this->parameters[$this->queriedContext]; - parent::collectExpandableDatas($param, FREENEWS_RSS); + parent::collectExpandableDatas(FREENEWS_RSS); } protected function parseRSSItem($newsItem) { diff --git a/bridges/GawkerBridge.php b/bridges/GawkerBridge.php index cc1ae631..65a9ce1f 100644 --- a/bridges/GawkerBridge.php +++ b/bridges/GawkerBridge.php @@ -30,7 +30,7 @@ class GawkerBridge extends RssExpander{ $url = $this->toURI(strtolower($param['site']['value'])); } $this->debugMessage("loading feed from ".$this->getURI()); - parent::collectExpandableDatas($param, $url); + parent::collectExpandableDatas($url); } protected function parseRSSItem($newsItem) { diff --git a/bridges/Les400CulsBridge.php b/bridges/Les400CulsBridge.php index 2fc09125..2dd9883f 100644 --- a/bridges/Les400CulsBridge.php +++ b/bridges/Les400CulsBridge.php @@ -15,10 +15,9 @@ class Les400CulsBridge extends RssExpander{ public function collectData(){ - $param=$this->parameters[$this->queriedContext]; - parent::collectExpandableDatas($param, SEXE_FEED); + parent::collectExpandableDatas(SEXE_FEED); } - + protected function parseRSSItem($newsItem) { $item = array(); $item['title'] = trim((string) $newsItem->title); diff --git a/bridges/TheOatMealBridge.php b/bridges/TheOatMealBridge.php index 9cb7caa7..c6ab0cd0 100644 --- a/bridges/TheOatMealBridge.php +++ b/bridges/TheOatMealBridge.php @@ -14,8 +14,7 @@ class TheOatmealBridge extends RssExpander{ } public function collectData(){ - $param=$this->parameters[$this->queriedContext]; - parent::collectExpandableDatas($param, THE_OATMEAL_RSS); + parent::collectExpandableDatas(THE_OATMEAL_RSS); } @@ -51,14 +50,14 @@ class TheOatmealBridge extends RssExpander{ $content = $articlePage->find('#blog'); } $item['content'] = $content->innertext; - + $this->debugMessage("dc content is ".var_export($dc, true)); $item['author'] = (string) $dc->creator; $item['timestamp'] = DateTime::createFromFormat(DateTime::ISO8601, $dc->date)->getTimestamp(); $this->debugMessage("writtem by ".$item['author']." on ".$item['timestamp']); return $item; } - + public function getCacheDuration(){ return 7200; // 2h hours } diff --git a/lib/Bridge.php b/lib/Bridge.php index 86a165c7..b13ab523 100644 --- a/lib/Bridge.php +++ b/lib/Bridge.php @@ -467,12 +467,12 @@ abstract class HttpCachingBridgeAbstract extends BridgeAbstract { abstract class RssExpander extends HttpCachingBridgeAbstract { - public function collectExpandableDatas(array $param, $name){ + public function collectExpandableDatas($name){ if(empty($name)){ $this->returnServerError('There is no $name for this RSS expander'); } - $this->debugMessage('Loading from ' . $param['url']); + $this->debugMessage('Loading from ' . $name); /* Notice we do not use cache here on purpose: * we want a fresh view of the RSS stream each time @@ -480,7 +480,7 @@ abstract class RssExpander extends HttpCachingBridgeAbstract { $content = $this->getContents($name) or $this->returnServerError('Could not request ' . $name); $rssContent = simplexml_load_string($content); - $this->debugMessage('loaded RSS from ' . $param['url']); + $this->debugMessage('loaded RSS from ' . $name); // TODO insert RSS format detection // For now we always assume RSS 2.0 $this->collect_RSS_2_0_data($rssContent);