proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-15 10:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

introduce '-alist' format

Browse Source 
This new meta-format is used for list which need to be 0 terminated.
The default '-list' format is now always [,; ] terminated.
This commit is contained in:
Dietmar Maurer 2011-10-25 08:36:28 +02:00
parent f38995ab14
commit 23dc9401bb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/PVE/JSONSchema.pm
View File

@ -173,7 +173,7 @@ sub check_format {
return if $format eq 'regex';
if ($format =~ m/^(.*)-list$/) {
if ($format =~ m/^(.*)-a?list$/) {
my $code = $format_list->{$1};
@ -871,7 +871,7 @@ sub get_options {
} elsif ($pd->{type} eq 'boolean') {
push @getopt, "$prop:s";
} else {
if ($pd->{format} && $pd->{format} =~ m/-list/) {
if ($pd->{format} && $pd->{format} =~ m/-a?list/) {
push @getopt, "$prop=s@";
} else {
push @getopt, "$prop=s";
@ -914,12 +914,13 @@ sub get_options {
} else {
raise("unable to parse boolean option\n", code => HTTP_BAD_REQUEST);
}
} elsif ($pd->{format} && $pd->{format} =~ m/-list/) {
} elsif ($pd->{format}) {
if ($pd->{format} eq 'pve-vmid-list') {
if ($pd->{format} =~ m/-list/) {
# allow --vmid 100 --vmid 101 and --vmid 100,101
# allow --dow mon --dow fri and --dow mon,fri
$opts->{$p} = join(",", @{$opts->{$p}});
} else {
} elsif ($pd->{format} =~ m/-alist/) {
# we encode array as \0 separated strings
# Note: CGI.pm also use this encoding
if (scalar(@{$opts->{$p}}) != 1) {