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

Better feedback in Solr_Configure task

Browse Source
This commit is contained in:
Ingo Schommer 2012-07-19 17:16:50 +02:00
parent fd8c721799
commit fefd704582
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/solr/Solr.php
View File

@ -152,6 +152,7 @@ class Solr_Reindex extends BuildTask {
public function run($request) { public function run($request) {
increase_time_limit_to(); increase_time_limit_to();
$self = get_class($this); $self = get_class($this);
$verbose = isset($_GET['verbose']);
$originalState = SearchVariant::current_state(); $originalState = SearchVariant::current_state();
@ -187,7 +188,8 @@ class Solr_Reindex extends BuildTask {
$total = $query->count(); $total = $query->count();
$statevar = json_encode($state); $statevar = json_encode($state);
echo "Class: $class, total: $total in state $statevar\n"; echo "Class: $class, total: $total";
echo ($statevar) ? " in state $statevar\n" : "\n";
if (strpos(PHP_OS, "WIN") !== false) $statevar = '"'.str_replace('"', '\\"', $statevar).'"'; if (strpos(PHP_OS, "WIN") !== false) $statevar = '"'.str_replace('"', '\\"', $statevar).'"';
else $statevar = "'".$statevar."'"; else $statevar = "'".$statevar."'";
@ -196,11 +198,9 @@ 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`; if($verbose) echo "\n Running '$cmd'\n";
if (isset($_GET['verbose'])) { $res = $verbose ? passthru($cmd) : `$cmd`;
echo "\n Running '$cmd'\n"; if($verbose) echo " ".preg_replace('/\r\n|\n/', '$0 ', $res)."\n";
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($index)->commit();
@ -219,7 +219,6 @@ class Solr_Reindex extends BuildTask {
$classes = $index->getClasses(); $classes = $index->getClasses();
$options = $classes[$class]; $options = $classes[$class];
echo "Variant: "; print_r($variantstate);
SearchVariant::activate_state($variantstate); SearchVariant::activate_state($variantstate);
$includeSubclasses = $options['include_children']; $includeSubclasses = $options['include_children'];