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 pull request #59 from ss23/3.0-compat

Browse Source 
Use SolrIndex->getIndexName() consistently
This commit is contained in:
Sean Harvey 2014-11-25 12:13:33 +13:00
commit 9fe8699afa
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
code/solr/Solr.php
View File

@ -101,8 +101,9 @@ class Solr_Configure extends BuildTask {
$remote = isset($index['remotepath']) ? $index['remotepath'] : $local; $remote = isset($index['remotepath']) ? $index['remotepath'] : $local;
foreach ($indexes as $index => $instance) { foreach ($indexes as $index => $instance) {
$indexName = $instance->getIndexName();
$sourceDir = $instance->getExtrasPath(); $sourceDir = $instance->getExtrasPath();
$targetDir = "$local/$index/conf"; $targetDir = "$local/$indexName/conf";
if (!is_dir($targetDir)) { if (!is_dir($targetDir)) {
$worked = @mkdir($targetDir, 0770, true); $worked = @mkdir($targetDir, 0770, true);
if(!$worked) { if(!$worked) {
@ -133,7 +134,8 @@ class Solr_Configure extends BuildTask {
$remote = $index['remotepath']; $remote = $index['remotepath'];
foreach ($indexes as $index => $instance) { foreach ($indexes as $index => $instance) {
$indexdir = "$url/$index"; $indexName = $instance->getIndexName();
$indexdir = "$url/$indexName";
if (!WebDAV::exists($indexdir)) WebDAV::mkdir($indexdir); if (!WebDAV::exists($indexdir)) WebDAV::mkdir($indexdir);
$sourceDir = $instance->getExtrasPath(); $sourceDir = $instance->getExtrasPath();
@ -158,9 +160,9 @@ class Solr_Configure extends BuildTask {
foreach ($indexes as $index => $instance) { foreach ($indexes as $index => $instance) {
$indexName = $instance->getIndexName(); $indexName = $instance->getIndexName();
if ($service->coreIsActive($index)) { if ($service->coreIsActive($indexName)) {
echo "Reloading configuration..."; echo "Reloading configuration...";
$service->coreReload($index); $service->coreReload($indexName);
echo "done\n"; echo "done\n";
} else { } else {
echo "Creating configuration..."; echo "Creating configuration...";
@ -198,7 +200,8 @@ class Solr_Reindex extends BuildTask {
$class = get_class($this); $class = get_class($this);
foreach (Solr::get_indexes() as $index => $instance) { foreach (Solr::get_indexes() as $index => $instance) {
echo "Rebuilding {$instance->getIndexName()}\n\n"; $indexName = $instance->getIndexName();
echo "Rebuilding {$indexName}\n\n";
$classes = $instance->getClasses(); $classes = $instance->getClasses();
if($request->getVar('class')) { if($request->getVar('class')) {
@ -206,7 +209,7 @@ class Solr_Reindex extends BuildTask {
$classes = array_intersect_key($classes, array_combine($limitClasses, $limitClasses)); $classes = array_intersect_key($classes, array_combine($limitClasses, $limitClasses));
} }
Solr::service($index)->deleteByQuery('ClassHierarchy:(' . implode(' OR ', array_keys($classes)) . ')'); Solr::service($indexName)->deleteByQuery('ClassHierarchy:(' . implode(' OR ', array_keys($classes)) . ')');
foreach ($classes as $class => $options) { foreach ($classes as $class => $options) {
$includeSubclasses = $options['include_children']; $includeSubclasses = $options['include_children'];
@ -240,12 +243,12 @@ class Solr_Reindex extends BuildTask {
if($verbose) echo " ".preg_replace('/\r\n|\n/', '$0 ', $res)."\n"; if($verbose) echo " ".preg_replace('/\r\n|\n/', '$0 ', $res)."\n";
// If we're in dev mode, commit more often for fun and profit // If we're in dev mode, commit more often for fun and profit
if (Director::isDev()) Solr::service($index)->commit(); if (Director::isDev()) Solr::service($indexName)->commit();
} }
} }
} }
Solr::service($index)->commit(); Solr::service($indexName)->commit();
} }
} }