tonyair
/
silverstripe-textextraction
mirror of https://github.com/silverstripe/silverstripe-textextraction
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.0'

This commit is contained in:
Robbie Averill 2019-06-26 15:26:08 +12:00
parent b4c634bb1f 943f393ee8
commit 5b967fd5d3
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Extractor/TikaServerTextExtractor.php
View File

@ -127,6 +127,11 @@ class TikaServerTextExtractor extends FileTextExtractor
public function getContent($file)
{
$tempFile = $file instanceof File ? $this->getPathFromFile($file) : $file;
return $this->getClient()->tika($tempFile);
$content = $this->getClient()->tika($tempFile);
//Cleanup temp file
if ($file instanceof File) {
unlink($tempFile);
}
return $content;
}
}

4
src/Extractor/TikaTextExtractor.php
View File

@ -80,6 +80,10 @@ class TikaTextExtractor extends FileTextExtractor
$path = $file instanceof File ? $this->getPathFromFile($file) : $file;
$command = sprintf('tika %s %s', $mode, escapeshellarg($path));
$code = $this->runShell($command, $output);
//Cleanup temp file
if ($file instanceof File) {
unlink($path);
}
if ($code == 0) {
return $output;