add plugin safe/rebuild info (part 3 of 3)

[ikiwiki.git] / IkiWiki / Plugin / table.pm

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 0501020ab938213c61820990581f88e78b2ae9c0..1302646b130084fefd87456d2f905b8c4c2cfea6 100644 (file)
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -3,13 +3,22 @@ package IkiWiki::Plugin::table;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-
-use IkiWiki;
+use Encode;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

+       hook(type => "getsetup", id => "table", call => \&getsetup);

        hook(type => "preprocess", id => "table", call => \&preprocess);
 } # }}}
 
        hook(type => "preprocess", id => "table", call => \&preprocess);
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub preprocess (@) { #{{{
        my %params =(
                format  => 'auto',
 sub preprocess (@) { #{{{
        my %params =(
                format  => 'auto',


@@ -19,9 +28,10 @@ sub preprocess (@) { #{{{
 
        if (exists $params{file}) {
                if (! $pagesources{$params{file}}) {
 
        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}));
                }
                $params{data} = readfile(srcfile($params{file}));

+               add_depends($params{page}, $params{file});

        }
 
        if (lc $params{format} eq 'auto') {
        }
 
        if (lc $params{format} eq 'auto') {


@@ -36,13 +46,31 @@ sub preprocess (@) { #{{{
 
        my @data;
        if (lc $params{format} eq 'csv') {
 
        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') {
        }
        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 {
        }
        else {

-               return "[[table ".gettext("unknown data format")."]]";
+               error gettext("unknown data format");

        }
 
        my $header;
        }
 
        my $header;


@@ -50,30 +78,19 @@ sub preprocess (@) { #{{{
                $header=shift @data;
        }
        if (! @data) {
                $header=shift @data;
        }
        if (! @data) {

-               return "[[table ".gettext("empty data")."]]";
+               error gettext("empty data");

        }
 
        my @lines;
        push @lines, defined $params{class}
                        ? "<table class=\"".$params{class}.'">'
                        : '<table>';
        }
 
        my @lines;
        push @lines, defined $params{class}
                        ? "<table class=\"".$params{class}.'">'
                        : '<table>';

-       push @lines, "\t<thead>","\t\t<tr>",
-               (map {
-                       "\t\t\t<th>".
-                       htmlize($params{page}, $params{destpage}, $_).
-                       "</th>"
-               } @$header),
-               "\t\t</tr>", "\t</thead>" if defined $header;
-       push @lines, "\t<tbody>";
-       foreach my $record (@data) {
-               push @lines, "\t\t<tr>",
-                       (map {
-                               "\t\t\t<td>".
-                               htmlize($params{page}, $params{destpage}, $_).
-                               "</td>"
-                       } @$record),
-                       "\t\t</tr>";
-       }
+       push @lines, "\t<thead>",
+               genrow($params{page}, $params{destpage}, "th", @$header),
+               "\t</thead>" if defined $header;
+       push @lines, "\t<tbody>" if defined $header;
+       push @lines, genrow($params{page}, $params{destpage}, "td", @$_)
+               foreach @data;

        push @lines, "\t</tbody>" if defined $header;
        push @lines, '</table>';
        my $html = join("\n", @lines);
        push @lines, "\t</tbody>" if defined $header;
        push @lines, '</table>';
        my $html = join("\n", @lines);


@@ -102,8 +119,9 @@ sub split_csv ($$) { #{{{
        eval q{use Text::CSV};
        error($@) if $@;
        my $csv = Text::CSV->new({ 
        eval q{use Text::CSV};
        error($@) if $@;
        my $csv = Text::CSV->new({ 

-               sep_char        => defined $delimiter ? $delimiter : ",",
+               sep_char        => $delimiter,

                binary          => 1,
                binary          => 1,

+               allow_loose_quotes => 1,

        }) || error("could not create a Text::CSV object");
        
        my $l=0;
        }) || error("could not create a Text::CSV object");
        
        my $l=0;


@@ -111,7 +129,7 @@ sub split_csv ($$) { #{{{
        foreach my $line (@text_lines) {
                $l++;
                if ($csv->parse($line)) {
        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'), 
                }
                else {
                        debug(sprintf(gettext('parse fail at line %d: %s'), 


@@ -129,26 +147,45 @@ sub split_dsv ($$) { #{{{
 
        my @data;
        foreach my $line (@text_lines) {
 
        my @data;
        foreach my $line (@text_lines) {

-               push @data, [ split(/\Q$delimiter\E/, $line) ];
+               push @data, [ split(/\Q$delimiter\E/, $line, -1) ];

        }
     
        return @data;
 } #}}}
 
        }
     
        return @data;
 } #}}}
 

-sub htmlize ($$$) { #{{{
+sub genrow ($$$@) { #{{{

        my $page = shift;
        my $destpage = shift;
        my $page = shift;
        my $destpage = shift;

-       my $text = shift;
+       my $elt = shift;
+       my @data = @_;
+
+       my @ret;
+       push @ret, "\t\t<tr>";
+       for (my $x=0; $x < @data; $x++) {
+               my $cell=htmlize($page, $destpage, $data[$x]);
+               my $colspan=1;
+               while ($x+1 < @data && $data[$x+1] eq '') {
+                       $x++;
+                       $colspan++;
+               }
+               if ($colspan > 1) {
+                       push @ret, "\t\t\t<$elt colspan=\"$colspan\">$cell</$elt>"
+               }
+               else {
+                       push @ret, "\t\t\t<$elt>$cell</$elt>"
+               }
+       }
+       push @ret, "\t\t</tr>";

 
 

-       $text=IkiWiki::htmlize($page, pagetype($pagesources{$page}),
-               IkiWiki::preprocess($page, $destpage, $text));
+       return @ret;
+} #}}}

 
 

-       # hack to get rid of enclosing junk added by markdown
-       $text=~s!^<p>!!;
-       $text=~s!</p>$!!;
-       chomp $text;
+sub htmlize ($$$) { #{{{
+       my $page = shift;
+       my $destpage = shift;

 
 

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

 }
 
 1
 }
 
 1