Skip to content

Allow to reindex without clearing the index #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jajm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow to reindex without clearing the index #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion controllers/AdminController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,12 @@ public function reindexAction()

if ($this->_request->isPost()) {
try {
$clear = $this->getRequest()->getParam('clear') ? true : false;

// Clear and reindex.
Zend_Registry::get('job_dispatcher')->sendLongRunning(
'SolrSearch_Job_Reindex'
'SolrSearch_Job_Reindex',
array('clear' => $clear)
);

// Flash success.
Expand Down
9 changes: 8 additions & 1 deletion forms/SolrSearch_Form_Reindex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@ public function init()

parent::init();

$this->addElement('checkbox', 'clear', array(
'label' => __('Clear index'),
));

$this->addElement('submit', 'submit', array(
'label' => __('Clear and Reindex')
'label' => __('Reindex')
));

$this->addDisplayGroup(array('clear'), 'fields');
$this->addDisplayGroup(array('submit'), 'submit_button');

}


Expand Down
5 changes: 4 additions & 1 deletion jobs/SolrSearch_Job_Reindex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ class SolrSearch_Job_Reindex extends Omeka_Job_AbstractJob
*/
public function perform()
{
SolrSearch_Helpers_Index::deleteAll();
if (isset($this->_options['clear']) && $this->_options['clear']) {
SolrSearch_Helpers_Index::deleteAll();
}

SolrSearch_Helpers_Index::indexAll();
}

Expand Down