Commit Graph

190 Commits

Author SHA1 Message Date
Charlie Bergthaler 242e5a307d FIX Change check for cleanup of temp files only if file is instance of File. 2019-06-26 15:18:31 +12:00
Charlie Bergthaler a9270d73ad FIX Cleanup temporary file after extracting content in TikaServerTextExtractor and TikaTextExtractor 2019-06-26 15:18:31 +12:00
Robbie Averill b4c634bb1f Merge branch '3.0' 2019-06-26 15:17:42 +12:00
Robbie Averill 20079bd33f Remove SilverStripe 4.0-4.2 from Travis builds 2019-06-26 15:17:34 +12:00
Guy Marriott c5cfe4ea1e
Merge pull request #53 from martinhipp/bugfix/tika-version-number-checking
Return version number as string instead of float
2019-04-05 10:07:00 +13:00
Martin Hipp bff5eb2b79
Return version number as string instead of floats so '1.20' does not become 1.2 2019-04-05 09:56:45 +13:00
Robbie Averill 801cd9cacb Merge branch '3.0' 2019-02-22 09:34:11 +07:00
Dylan Wagstaff 9c2da06178
Merge pull request #52 from creative-commoners/pulls/3.0/fix-tests
FIX Ensure Tika responses are casted as strings, fixes broken unit tests
2019-02-14 10:15:55 +13:00
Robbie Averill 276fd9c856 Add PSR-4 autoloader and update Travis to include PHP 7.3 and SS 4.3 2019-02-13 11:42:51 +07:00
Robbie Averill 759d92ccb4 FIX Ensure Tika responses are casted as strings, fixes broken unit tests
They can be returned as a stream, but the TikaRestClient response is documented as a string
2019-02-13 11:42:51 +07:00
Robbie Averill b9502653c2
Merge pull request #51 from ishannz/patch-1
Update isAvailable check to work for identical versions
2019-02-13 11:28:04 +07:00
Robbie Averill 86eba78064 Add tests for isAvailable() 2019-02-13 11:23:28 +07:00
Ishan Jayamanne 21ed6e0f86 Update isAvailable check to work for identical versions
Tika server reports it's version as "Apache Tika 1.7". Unfortunately, `version_compare` in PHP says that version "1.7" is less than version "1.7.0", meaning that Tika server was incorrectly being ruled out unless you used Tika server version 1.8 (where "1.8" > "1.7.0").

Changing the comparison string to just "1.7" means they match exactly, and therefore `version_compare` will return `0` rather than `-1`.
2019-02-13 11:15:54 +07:00
Robbie Averill 75a8c66eee Merge branch '3.0' 2018-07-09 10:04:00 +12:00
Robbie Averill 07c000dc0d Remove obsolete branch alias 2018-07-09 10:03:13 +12:00
Dylan Wagstaff 03d1fef4ae
Merge pull request #47 from creative-commoners/pulls/3.0/fix-extractors
FIX Update Guzzle implementations in extractors to ensure they're working
2018-07-09 09:57:17 +12:00
Robbie Averill e1e7cdbfa4 FIX Update SolrCellTextExtractor to use a Guzzle 6 API implementation 2018-07-06 16:11:59 +12:00
Robbie Averill 231a2091af FIX Update Guzzle implementations in Tika extractors 2018-07-06 16:11:59 +12:00
Daniel Hensby b20738573f
Merge pull request #46 from creative-commoners/pulls/3.0/remove-deps
Remove unused symfony dependencies and FileTextExtractor::get_mime
2018-07-04 10:28:06 +01:00
Robbie Averill 1b8ea2e451 Remove unused symfony dependencies and FileTextExtractor::get_mime 2018-07-04 16:23:22 +12:00
Dylan Wagstaff 9795866abe
Merge pull request #45 from creative-commoners/pulls/3.0/ss4-updates
API Update namespaces and SilverStripe API implementations for SilverStripe 4 compat
2018-07-04 11:34:17 +12:00
Robbie Averill 9e8ed243d0 Seperate Tika tests, group them for phpunit, further reduce log level, make Extractors injectable 2018-07-03 17:15:18 +12:00
Robbie Averill 397e7a5d40 API FileTextExtractor::getContent now supports a File and a filename path string 2018-07-03 17:03:47 +12:00
Robbie Averill 40e4b05f5d DOCS Update documentation for SilverStripe 4 2018-07-03 17:03:19 +12:00
Robbie Averill 5e5a1f05da FIX Reduce log level to prevent it being caught in SilverStripe error handler
See https://github.com/silverstripe/silverstripe-framework/issues/8044 for context
2018-07-03 16:40:40 +12:00
Robbie Averill 6bf932e5f0 FIX unlink call checks that a file exists first, and tests pass a File object 2018-07-03 16:30:05 +12:00
Robbie Averill 770af5cfc9 Add versioned as a requirement, and php codesniffer 2018-07-03 16:22:43 +12:00
Robbie Averill 3c1457c0ee Update broken path in phpunit configuration 2018-07-03 16:00:31 +12:00
Robbie Averill 5d53be9df6 Set minimum stability and reformat composer.json 2018-07-03 15:58:12 +12:00
Robbie Averill edb02e9189 API FileTextExtractable::getContent now takes a File instance instead of a path 2018-07-03 15:55:02 +12:00
Robbie Averill 8bd019b2aa Update codebase to ensure relative PSR-2 compliance 2018-07-03 11:37:38 +12:00
Robbie Averill e2404fc904 Update gitattributes and Scrutinizer configuration 2018-07-03 11:36:04 +12:00
Robbie Averill 8d295ada9c Add phpunit/phpcs configuration and update Travis configuration 2018-07-03 11:35:52 +12:00
Robbie Averill fe5148e678 API Add namespaces to tests and update SapphireTest implementation 2018-07-03 11:35:24 +12:00
Robbie Averill 66c9db8c0d API Update namespaces for FileTextCache and add upgrader mapping 2018-07-03 11:23:27 +12:00
Robbie Averill f1bacd2aa9 Bump license year 2018-07-03 10:48:02 +12:00
Robbie Averill 300941c9e8 Update readme badges and requirements for SilverStripe 4 2018-07-03 10:47:56 +12:00
Robbie Averill dd292bd554 Switch to vendor module 2018-07-03 10:41:41 +12:00
Robbie Averill 45cd9ae4ed
Merge pull request #44 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:43:02 +12:00
Dylan Wagstaff d06569c8fd Add supported module badge to readme 2018-06-15 17:50:30 +12:00
Dylan Wagstaff 31925d654e
Merge pull request #41 from silverstripe/pulls/3.0/constraints
Update dependency constraints in composer.json
2018-02-02 14:44:19 +13:00
Robbie Averill e491042d3b
Update dependency constraints in composer.json 2018-02-02 12:52:19 +13:00
Robbie Averill 33746e0cd7
Merge pull request #38 from phptek/issue/37
FIX: Fixes #37 First-pass SS4 compatibility.
2018-01-17 14:07:59 +13:00
Russell Michell 912c457c7d FIX: Updated namespace refs for GuzzleHttp (from Guzzle\Http) 2017-12-22 14:34:40 +13:00
Russell Michell d09a5aa97c FIX: Upgraded Guzzle to 6.latest 2017-12-22 14:00:41 +13:00
Russell Michell f341010d7a FIX: First-pass SS4 compatibility.
- Added namespaces, use statements
- Added missing docblocks etc
- Uses SS4's new Cache system
- Uses proper environment vars
- Cannot instantiate 'FileTextCache' (interface) as a service. This can be configured through YML, so default to FileTextCache_Cache
- Modded YML config to make it run.
- Fixes to allow TIKA to actually get file contents.
- Addresses issues raised by @robbieaverill
- Rebased against github.com/silverstripe/silverstripe-textextraction:master
- Replaced `SS_Log` with Monolog.
2017-12-21 10:41:06 +13:00
Robbie Averill 875e608d0f Update branch alias for 3.x-dev 2017-12-20 16:43:15 +13:00
Robbie Averill c83a7c3403 Merge branch '2' 2017-12-20 16:42:44 +13:00
Robbie Averill 95d96efe40 Merge branch '2.1' into 2 2017-12-20 16:42:35 +13:00
Robbie Averill 9f04583ed5 Merge branch '2.0' into 2.1 2017-12-20 16:41:27 +13:00