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

Corrected rscan stanza output format - Lines #605 & #1011

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@212 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2008-01-04 20:29:26 +00:00
parent 1412b374d4
commit 2d321a9b22
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
xCAT-server-2.0/lib/xcat/plugins/blade.pm
View File

@ -510,7 +510,7 @@ sub rscan {
$result = rscan_xml( \@values );
}
elsif ( exists( $opt{z} )) {
$result = rscan_schema( \@values );
$result = rscan_stanza( \@values );
}
else {
foreach ( @rscan_header ) {
@ -590,7 +590,7 @@ sub rscan_xml {
}
return( $xml );
}
sub rscan_schema {
sub rscan_stanza {
my $values = shift;
my $result;
@ -601,10 +601,10 @@ sub rscan_schema {
$result .= "$data[1]:\n\tobjtype=node\n";
foreach ( @rscan_header ) {
if ( @$_[0] eq "name" ) {
next;
if ( @$_[0] ne "name" ) {
$result .= "\t@$_[0]=$data[$i++]\n";
}
$result .= "\t@$_[0]=$data[$i++]\n";
$i++;
}
}
return( $result );
@ -1007,20 +1007,21 @@ sub dompa {
my @output_hashes;
foreach(@output) {
my %output;
(my $desc,my $text) = split (/:/,$_,2);
unless ($text) {
$text=$desc;
} else {
$desc =~ s/^\s+//;
$desc =~ s/\s+$//;
if ($desc) {
$output{node}->[0]->{data}->[0]->{desc}->[0]=$desc;
}
}
if ( $command eq "rscan" ) {
$output{data} = [$_];
}
else {
(my $desc,my $text) = split (/:/,$_,2);
unless ($text) {
$text=$desc;
} else {
$desc =~ s/^\s+//;
$desc =~ s/\s+$//;
if ($desc) {
$output{node}->[0]->{data}->[0]->{desc}->[0]=$desc;
}
}
$text =~ s/^\s+//;
$text =~ s/\s+$//;
$output{node}->[0]->{name}->[0]=$node;