[GoogleSearchBridge] remove useless checks and useless member $request

still broken though

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
This commit is contained in:
Pierre Mazière 2016-08-27 12:43:53 +02:00
parent 2f1fa81082
commit c061057861

View file

@ -9,8 +9,6 @@
*/ */
class GoogleSearchBridge extends BridgeAbstract{ class GoogleSearchBridge extends BridgeAbstract{
private $request;
public function loadMetadatas() { public function loadMetadatas() {
$this->maintainer = "sebsauvage"; $this->maintainer = "sebsauvage";
@ -19,7 +17,10 @@ class GoogleSearchBridge extends BridgeAbstract{
$this->description = "Returns most recent results from Google search."; $this->description = "Returns most recent results from Google search.";
$this->parameters[] = array( $this->parameters[] = array(
'q'=>array('name'=>"keyword") 'q'=>array(
'name'=>"keyword",
'required'=>true
)
); );
} }
@ -29,13 +30,7 @@ class GoogleSearchBridge extends BridgeAbstract{
$param=$this->parameters[$this->queriedContext]; $param=$this->parameters[$this->queriedContext];
$html = ''; $html = '';
if (isset($param['q']['value'])) { /* keyword search mode */ $html = $this->getSimpleHTMLDOM('https://www.google.com/search?q=' . urlencode($param['q']['value']) . '&num=100&complete=0&tbs=qdr:y,sbd:1') or $this->returnServerError('No results for this query.');
$this->request = $param['q']['value'];
$html = $this->getSimpleHTMLDOM('https://www.google.com/search?q=' . urlencode($this->request) . '&num=100&complete=0&tbs=qdr:y,sbd:1') or $this->returnServerError('No results for this query.');
}
else{
$this->returnClientError('You must specify a keyword (?q=...).');
}
$emIsRes = $html->find('div[id=ires]',0); $emIsRes = $html->find('div[id=ires]',0);
if( !is_null($emIsRes) ){ if( !is_null($emIsRes) ){
@ -55,7 +50,8 @@ class GoogleSearchBridge extends BridgeAbstract{
} }
public function getName(){ public function getName(){
return (!empty($this->request) ? $this->request .' - ' : '') .'Google search'; $param=$this->parameters[$this->queriedContext];
return $param['q']['value'] .' - Google search';
} }
public function getCacheDuration(){ public function getCacheDuration(){