Skip to content

Commit a903db5

Browse files
committed
Fix Perl API
1 parent b14fa3a commit a903db5

File tree

6 files changed

+11
-16
lines changed

6 files changed

+11
-16
lines changed

perl/CbrainAPI.pm

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -556,8 +556,7 @@ sub index_data_providers {
556556
$self->prep_req(GET => "/data_providers");
557557
if ($filters && ref($filters) eq "HASH") {
558558
$self->add_params($filters);
559-
$self->add_params({"update_filter" => "filter_hash"});
560-
$self->add_params({"clear_filter" => "filter_hash"});
559+
$self->add_params({"_simple_filters" => "1"});
561560
}
562561

563562
$self->request();
@@ -738,8 +737,7 @@ sub index_userfiles {
738737
$self->prep_req(GET => "/userfiles");
739738
if ($filters && ref($filters) eq "HASH") {
740739
$self->add_params($filters);
741-
$self->add_params({"update_filter" => "filter_hash"});
742-
$self->add_params({"clear_filter" => "filter_hash"});
740+
$self->add_params({"_simple_filters" => "1"});
743741
}
744742

745743
$self->request();
@@ -1235,8 +1233,7 @@ sub index_bourreaux {
12351233
$self->add_params($filters);
12361234
$self->add_params("type" => "Bourreau") if !defined($filters->{"type"});
12371235

1238-
$self->add_params({"update_filter" => "filter_hash"});
1239-
$self->add_params({"clear_filter" => "filter_hash"});
1236+
$self->add_params({"_simple_filters" => "1"});
12401237
}
12411238

12421239
$self->request();
@@ -1412,8 +1409,7 @@ sub index_users {
14121409
$self->prep_req(GET => "/users");
14131410
if ($filters && ref($filters) eq "HASH") {
14141411
$self->add_params($filters);
1415-
$self->add_params({"update_filter" => "filter_hash"});
1416-
$self->add_params({"clear_filter" => "filter_hash"});
1412+
$self->add_params({"_simple_filters" => "1"});
14171413
}
14181414

14191415
$self->request();
@@ -1593,8 +1589,7 @@ sub index_tasks {
15931589
$self->prep_req(GET => "/tasks");
15941590
if ($filters && ref($filters) eq "HASH") {
15951591
$self->add_params($filters);
1596-
$self->add_params({"update_filter" => "filter_hash"});
1597-
$self->add_params({"clear_filter" => "filter_hash"});
1592+
$self->add_params({"_simple_filters" => "1"});
15981593
}
15991594

16001595
$self->request();

perl/tests/301-show-userfile.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
die "Value returned not an hash.\n" unless defined($file_info) && ref($file_info) eq "HASH";
1515
die "You have no information for your userfile\n" if scalar(%$file_info) eq "0";
16-
die "You have no entry for log" unless exists $file_info->{"log"};
16+
die "You have no entry for userfile_log" unless exists $file_info->{"userfile_log"};
1717
die "You have no entry for syncstatus" unless exists $file_info->{"remote_sync_status"};
1818
die "You have no entry for parent_id" unless exists $file_info->{"parent_id"};
1919
die "You have no entry for children_ids" unless exists $file_info->{"children_ids"};

perl/tests/302-create-userfile.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
our $userfile_name_302 = "api_mytest1.$$.txt";
3434
my $full_path = "$orig_dp_dir/$userfile_name_302";
3535
our $one_line_302 = "This is a test of file creation! $$\n";
36-
my $long_text = $one_line_302 x 200;
36+
my $long_text = $one_line_302 x 2000;
3737

3838
open (MYFILE, ">>$full_path");
3939
print MYFILE "$long_text";

perl/tests/303-content-userfile.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
die "SKIPPED: You have no userfile to handle" unless defined($userfile_id_302);
77
die "SKIPPED: You have no information about file content" unless defined($one_line_302);
8-
die "SKIPPED: Do no have size of the originale file" unless defined($userfile_size_302);
8+
die "SKIPPED: Do not have size of the original file" unless defined($userfile_size_302);
99

1010
##################################
1111
# Stream file (content_userfile) #

perl/tests/305-download-userfiles.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
die "SKIPPED: You have no userfile to handle" unless defined($userfile_id_302);
1010
die "SKIPPED: You have no information about file content" unless defined($one_line_302);
11-
die "SKIPPED: Do no have size of the originale file" unless defined($userfile_size_302);
12-
die "SKIPPED: Do no have userfiles ids" unless defined($userfile_ids);
11+
die "SKIPPED: Do not have size of the original file" unless defined($userfile_size_302);
12+
die "SKIPPED: Do not have userfiles ids" unless defined($userfile_ids);
1313

1414
######################################
1515
# Download file (download_userfiles) #

perl/tests/504-disk_cache_report-bourreau.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
die "Value returned not an hash.\n" unless defined($bourreau_disk_cache_report_info) && ref($bourreau_disk_cache_report_info) eq "HASH";
1515
my $admin_id = $admin->session_status();
16-
die "Value returned don't contain expected value.\n" unless $bourreau_disk_cache_report_info->{"${admin_id}"}->{"number_entries"};
16+
die "Value returned don't contain expected value.\n" unless $bourreau_disk_cache_report_info->{"${admin_id}"}->{"number_entries"} =~ m/^\d+$/;
1717

1818

1919
1;

0 commit comments

Comments
 (0)