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 #309 from GuySartorelli/patch-3

Browse Source 
FIX Separate out all command components so Solr_Reindex works in dev mode
This commit is contained in:
Michal Kleiner 2022-01-26 22:05:03 +13:00 committed by GitHub
commit f0e781da36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
View File

@ -77,15 +77,12 @@ class SolrReindexImmediateHandler extends SolrReindexBase
$indexClass = get_class($indexInstance); $indexClass = get_class($indexInstance);
// Build script parameters // Build script parameters
$indexClassEscaped = $indexClass;
$statevar = json_encode($state); $statevar = json_encode($state);
if (strpos(PHP_OS, "WIN") !== false) { if (strpos(PHP_OS, "WIN") !== false) {
$statevar = '"' . str_replace('"', '\\"', $statevar) . '"'; $statevar = '"' . str_replace('"', '\\"', $statevar) . '"';
} else { } else {
$statevar = "'" . $statevar . "'"; $statevar = "'" . $statevar . "'";
$class = addslashes($class);
$indexClassEscaped = addslashes($indexClass);
} }
$php = Environment::getEnv('SS_PHP_BIN') ?: Config::inst()->get(static::class, 'php_bin'); $php = Environment::getEnv('SS_PHP_BIN') ?: Config::inst()->get(static::class, 'php_bin');
@ -93,11 +90,12 @@ class SolrReindexImmediateHandler extends SolrReindexBase
// Build script line // Build script line
$frameworkPath = ModuleLoader::getModule('silverstripe/framework')->getPath(); $frameworkPath = ModuleLoader::getModule('silverstripe/framework')->getPath();
$scriptPath = sprintf("%s%scli-script.php", $frameworkPath, DIRECTORY_SEPARATOR); $scriptPath = sprintf("%s%scli-script.php", $frameworkPath, DIRECTORY_SEPARATOR);
$scriptTask = "{$php} {$scriptPath} dev/tasks/{$taskName}";
$cmd = [ $cmd = [
$scriptTask, $php,
"index={$indexClassEscaped}", $scriptPath,
"dev/tasks/{$taskName}",
"index={$indexClass}",
"class={$class}", "class={$class}",
"group={$group}", "group={$group}",
"groups={$groups}", "groups={$groups}",