Skip to content

Improve uploader filter for dataset list API (#930) #1279

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

Improve uploader filter for dataset list API (#930) #1279

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
5 changes: 4 additions & 1 deletion openml_OS/models/api/v1/Api_data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,9 @@ private function data_list($segs) {
$name = element('data_name', $query_string, null);
$data_id = element('data_id', $query_string, null);
$uploader = element('uploader', $query_string, null);
if ($uploader !== null) {
$uploader = (int) $uploader;
}
$version = element('data_version', $query_string, null);
$status = element('status', $query_string, null);
$limit = element('limit', $query_string, null);
Expand All @@ -509,7 +512,7 @@ private function data_list($segs) {
$where_tag = $tag === null ? '' : ' AND `d`.`did` IN (select id from dataset_tag where tag="' . $tag . '") ';
$where_did = $data_id === null ? '' : ' AND `d`.`did` IN ('. $data_id . ') ';
$where_name = $name === null ? '' : ' AND `name` = "' . $name . '"';
$where_uploader = $uploader === null ? '' : ' AND `uploader` IN ("' . $uploader . '")';
$where_uploader = $uploader === null ? '' : ' AND `uploader` = ' . $uploader . ' ';
$where_version = $version === null ? '' : ' AND `version` = "' . $version . '" ';
$where_insts = $nr_insts === null ? '' : ' AND `d`.`did` IN (select data from data_quality dq where quality="NumberOfInstances" and value ' . (strpos($nr_insts, '..') !== false ? 'BETWEEN ' . str_replace('..',' AND ',$nr_insts) : '= '. $nr_insts) . ') ';
$where_feats = $nr_feats === null ? '' : ' AND `d`.`did` IN (select data from data_quality dq where quality="NumberOfFeatures" and value ' . (strpos($nr_feats, '..') !== false ? 'BETWEEN ' . str_replace('..',' AND ',$nr_feats) : '= '. $nr_feats) . ') ';
Expand Down