Skip to content

Fixed query with hidden search fields. #7

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
Daniel-KM wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed query with hidden search fields. #7

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
70 changes: 68 additions & 2 deletions HideElementsPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,15 @@

class HideElementsPlugin extends Omeka_Plugin_AbstractPlugin
{
protected $_hooks = array('initialize', 'config', 'config_form',
'install', 'uninstall', 'upgrade');
protected $_hooks = array(
'install',
'uninstall',
'upgrade',
'initialize',
'config',
'config_form',
'items_browse_sql',
);

protected $_filters = array('display_elements', 'elements_select_options');

Expand Down Expand Up @@ -92,6 +99,65 @@ public function hookConfig($args)
set_option('hide_elements_settings', json_encode($settings));
}

/**
* Hook used to alter the query for items.
*
* @param array $args
*/
public function hookItemsBrowseSql($args)
{
if ($this->_overrideFilter() || !isset($this->_settings['search']) || empty($this->_settings['search'])) {
Copy link
Owner

@zerocrates zerocrates Oct 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The !isset() on this line is redundant, it should be entirely covered by the empty().

Copy link
Author

@Daniel-KM Daniel-KM Oct 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok.

return;
}

$db = $this->_db;
$select = $args['select'];
$params = $args['params'];

// Flat the list of elements to hide in order to simplify the process.
$elementIdsToHide = array();
foreach ($this->_settings['search'] as $elementSet => $elements) {
$elementIdsToHide = array_merge($elementIdsToHide, array_keys($elements));
}

// If there is a field where there is a "hide search", the search is
// forbidden in this field, so the query shouldn't search in this field.
// So, remove them from query.
if (isset($params['search']) && !empty($params['search'])) {
// The join clause set in Table_Item::_simpleSearch() should be
// replaced, but Zend doesn't allow it, so another clause is added.
$select->joinLeft(
array('_hide_etx' => $db->ElementText),
"_hide_etx.record_id = items.id AND _hide_etx.record_type = 'Item'" .
' AND _hide_etx.element_id NOT IN (' . implode(',', $elementIdsToHide) . ')',
array()
);
$terms = $params['search'];
$tagList = preg_split('/\s+/', $terms);
if (count($tagList) > 1) {
$tagList[] = $terms;
}
$whereCondition = $db->quoteInto('_hide_etx.text LIKE ?', '%' . $terms . '%')
. ' OR '
. $db->quoteInto('_simple_tags.name IN (?)', $tagList);
$select->where($whereCondition);
}

// If there is a field where there is a "hide search", the search is
// forbidden in this field, so the query shouldn't return any result.
// So, check all advanced queries with such a field.
if (isset($params['advanced'])) {
foreach ($params['advanced'] as $key => $advanced) {
if (in_array($advanced['element_id'], $elementIdsToHide)) {
// reset() is not possible in a hook, so an impossible condition
// is added.
$select->where('1 = 0');
return;
}
}
}
}

public function filterDisplayElements($elementsBySet)
{
if ($this->_overrideFilter()) {
Expand Down