X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6304f6a5953327a740180d525dcbfb331d8b64c8..4b79a43db6bf3027bc3b98d8770f98ce878035b8:/IkiWiki/Plugin/table.pm diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index 2ed60ab46..1302646b1 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -3,13 +3,22 @@ package IkiWiki::Plugin::table; use warnings; use strict; - -use IkiWiki; +use Encode; +use IkiWiki 2.00; sub import { #{{{ + hook(type => "getsetup", id => "table", call => \&getsetup); hook(type => "preprocess", id => "table", call => \&preprocess); } # }}} +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => undef, + }, +} #}}} + sub preprocess (@) { #{{{ my %params =( format => 'auto', @@ -19,9 +28,10 @@ sub preprocess (@) { #{{{ if (exists $params{file}) { if (! $pagesources{$params{file}}) { - return "[[table ".gettext("cannot find file")."]]"; + error gettext("cannot find file"); } $params{data} = readfile(srcfile($params{file})); + add_depends($params{page}, $params{file}); } if (lc $params{format} eq 'auto') { @@ -36,13 +46,31 @@ 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")."]]"; + error gettext("unknown data format"); } my $header; @@ -50,7 +78,7 @@ sub preprocess (@) { #{{{ $header=shift @data; } if (! @data) { - return "[[table ".gettext("empty data")."]]"; + error gettext("empty data"); } my @lines; @@ -60,7 +88,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; @@ -91,8 +119,9 @@ 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"); my $l=0; @@ -100,7 +129,7 @@ sub split_csv ($$) { #{{{ 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'), @@ -154,17 +183,9 @@ sub genrow ($$$@) { #{{{ 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!^

!!; - $text=~s!

$!!; - chomp $text; - return $text; + return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}), + IkiWiki::preprocess($page, $destpage, shift)); } 1