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

Changed the parsing in tabedit to allow newlines in the column fields within double quotes

Browse Source 
Tested with:
#node,rack,u,chassis,slot,room,comments,disable
"
rr
a004a",,"42",,,,"te
st",
"rra
004b",,,,,,"test2",
"rra004c",,,,,,"test3",
"bca01","1","2",,,,,"ssdf
sdfsd
sdfs
sdf
d
dfdf""
sdf
"




git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5237 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2010-02-19 16:06:06 +00:00
parent a8c1a1a560
commit 21ae7993c7
1 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,7 +288,6 @@ sub tabrestore
my $request = shift;
my $cb = shift;
my $table = $request->{table}->[0];
my $linenumber = 1;
my $tab = xCAT::Table->new($table, -create => 1, -autocommit => 0);
unless ($tab) {
$cb->({error => "Unable to open $table",errorcode=>4});
@ -320,9 +319,13 @@ sub tabrestore
my %auto_cols=();
foreach (@tmp) { $auto_cols{$_}=1;}
LINE: foreach $line (@{$request->{data}})
my $linenumber;
my $linecount = scalar(@{$request->{data}});
LINE: for($linenumber = 0; $linenumber < $linecount; $linenumber++)
{
$linenumber++;
$line = @{$request->{data}}[$linenumber];
$line =~ s/\s+$//;
my $origline = $line; #save for error reporting
my %record;
@ -359,53 +362,73 @@ sub tabrestore
{
$offset = index($line, '"', $offset);
$offset++;
if ($offset <= 0)
{
#MALFORMED CSV, request rollback, report an error
$rollback = 1;
$cb->(
{
error =>
"CSV unmatched \" in record on line $linenumber, character "
. index($origline, $line) . ": $origline", errorcode=>4
}
);
next LINE;
}
$nextchar = substr($line, $offset, 1);
if ($nextchar eq '"')
{
$offset++;
}
elsif ($offset eq length($line) or $nextchar eq ',')
{
$ent = substr($line, 0, $offset, '');
$line =~ s/^,//;
chop $ent;
$ent = substr($ent, 1);
$ent =~ s/""/"/g;
if (!exists($auto_cols{$col})) {
$record{$col} = $ent;
}
if ($offset <= 0)
{ #the matching quote is not on this line of the file
if($linenumber < $linecount)
{ #it's not the end of the world, we have more lines to check
my $continuedline = @{$request->{data}}[++$linenumber];
$offset = length($line);
$line .= "\n" . $continuedline;
$line =~ s/\s+$//;
}
else
{ #the matching quote was not found before the end of the file
#MALFORMED CSV, request rollback, report an error
$rollback = 1;
$cb->(
{
error =>
"CSV unmatched \" in record on line $linenumber, character "
. index($origline, $line) . ": $origline", errorcode=>4
}
);
next LINE;
}
}
else
{
$cb->(
{ #the next quote was on the current line
$nextchar = substr($line, $offset, 1);
if ($nextchar eq '"')
{ #the case of 2 double quotes. ignore them and move on
$offset++;
}
elsif ($offset eq length($line) or $nextchar eq ',')
{ #hit the end of the line or at least the end of the column
$ent = substr($line, 0, $offset, '');
$line =~ s/^,//;
chop $ent;
$ent = substr($ent, 1);
$ent =~ s/""/"/g;
if (!exists($auto_cols{$col}))
{
error =>
"CSV unescaped \" in record on line $linenumber, character "
. index($origline, $line) . ": $origline", errorcode=>4
}
);
$rollback = 1;
next LINE;
$record{$col} = $ent;
}
}
else
{
$cb->(
{
error =>
"CSV unescaped \" in record on line $linenumber, character "
. index($origline, $line) . ": $origline", errorcode=>4
}
);
$rollback = 1;
next LINE;
}
}
}
}
elsif ($line =~ /^([^,]+)/)
{ #easiest case, no Text::Balanced needed..
if (!exists($auto_cols{$col})) {
if (!exists($auto_cols{$col}))
{
$record{$col} = $1;
}
$line =~ s/^([^,]+)(,|$)//;