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

make routine of output table code for tabdump and tabprune to share

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5715 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2010-04-08 12:06:11 +00:00
parent eaaa0313ee
commit cbf519cce3
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
xCAT-server/lib/xcat/plugins/tabutils.pm
View File

@@ -520,8 +520,8 @@ sub tabdump
my $tabh = xCAT::Table->new($table);
my $tabdump_header = sub {
my $header = "#" . join(",", @_);
push @{$rsp{data}}, $header;
my $header = "#" . join(",", @_);
push @{$rsp{data}}, $header;
};
# If the table does not exist yet (because its never been written to),
@@ -549,28 +549,28 @@ sub tabdump
return;
}
}
# Display all the rows of the table in the order of the columns in the schema
$tabdump_header->(@{$tabh->{colnames}});
foreach $rec (@$recs)
{
my $line = '';
foreach (@{$tabh->{colnames}})
{
if (defined $rec->{$_})
{
$rec->{$_} =~ s/"/""/g;
$line = $line . '"' . $rec->{$_} . '",';
}
else
{
$line .= ',';
}
}
$line =~ s/,$//; # remove the extra comma at the end
push @{$rsp{data}}, $line;
}
$cb->(\%rsp);
# Display all the rows of the table the order of the columns in the schema
output_table($table,$cb,$tabh,$recs);
#$tabdump_header->(@{$tabh->{colnames}});
#foreach $rec (@$recs)
#{
# my $line = '';
# foreach (@{$tabh->{colnames}})
# {
# if (defined $rec->{$_})
# {
# $rec->{$_} =~ s/"/""/g;
# $line = $line . '"' . $rec->{$_} . '",';
# }
# else
# {
# $line .= ',';
# }
# }
# $line =~ s/,$//; # remove the extra comma at the end
# push @{$rsp{data}}, $line;
#}
#$cb->(\%rsp);
}
# Prune records from the eventlog or auditlog or all records.
@@ -705,7 +705,7 @@ sub tabprune_all {
}
if ($VERBOSE) { # will output change to std
my $recs = $tab->getAllEntries("all");
tabprune_verbose($table,$cb,$tab,$recs);
output_table($table,$cb,$tab,$recs);
}
$tab->delEntries(); #Yes, delete *all* entries
@@ -802,8 +802,8 @@ sub tabprune_recid {
return $rc;
}
# If Verbose, return the records that will be deleted to stdout.
sub tabprune_verbose {
# Dump table records to stdout.
sub output_table {
my $table = shift;
my $cb = shift;
my $tabh=shift;