]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/Plugin/table.pm
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
[ikiwiki.git] / IkiWiki / Plugin / table.pm
index 01ba5e5042360d218d422e56296a6161552ff8fe..02a2ba05dacc5aa67ed842489b909a8982a985c4 100644 (file)
@@ -23,10 +23,6 @@ sub preprocess (@) { #{{{
                }
                $params{data} = readfile(srcfile($params{file}));
        }
-       else {
-               $params{data} = IkiWiki::linkify($params{page},
-                       $params{destpage}, $params{data});
-       }
 
        if (lc $params{format} eq 'auto') {
                # first try the more simple format
@@ -40,10 +36,28 @@ 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")."]]";
@@ -64,7 +78,7 @@ sub preprocess (@) { #{{{
        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;
@@ -95,7 +109,7 @@ 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");