X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8489e68916eabf0ce09242e4dac66b9f646d46c4..64d550b14a38f826c662306d89ebd9f587335658:/IkiWiki/Plugin/table.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index 01ba5e504..02a2ba05d 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -23,10 +23,6 @@ sub preprocess (@) { #{{{ } $params{data} = readfile(srcfile($params{file})); } - else { - $params{data} = IkiWiki::linkify($params{page}, - $params{destpage}, $params{data}); - } if (lc $params{format} eq 'auto') { # first try the more simple format @@ -40,10 +36,28 @@ sub preprocess (@) { #{{{ my @data; if (lc $params{format} eq 'csv') { - @data=split_csv($params{data}, $params{delimiter}); + @data=split_csv($params{data}, + defined $params{delimiter} ? $params{delimiter} : ",",); + # linkify after parsing since html link quoting can + # confuse CSV parsing + if (! exists $params{file}) { + @data=map { + [ map { + IkiWiki::linkify($params{page}, + $params{destpage}, $_); + } @$_ ] + } @data; + } } elsif (lc $params{format} eq 'dsv') { - @data=split_dsv($params{data}, $params{delimiter}); + # linkify before parsing since wikilinks can contain the + # delimiter + if (! exists $params{file}) { + $params{data} = IkiWiki::linkify($params{page}, + $params{destpage}, $params{data}); + } + @data=split_dsv($params{data}, + defined $params{delimiter} ? $params{delimiter} : "|",); } else { return "[[table ".gettext("unknown data format")."]]"; @@ -64,7 +78,7 @@ sub preprocess (@) { #{{{ push @lines, "\t", genrow($params{page}, $params{destpage}, "th", @$header), "\t" if defined $header; - push @lines, "\t"; + push @lines, "\t" if defined $header; push @lines, genrow($params{page}, $params{destpage}, "td", @$_) foreach @data; push @lines, "\t" if defined $header; @@ -95,7 +109,7 @@ sub split_csv ($$) { #{{{ eval q{use Text::CSV}; error($@) if $@; my $csv = Text::CSV->new({ - sep_char => defined $delimiter ? $delimiter : ",", + sep_char => $delimiter, binary => 1, allow_loose_quotes => 1, }) || error("could not create a Text::CSV object");