use warnings;
use strict;
+use Encode;
use IkiWiki 2.00;
sub import { #{{{
return "[[table ".gettext("cannot find file")."]]";
}
$params{data} = readfile(srcfile($params{file}));
+ add_depends($params{page}, $params{file});
}
if (lc $params{format} eq 'auto') {
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")."]]";
push @lines, "\t<thead>",
genrow($params{page}, $params{destpage}, "th", @$header),
"\t</thead>" if defined $header;
- push @lines, "\t<tbody>";
+ push @lines, "\t<tbody>" if defined $header;
push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
foreach @data;
push @lines, "\t</tbody>" if defined $header;
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");
my $l=0;
foreach my $line (@text_lines) {
$l++;
if ($csv->parse($line)) {
- push(@data, [ $csv->fields() ]);
+ push(@data, [ map { decode_utf8 $_ } $csv->fields() ]);
}
else {
debug(sprintf(gettext('parse fail at line %d: %s'),
sub htmlize ($$$) { #{{{
my $page = shift;
my $destpage = shift;
- my $text = shift;
-
- $text=IkiWiki::htmlize($page, pagetype($pagesources{$page}),
- IkiWiki::preprocess($page, $destpage, $text));
-
- # hack to get rid of enclosing junk added by markdown
- $text=~s!^<p>!!;
- $text=~s!</p>$!!;
- chomp $text;
- return $text;
+ return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),
+ IkiWiki::preprocess($page, $destpage, shift));
}
1