3.1 compat
This commit is contained in:
parent
b5c663570a
commit
b86483abc4
|
@ -13,7 +13,7 @@ Note: Previously part of the [sphinx module](https://github.com/silverstripe/sil
|
|||
|
||||
## Requirements
|
||||
|
||||
* SilverStripe 3.0
|
||||
* SilverStripe 3.1
|
||||
* (optional) [XPDF](http://www.foolabs.com/xpdf/) (`pdftotext` utility)
|
||||
* (optional) [Apache Solr with ExtracingRequestHandler](http://wiki.apache.org/solr/ExtractingRequestHandler)
|
||||
|
||||
|
|
|
@ -10,9 +10,10 @@ abstract class FileTextExtractor extends Object {
|
|||
* Set priority from 0-100.
|
||||
* The highest priority extractor for a given content type will be selected.
|
||||
*
|
||||
* @config
|
||||
* @var int
|
||||
*/
|
||||
public static $priority = 50;
|
||||
private static $priority = 50;
|
||||
|
||||
protected static $sorted_extractor_classes = null;
|
||||
|
||||
|
@ -28,7 +29,7 @@ abstract class FileTextExtractor extends Object {
|
|||
$classes = ClassInfo::subclassesFor("FileTextExtractor");
|
||||
array_shift($classes);
|
||||
$sortedClasses = array();
|
||||
foreach($classes as $class) $sortedClasses[$class] = Object::get_static($class, 'priority');
|
||||
foreach($classes as $class) $sortedClasses[$class] = Config::inst()->get($class, 'priority');
|
||||
arsort($sortedClasses);
|
||||
|
||||
self::$sorted_extractor_classes = $sortedClasses;
|
||||
|
|
|
@ -18,7 +18,7 @@ class HTMLTextExtractor extends FileTextExtractor {
|
|||
/**
|
||||
* Lower priority because its not the most clever HTML extraction. If there is something better, use it
|
||||
*/
|
||||
public static $priority = 10;
|
||||
private static $priority = 10;
|
||||
|
||||
/**
|
||||
* Extracts content from regex, by using strip_tags()
|
||||
|
|
|
@ -12,9 +12,13 @@ use Guzzle\Http\Client;
|
|||
*/
|
||||
class SolrCellTextExtractor extends FileTextExtractor {
|
||||
|
||||
public static $base_url;
|
||||
/**
|
||||
* @config
|
||||
* @var [type]
|
||||
*/
|
||||
private static $base_url;
|
||||
|
||||
public static $priority = 75;
|
||||
private static $priority = 75;
|
||||
|
||||
protected $httpClient;
|
||||
|
||||
|
|
Loading…
Reference in New Issue