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

removed the unused require of table.pm; fix the issue to handle the servicedone key in the xcat xml output

Browse Source
This commit is contained in:
daniceexi 2014-04-09 07:20:53 -04:00
parent e721b46e6d
commit 217dee1244
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/xCAT-wsapi/restapi.pl
View File

@ -9,8 +9,8 @@ use Data::Dumper;
use Socket;
use IO::Socket::INET;
use IO::Socket::SSL;
use lib "/opt/xcat/lib/perl";
use xCAT::Table;
#use lib "/opt/xcat/lib/perl";
#use xCAT::Table;
# The hash %URIdef defines all the xCAT resources which can be access from Web Service.
# This script will be called when a https request with the URI started with /xcatws/ is sent to xCAT Web Service
@ -2122,8 +2122,12 @@ sub filterData {
#} else {
#otherwise, ignore the 'servicedone' data
# next;
} else {
delete ($_->{serverdone});
if (scalar(keys %{$_}) > 0) {
push @{$outputdata}, $_;
}
}
push @{$outputdata}, $_;
} else {
if (defined ($_->{data}) && ref($_->{data}->[0]) ne "HASH") {
# to get the message in data for the case that errorcode is set but no 'error' attr