tonyair/silverstripe-fulltextsearch
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch synced 2024-10-22 14:05:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge bdc8c5a29d into fd8c721799

Browse Source
This commit is contained in:
Normann Lou 2012-08-22 15:24:30 -07:00
commit 04ec9a8995
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
code/solr/Solr.php
View File

@ -76,6 +76,7 @@ class Solr {
} }
class Solr_Configure extends BuildTask { class Solr_Configure extends BuildTask {
static $customised_conf_extra_path=null;
public function run($request) { public function run($request) {
$service = Solr::service(); $service = Solr::service();
@ -90,7 +91,6 @@ class Solr_Configure extends BuildTask {
case 'file': case 'file':
$local = $index['path']; $local = $index['path'];
$remote = isset($index['remotepath']) ? $index['remotepath'] : $local; $remote = isset($index['remotepath']) ? $index['remotepath'] : $local;
foreach (Solr::get_indexes() as $index => $instance) { foreach (Solr::get_indexes() as $index => $instance) {
$confdir = "$local/$index/conf"; $confdir = "$local/$index/conf";
if (!is_dir($confdir)) mkdir($confdir, 0770, true); if (!is_dir($confdir)) mkdir($confdir, 0770, true);
@ -98,7 +98,19 @@ class Solr_Configure extends BuildTask {
file_put_contents("$confdir/schema.xml", $instance->generateSchema()); file_put_contents("$confdir/schema.xml", $instance->generateSchema());
foreach (glob(Director::baseFolder().'/fulltextsearch/conf/extras/*') as $file) { foreach (glob(Director::baseFolder().'/fulltextsearch/conf/extras/*') as $file) {
if (is_file($file)) copy($file, $confdir.'/'.basename($file)); if (is_file($file)){
if(self::$customised_conf_extra_path) {
$filename = basename($file);
$file_customised = Director::baseFolder().'/'.self::$customised_conf_extra_path.'/'.$filename;
if(is_file($file_customised)){
copy($file_customised, $confdir.'/'.$filename);
}else{
copy($file, $confdir.'/'.basename($file));
}
}else{
copy($file, $confdir.'/'.basename($file));
}
}
} }
} }
@ -170,9 +182,15 @@ class Solr_Reindex extends BuildTask {
foreach (Solr::get_indexes() as $index => $instance) { foreach (Solr::get_indexes() as $index => $instance) {
echo "Rebuilding {$instance->getIndexName()}\n\n"; echo "Rebuilding {$instance->getIndexName()}\n\n";
Solr::service($index)->deleteByQuery('*:*'); $classes = $instance->getClasses();
if($request->getVar('class')) {
$limitClasses = explode(',', $request->getVar('class'));
$classes = array_intersect_key($classes, array_combine($limitClasses, $limitClasses));
}
foreach ($instance->getClasses() as $class => $options) { Solr::service($index)->deleteByQuery('ClassHierarchy:(' . implode(' OR ', array_keys($classes)) . ')');
foreach ($classes as $class => $options) {
$includeSubclasses = $options['include_children']; $includeSubclasses = $options['include_children'];
foreach (SearchVariant::reindex_states($class, $includeSubclasses) as $state) { foreach (SearchVariant::reindex_states($class, $includeSubclasses) as $state) {
@ -196,7 +214,7 @@ class Solr_Reindex extends BuildTask {
echo "$offset.."; echo "$offset..";
$cmd = "php $script dev/tasks/$self index=$index class=$class start=$offset variantstate=$statevar"; $cmd = "php $script dev/tasks/$self index=$index class=$class start=$offset variantstate=$statevar";
$res = `$cmd`; $res = passthru($cmd);
if (isset($_GET['verbose'])) { if (isset($_GET['verbose'])) {
echo "\n Running '$cmd'\n"; echo "\n Running '$cmd'\n";
echo " ".preg_replace('/\r\n|\n/', '$0 ', $res)."\n"; echo " ".preg_replace('/\r\n|\n/', '$0 ', $res)."\n";