tonyair/silverstripe-textextraction
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-textextraction synced 2024-10-22 11:06:00 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Updated namespace refs for GuzzleHttp (from Guzzle\Http)

Browse Source
This commit is contained in:
Russell Michell 2017-12-22 14:34:40 +13:00
parent d09a5aa97c
commit 912c457c7d
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Extractor/SolrCellTextExtractor.php
View File

@ -3,8 +3,7 @@
namespace SilverStripe\TextExtraction\Extractor;
use SilverStripe\TextExtraction\Extractor\FileTextExtractor,
Guzzle\Http\Client,
\InvalidArgumentException,
GuzzleHttp\Client,
Psr\Log\LoggerInterface;
/**
@ -36,19 +35,19 @@ class SolrCellTextExtractor extends FileTextExtractor
/**
*
* @var Guzzle\Http\Client
* @var GuzzleHttp\Client
*/
protected $httpClient;
/**
*
* @return Guzzle\Http\Client
* @return GuzzleHttp\Client
* @throws InvalidArgumentException
*/
public function getHttpClient()
{
if (!$this->config()->get('base_url')) {
throw new InvalidArgumentException('SolrCellTextExtractor.base_url not specified');
throw new \InvalidArgumentException('SolrCellTextExtractor.base_url not specified');
}
if (!$this->httpClient) {
$this->httpClient = new Client($this->config()->get('base_url'));
@ -59,7 +58,7 @@ class SolrCellTextExtractor extends FileTextExtractor
/**
*
* @param Guzzle\Http\Client $client
* @param GuzzleHttp\Client $client
* @return void
*/
public function setHttpClient($client)
@ -125,7 +124,7 @@ class SolrCellTextExtractor extends FileTextExtractor
->addPostFields(array('extractOnly' => 'true', 'extractFormat' => 'text'))
->addPostFiles(array('myfile' => $path));
$response = $request->send();
} catch (InvalidArgumentException $e) {
} catch (\InvalidArgumentException $e) {
$msg = sprintf(
'Error extracting text from "%s" (message: %s)',
$path,
@ -134,7 +133,7 @@ class SolrCellTextExtractor extends FileTextExtractor
Injector::inst()->get(LoggerInterface::class)->notice($msg);
return null;
} catch (Guzzle\Http\Exception\ServerErrorResponseException $e) {
} catch (\Exception $e) {
// Catch other errors that Tika can throw vai Guzzle but are not caught and break Solr search query in some cases.
$msg = sprintf(
'Tika server error attempting to extract from "%s" (message: %s)',

4
src/Rest/TikaRestClient.php
View File

@ -2,8 +2,8 @@
namespace SilverStripe\TextExtraction\Rest;
use Guzzle\Http\Client,
Guzzle\Http\Exception\RequestException,
use GuzzleHttp\Client,
GuzzleHttp\Exception\RequestException,
SilverStripe\Core\Environment,
Psr\Log\LoggerInterface,
SilverStripe\Core\Injector\Injector;