From 9f87bd8d7d801ba29687c68349a5c56e9947948f Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 16 Sep 2007 19:35:16 +0000
Subject: [PATCH] * table plugin: Actually specify the delimiter when parsing
 CSV. * table plugin: The previous version broke WikiLinks inside quoted
 values.   Fix this by linkifying CSV data after parsing it, while DSV data is
 still   linkified before parsing.

---
 IkiWiki/Plugin/table.pm | 20 ++++++++++++++++----
 debian/changelog        |  7 +++++--
 doc/plugins/table.mdwn  | 10 ----------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index be97137ed..e8df17487 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -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
@@ -42,8 +38,24 @@ sub preprocess (@) { #{{{
 	if (lc $params{format} eq 'csv') {
 		@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') {
+		# 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} : "|",);
 	}
diff --git a/debian/changelog b/debian/changelog
index 8913d37cc..e55419f91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,12 @@ ikiwiki (2.8) UNRELEASED; urgency=low
     be shown in the page footer. HTML will also be inserted that should
     support the rel=license microformat as well as the HTML spec's
     rel=copyright.
-  * table plugin: Actually specify the delimiter.
+  * table plugin: Actually specify the delimiter when parsing CSV.
+  * table plugin: The previous version broke WikiLinks inside quoted values.
+    Fix this by linkifying CSV data after parsing it, while DSV data is still
+    linkified before parsing.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 16 Sep 2007 15:07:35 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 16 Sep 2007 15:34:17 -0400
 
 ikiwiki (2.7) unstable; urgency=low
 
diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index 89bec987c..6920c8f80 100644
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -6,16 +6,6 @@ or DSV (delimiter-separated values) format.
 
 It needs the perl module [[cpan Text::CSV]] for the CSV data.
 
-[[table data="""
-"foo",[[joey]],"bar"
-"bar",[[joeyno]], foo"
-"""]]
-
-[[table data="""
-foo|[[joey]]|bar
-bar|[[joeyno]]|foo
-"""]]
-
 ## examples
 
 	\[[table data="""
-- 
2.26.2