web commit by http://meep.pl/: bug report

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

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index dfa595812b9908f15d71c178cbef008a145c06b8..2ed60ab4604b3193b15914c6732568012c3a328d 100644 (file)
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -5,7 +5,6 @@ use warnings;
 use strict;
 
 use IkiWiki;
-use IkiWiki::Plugin::mdwn;
 
 sub import { #{{{
        hook(type => "preprocess", id => "table", call => \&preprocess);
@@ -13,18 +12,11 @@ sub import { #{{{
 
 sub preprocess (@) { #{{{
        my %params =(
-               format          => 'auto',
-               header          => 'yes',
-               sep_char        => {
-                       'csv'   => ',',
-                       'dsv'   => '|',
-               },
+               format  => 'auto',
+               header  => 'yes',
                @_
        );
 
-       if (exists $params{delimiter}) {
-               $params{sep_char}->{$params{format}} = $params{delimiter};
-       }
        if (exists $params{file}) {
                if (! $pagesources{$params{file}}) {
                        return "[[table ".gettext("cannot find file")."]]";
@@ -36,25 +28,23 @@ sub preprocess (@) { #{{{
                # first try the more simple format
                if (is_dsv_data($params{data})) {
                        $params{format} = 'dsv';
-                       $params{sep_char}->{dsv} = '|';
                }
                else {
                        $params{format} = 'csv';
-                       $params{sep_char}->{csv} = ',';
                }
        }
 
        my @data;
        if (lc $params{format} eq 'csv') {
-               @data=read_csv(\%params);
+               @data=split_csv($params{data}, $params{delimiter});
        }
        elsif (lc $params{format} eq 'dsv') {
-               @data=read_dsv(\%params);
+               @data=split_dsv($params{data}, $params{delimiter});
        }
        else {
                return "[[table ".gettext("unknown data format")."]]";
        }
-       
+
        my $header;
        if (lc($params{header}) eq "yes") {
                $header=shift @data;
@@ -63,9 +53,19 @@ sub preprocess (@) { #{{{
                return "[[table ".gettext("empty data")."]]";
        }
 
-       my $html = tidy_up(open_table(\%params, $header),
-                       build_rows(\%params, @data),
-                       close_table(\%params, $header));
+       my @lines;
+       push @lines, defined $params{class}
+                       ? "<table class=\"".$params{class}.'">'
+                       : '<table>';
+       push @lines, "\t<thead>",
+               genrow($params{page}, $params{destpage}, "th", @$header),
+               "\t</thead>" if defined $header;
+       push @lines, "\t<tbody>";
+       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);
 
        if (exists $params{file}) {
                return $html."\n\n".
@@ -77,20 +77,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;
 
@@ -98,14 +84,14 @@ sub is_dsv_data ($) { #{{{
        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({ 
-               sep_char        => $params->{sep_char}->{csv},
+               sep_char        => defined $delimiter ? $delimiter : ",",
                binary          => 1,
        }) || error("could not create a Text::CSV object");
        
@@ -125,65 +111,53 @@ sub read_csv ($) { #{{{
        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 $splitter = qr{\Q$params->{sep_char}->{dsv}\E};
        foreach my $line (@text_lines) {
-               push @data, [ split($splitter, $line) ];
+               push @data, [ split(/\Q$delimiter\E/, $line, -1) ];
        }
     
        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 build_rows ($@) { #{{{
-       my $params = shift;
-
-       my @items;
-       foreach my $record (@_) {
-               push @items, '<tr>',
-                            (map { "<td>".htmlize($params, $_)."</td>" } @$record),
-                            '</tr>';
+sub genrow ($$$@) { #{{{
+       my $page = shift;
+       my $destpage = 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>"
+               }
        }
-       return @items;
-} #}}}
-                 
-sub close_table ($$) { #{{{
-       my $params = shift;
-       my $header = shift;
-
-       my @items;
-       push @items, '</tbody>' if defined $header;
-       push @items, '</table>';
-       return @items;
+       push @ret, "\t\t</tr>";
+
+       return @ret;
 } #}}}
 
-sub htmlize { #{{{
-       my $params = shift;
+sub htmlize ($$$) { #{{{
+       my $page = shift;
+       my $destpage = shift;
        my $text = shift;
 
-       $text=IkiWiki::preprocess($params->{page},
-               $params->{destpage}, $text);
-       $text=IkiWiki::htmlize($params->{page},
-               pagetype($pagesources{$params->{page}}), $text);
+       $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>!!;