Skip to content

fix(search): advanced search now ORs same-column filters #207

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
sreeshanth-soma wants to merge 1 commit into
base: 5.5-develop
Choose a base branch
from
Open

fix(search): advanced search now ORs same-column filters #207

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
89 changes: 52 additions & 37 deletions core/models/media_model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,46 +1015,47 @@ public function search_filters_where_array($args = [])
$filters = $args['filters'];

$where_array = [];
$grouped_filters = [];

// our possible column (mappings)
$column_array = [];
$column_array['artist'] = 'media.artist';
$column_array['title'] = 'media.title';
$column_array['album'] = 'media.album';
$column_array['year'] = 'media.year';
$column_array['type'] = 'media.type';
$column_array['status'] = 'media.status';
$column_array['category'] = 'media.category_id';
$column_array['country'] = 'media.country';
$column_array['language'] = 'media.language';
$column_array['genre'] = 'media.genre_id';
$column_array['duration'] = 'media.duration';
$column_array['comments'] = 'media.comments';
$column_array['is_copyright_owner'] = 'media.is_copyright_owner';
$column_array['dynamic_select'] = 'media.dynamic_select';

foreach ($filters as $filter) {
if (is_object($filter)) {
$filter = get_object_vars($filter);
}
$metadata_fields = $this->models->mediametadata('get_all');
$metadata_defaults = [];
foreach ($metadata_fields as $metadata_field) {
$column_array['metadata_' . $metadata_field['name']] = 'media.metadata_' . $metadata_field['name'];
if (isset($metadata_field['settings']->default)) {
$default = $metadata_field['settings']->default;

// our possible column (mappings)
$column_array = [];
$column_array['artist'] = 'media.artist';
$column_array['title'] = 'media.title';
$column_array['album'] = 'media.album';
$column_array['year'] = 'media.year';
$column_array['type'] = 'media.type';
$column_array['status'] = 'media.status';
$column_array['category'] = 'media.category_id';
$column_array['country'] = 'media.country';
$column_array['language'] = 'media.language';
$column_array['genre'] = 'media.genre_id';
$column_array['duration'] = 'media.duration';
$column_array['comments'] = 'media.comments';
$column_array['is_copyright_owner'] = 'media.is_copyright_owner';
$column_array['dynamic_select'] = 'media.dynamic_select';

$metadata_fields = $this->models->mediametadata('get_all');
$metadata_defaults = [];
foreach ($metadata_fields as $metadata_field) {
$column_array['metadata_' . $metadata_field['name']] = 'media.metadata_' . $metadata_field['name'];
if (isset($metadata_field['settings']->default)) {
$default = $metadata_field['settings']->default;
// make lowercase for case insensitive comparison
if (is_array($default)) {
$default = array_map('strtolower', $default);
} else {
$default = strtolower($default);
}

// make lowercase for case insensitive comparison
if (is_array($default)) {
$default = array_map('strtolower', $default);
} else {
$default = strtolower($default);
}
// keep track for comparison below
$metadata_defaults['metadata_' . $metadata_field['name']] = $default;
}
}

// keep track for comparison below
$metadata_defaults['metadata_' . $metadata_field['name']] = $default;
}
foreach ($filters as $filter) {
if (is_object($filter)) {
$filter = get_object_vars($filter);
}

// find_in_set works a bit differently
Expand Down Expand Up @@ -1124,7 +1125,21 @@ public function search_filters_where_array($args = [])
$tmp_sql .= '"';
}

$where_array[] = $tmp_sql;
// Group by SQL column so same-column filters can be OR'd.
$group_key = $column_array[$filter['filter']];
if (!isset($grouped_filters[$group_key])) {
$grouped_filters[$group_key] = [];
}
$grouped_filters[$group_key][] = $tmp_sql;
}

// Same-column filters are OR'd, different columns stay AND'd by caller.
foreach ($grouped_filters as $conditions) {
if (count($conditions) === 1) {
$where_array[] = $conditions[0];
} else {
$where_array[] = '(' . implode(' OR ', $conditions) . ')';
}
}

return $where_array;
Expand Down
Loading