arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix more instances of namespace for JSON functions

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14903 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-01-16 21:02:09 +00:00
parent 499cc45999
commit 496393222f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@ -1299,7 +1299,7 @@ sub mkinstall
$httpprefix =~ s/^$installroot/\/install/;
}
my $kcmdline =
"quiet repo=$httpmethod://$instserver:$httpport$pkgdir ks=$httpmethod://"
"quiet repo=$httpmethod://$instserver:$httpport$httpprefix ks=$httpmethod://"
. $instserver . ":". $httpport
. "/install/autoinst/"
. $node;

16
xCAT-server/xCAT-wsapi/xcatws.cgi
View File

@ -370,7 +370,7 @@ sub imagesHandler {
addPageContent("Invalid Parameters");
sendResponseMsg($STATUS_BAD_REQUEST);
}
$entries = decode_json $q->param('POSTDATA');
$entries = JSON::decode_json($q->param('POSTDATA'));
if (scalar(@$entries) < 1) {
addPageContent("No set attribute was supplied.");
sendResponseMsg($STATUS_BAD_REQUEST);
@ -686,10 +686,10 @@ sub networksHandler {
push @{$request->{arg}}, '-t', 'network', '-o', $netname;
if (defined($q->param('PUTDATA'))) {
$entries = decode_json $q->param('PUTDATA');
$entries = JSON::decode_json($q->param('PUTDATA'));
}
elsif (defined($q->param('POSTDATA'))) {
$entries = decode_json $q->param('PUTDATA');
$entries = JSON::decode_json($q->param('PUTDATA'));
}
else {
addPageContent("No Field and Value map was supplied.");
@ -833,7 +833,7 @@ sub nodesHandler {
}
else {
@entries = decode_json $q->param('PUTDATA');
@entries = JSON::decode_json($q->param('PUTDATA'));
if (scalar(@entries) < 1) {
addPageContent("No set attribute was supplied.");
sendResponseMsg($STATUS_BAD_REQUEST);
@ -992,7 +992,7 @@ sub nodesHandler {
push @args, "-o", $noderange;
if ($q->param('POSTDATA')) {
my $entries = decode_json $q->param('POSTDATA');
my $entries = JSON::decode_json($q->param('POSTDATA'));
if (scalar($entries) < 1) {
addPageContent("No Field and Value map was supplied.");
sendResponseMsg($STATUS_BAD_REQUEST);
@ -1243,7 +1243,7 @@ sub siteHandler {
}
} else {
if ($q->param('PUTDATA')) {
my $entries = decode_json $q->param('PUTDATA');
my $entries = JSON::decode_json($q->param('PUTDATA'));
foreach (@$entries) {
push @{$request->{arg}}, $_;
}
@ -1695,7 +1695,7 @@ sub vmsHandler {
}
#collect all parameters from the postdata
my $entries = decode_json $q->param('PUTDATA');
my $entries = JSON::decode_json($q->param('PUTDATA'));
if (scalar(@$entries) < 1) {
addPageContent("No set attribute was supplied.");
sendResponseMsg($STATUS_BAD_REQUEST);
@ -1756,7 +1756,7 @@ sub vmsHandler {
elsif (isPut()) {
$request->{command} = 'chvm';
if ($q->param('PUTDATA')) {
my $entries = decode_json $q->param('PUTDATA');
my $entries = JSON::decode_json($q->param('PUTDATA'));
if (scalar(@$entries) < 1) {
addPageContent("No Field and Value map was supplied.");
sendResponseMsg($STATUS_BAD_REQUEST);