Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index e4d987dd34c8f054266e4bd61e7601088c0dbed2..e782fc238dbd40b628f8675fefa36942d9be520c 100644 (file)
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -3,75 +3,98 @@ package IkiWiki::Plugin::table;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use Encode;
+use IkiWiki 2.00;

 
 

-use IkiWiki;
-use IkiWiki::Plugin::mdwn;
-
-my %defaults = (
-       data    => undef,
-       file    => undef,
-       format  => 'auto',
-       sep_char        =>  {
-               'csv'   => ',',
-               'dsv'   => '\|',
-       },
-       class   =>  undef,
-       header  =>  1,
-);
-                            

 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 (@) { #{{{
 sub preprocess (@) { #{{{

-       my %params = (%defaults, @_);
+       my %params =(
+               format  => 'auto',
+               header  => 'row',
+               @_
+       );

 
 

-       if (defined $params{delimiter}) {
-               $params{sep_char}->{$params{format}} = $params{delimiter};
-       }
-       if (defined $params{file}) {
+       if (exists $params{file}) {

                if (! $pagesources{$params{file}}) {
                if (! $pagesources{$params{file}}) {

-                       return "[[table 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') {
                # first try the more simple format
                if (is_dsv_data($params{data})) {
                        $params{format} = 'dsv';
        }
 
        if (lc $params{format} eq 'auto') {
                # first try the more simple format
                if (is_dsv_data($params{data})) {
                        $params{format} = 'dsv';

-                       $params{sep_char}->{dsv} = '\|';

                }
                else {
                        $params{format} = 'csv';
                }
                else {
                        $params{format} = 'csv';

-                       $params{sep_char}->{csv} = ',';

                }
        }
 
        my @data;
        if (lc $params{format} eq 'csv') {
                }
        }
 
        my @data;
        if (lc $params{format} eq 'csv') {

-               @data=read_csv(\%params);
+               @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=read_dsv(\%params);
+               # 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 unknown data format]]";
+               error gettext("unknown data format");

        }
        }

-       
+

        my $header;
        my $header;

-       if ($params{header} != 1) {
+       if (lc($params{header}) eq "row" || IkiWiki::yesno($params{header})) {

                $header=shift @data;
        }
        if (! @data) {
                $header=shift @data;
        }
        if (! @data) {

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

        }
 
        }
 

-       my $html = tidy_up(open_table(\%params, $header),
-                       build_rows(\%params, @data),
-                       close_table(\%params, $header));
-
-       if (defined $params{file}) {
+       my @lines;
+       push @lines, defined $params{class}
+                       ? "<table class=\"".$params{class}.'">'
+                       : '<table>';
+       push @lines, "\t<thead>",
+               genrow(\%params, "th", @$header),
+               "\t</thead>" if defined $header;
+       push @lines, "\t<tbody>" if defined $header;
+       push @lines, genrow(\%params, "td", @$_) foreach @data;
+       push @lines, "\t</tbody>" if defined $header;
+       push @lines, '</table>';
+       my $html = join("\n", @lines);
+
+       if (exists $params{file}) {

                return $html."\n\n".
                        htmllink($params{page}, $params{destpage}, $params{file},
                                linktext => gettext('Direct data download'));
                return $html."\n\n".
                        htmllink($params{page}, $params{destpage}, $params{file},
                                linktext => gettext('Direct data download'));


@@ -81,20 +104,6 @@ sub preprocess (@) { #{{{
        }            
 } #}}}
 
        }            
 } #}}}
 

-sub tidy_up (@) { #{{{
-       my $html="";
-
-       foreach my $text (@_) {
-               my $indentation = $text =~ m{thead>|tbody>}   ? 0 :
-                                 $text =~ m{tr>}             ? 4 :
-                                 $text =~ m{td>|th>}         ? 8 :
-                                                               0;
-               $html .= (' ' x $indentation)."$text\n";
-       }
-
-       return $html;
-} #}}}
-

 sub is_dsv_data ($) { #{{{
        my $text = shift;
 
 sub is_dsv_data ($) { #{{{
        my $text = shift;
 


@@ -102,15 +111,16 @@ sub is_dsv_data ($) { #{{{
        return $line =~ m{.+\|};
 }
 
        return $line =~ m{.+\|};
 }
 

-sub read_csv ($) { #{{{
-       my $params=shift;
-       my @text_lines = split(/\n/, $params->{data});
+sub split_csv ($$) { #{{{
+       my @text_lines = split(/\n/, shift);
+       my $delimiter = shift;

 
        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        => $params->{sep_char}->{csv},
+               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;


@@ -118,7 +128,7 @@ sub read_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,72 +139,57 @@ sub read_csv ($) { #{{{
        return @data;
 } #}}}
 
        return @data;
 } #}}}
 

-sub read_dsv ($) { #{{{
-       my $params = shift;
-       my @text_lines = split(/\n/, $params->{data});
+sub split_dsv ($$) { #{{{
+       my @text_lines = split(/\n/, shift);
+       my $delimiter = shift;
+       $delimiter="|" unless defined $delimiter;

 
        my @data;
 
        my @data;

-       my $splitter = qr{$params->{sep_char}->{dsv}};

        foreach my $line (@text_lines) {
        foreach my $line (@text_lines) {

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

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

-sub open_table ($$) { #{{{
-       my $params = shift;
-       my $header = shift;
-
-       my @items;
-       push @items, defined $params->{class}
-                       ? "<table class=\"".$params->{class}.'">'
-                       : '<table>';
-        push @items, '<thead>','<tr>',
-                    (map { "<th>".htmlize($params, $_)."</th>" } @$header),
-                     '</tr>','</thead>' if defined $header;
-       push @items, '<tbody>';
-       
-       return @items;
-}
+sub genrow ($@) { #{{{
+       my %params=%{shift()};
+       my $elt = shift;
+       my @data = @_;
+
+       my $page=$params{page};
+       my $destpage=$params{destpage};
+       my $type=pagetype($pagesources{$page});
+
+       my @ret;
+       push @ret, "\t\t<tr>";
+       for (my $x=0; $x < @data; $x++) {
+               my $cell=IkiWiki::htmlize($page, $destpage, $type,
+                        IkiWiki::preprocess($page, $destpage, $data[$x]));
+
+               # automatic colspan for empty cells
+               my $colspan=1;
+               while ($x+1 < @data && $data[$x+1] eq '') {
+                       $x++;
+                       $colspan++;
+               }

 
 

-sub build_rows ($@) { #{{{
-       my $params = shift;
+               # check if the first column should be a header
+               my $e=$elt;
+               if ($x == 0 && lc($params{header}) eq "column") {
+                       $e="th";
+               }

 
 

-       my @items;
-       foreach my $record (@_) {
-               push @items, '<tr>',
-                            (map { "<td>".htmlize($params, $_)."</td>" } @$record),
-                            '</tr>';
+               if ($colspan > 1) {
+                       push @ret, "\t\t\t<$e colspan=\"$colspan\">$cell</$e>"
+               }
+               else {
+                       push @ret, "\t\t\t<$e>$cell</$e>"
+               }

        }
        }

-       return @items;
-} #}}}
-                 
-sub close_table ($$) { #{{{
-       my $params = shift;
-       my $header = shift;
-
-       my @items;
-       push @items, '</tbody>' if defined $header;
-       push @items, '</table>';
-       return @items;
-} #}}}
-
-sub htmlize { #{{{
-       my $params = shift;
-       my $text = shift;
-
-       $text=IkiWiki::preprocess($params->{page},
-               $params->{destpage}, $text);
-       $text=IkiWiki::htmlize($params->{page},
-               pagetype($pagesources{$params->{page}}), $text);
+       push @ret, "\t\t</tr>";

 
 

-       # hack to get rid of enclosing junk added by markdown
-       $text=~s!^<p>!!;
-       $text=~s!</p>$!!;
-       chomp $text;
-
-       return $text;
-}
+       return @ret;
+} #}}}

 
 1
 
 1