From ffc99f5904934e6e7532bb8cfdebb44ad9ecd913 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 13 Jul 2008 15:05:34 -0400
Subject: switch preprocess hooks to use error function

---
 IkiWiki/Plugin/aggregate.pm      |  2 +-
 IkiWiki/Plugin/conditional.pm    |  2 +-
 IkiWiki/Plugin/edittemplate.pm   |  8 +++++---
 IkiWiki/Plugin/fortune.pm        |  2 +-
 IkiWiki/Plugin/googlecalendar.pm |  2 +-
 IkiWiki/Plugin/graphviz.pm       |  4 ++--
 IkiWiki/Plugin/img.pm            | 14 +++++++-------
 IkiWiki/Plugin/inline.pm         |  2 +-
 IkiWiki/Plugin/linkmap.pm        |  4 +---
 IkiWiki/Plugin/meta.pm           |  6 +++---
 IkiWiki/Plugin/pagetemplate.pm   |  2 +-
 IkiWiki/Plugin/pinger.pm         |  2 +-
 IkiWiki/Plugin/polygen.pm        |  4 ++--
 IkiWiki/Plugin/postsparkline.pm  |  6 +++---
 IkiWiki/Plugin/shortcut.pm       |  2 +-
 IkiWiki/Plugin/sparkline.pm      | 16 ++++++++--------
 IkiWiki/Plugin/table.pm          |  6 +++---
 IkiWiki/Plugin/template.pm       |  4 ++--
 IkiWiki/Plugin/testpagespec.pm   |  2 +-
 IkiWiki/Plugin/teximg.pm         |  6 +++---
 20 files changed, 48 insertions(+), 48 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index b5354a823..f61804237 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -131,7 +131,7 @@ sub preprocess (@) { #{{{
 
 	foreach my $required (qw{name url}) {
 		if (! exists $params{$required}) {
-			return "[[aggregate ".sprintf(gettext("missing %s parameter"), $required)."]]";
+			error sprintf(gettext("missing %s parameter"), $required)
 		}
 	}
 
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 57db01054..6be52eaa6 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -15,7 +15,7 @@ sub preprocess_if (@) { #{{{
 
 	foreach my $param (qw{test then}) {
 		if (! exists $params{$param}) {
-			return "[[if ".sprintf(gettext('%s parameter is required'), $param)."]]";
+			error sprintf(gettext('%s parameter is required'), $param);
 		}
 	}
 
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 76c1cd42a..d1716a315 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -38,10 +38,10 @@ sub preprocess (@) { #{{{
 	return "" if $params{page} ne $params{destpage};
 
 	if (! exists $params{template} || ! length($params{template})) {
-		return "[[meta ".gettext("template not specified")."]]";
+		error gettext("template not specified")
 	}
 	if (! exists $params{match} || ! length($params{match})) {
-		return "[[meta ".gettext("match not specified")."]]";
+		error gettext("match not specified")
 	}
 
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
@@ -108,7 +108,9 @@ sub filltemplate ($$) { #{{{
 		);
 	};
 	if ($@) {
-		return "[[pagetemplate ".gettext("failed to process")." $@]]";
+		# Indicate that the earlier preprocessor directive set 
+		# up a template that doesn't work.
+		return "[[!pagetemplate ".gettext("failed to process")." $@]]";
 	}
 
 	$template->param(name => $page);
diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm
index a3b13f687..a78a73d5f 100644
--- a/IkiWiki/Plugin/fortune.pm
+++ b/IkiWiki/Plugin/fortune.pm
@@ -15,7 +15,7 @@ sub preprocess (@) { #{{{
 	my $f = `fortune 2>/dev/null`;
 
 	if ($?) {
-		return "[[".gettext("fortune failed")."]]";
+		error gettext("fortune failed");
 	}
 	else {
 		return "<pre>$f</pre>\n";
diff --git a/IkiWiki/Plugin/googlecalendar.pm b/IkiWiki/Plugin/googlecalendar.pm
index c6409e5e6..7efa1daa3 100644
--- a/IkiWiki/Plugin/googlecalendar.pm
+++ b/IkiWiki/Plugin/googlecalendar.pm
@@ -19,7 +19,7 @@ sub preprocess (@) { #{{{
 	# Avoid XSS attacks..
 	my ($url)=$params{html}=~m#iframe\s+src="http://www\.google\.com/calendar/embed\?([^"<>]+)"#;
 	if (! defined $url || ! length $url) {
-		return "[[googlecalendar ".gettext("failed to find url in html")."]]";
+		error gettext("failed to find url in html")
 	}
 	my ($height)=$params{html}=~m#height="(\d+)"#;
 	my ($width)=$params{html}=~m#width="(\d+)"#;
diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index fe3559857..b13d15fa6 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -55,7 +55,7 @@ sub render_graph (\%) { #{{{
 
 		waitpid $pid, 0;
 		$SIG{PIPE}="DEFAULT";
-		return  "[[graph ".gettext("failed to run graphviz")."]]" if ($sigpipe);
+		error gettext("failed to run graphviz") if $sigpipe;
 
 		if (! $params{preview}) {
 			writefile($dest, $config{destdir}, $png, 1);
@@ -82,7 +82,7 @@ sub graph (@) { #{{{
 	$params{src} = "" unless defined $params{src};
 	$params{type} = "digraph" unless defined $params{type};
 	$params{prog} = "dot" unless defined $params{prog};
-	return "[[graph ".gettext("prog not a valid graphviz program")."]]" unless $graphviz_programs{$params{prog}};
+	error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
 
 	return render_graph(%params);
 } # }}}
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 49e1d57d6..17a9367d3 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -46,14 +46,14 @@ sub preprocess (@) { #{{{
 	my $base = IkiWiki::basename($file);
 
 	eval q{use Image::Magick};
-	return "[[img ".gettext("Image::Magick not installed")."]]" if $@;
+	error gettext("Image::Magick is not installed") if $@;
 	my $im = Image::Magick->new;
 	my $imglink;
 	my $r;
 
 	if ($params{size} ne 'full') {
 		my ($w, $h) = ($params{size} =~ /^(\d+)x(\d+)$/);
-		return "[[img ".sprintf(gettext('bad size "%s"'), $params{size})."]]"
+		error sprintf(gettext('bad size "%s"'), $params{size})
 			unless (defined $w && defined $h);
 
 		my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
@@ -63,14 +63,14 @@ sub preprocess (@) { #{{{
 
 		if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
 			$r = $im->Read($outfile);
-			return "[[img ".sprintf(gettext("failed to read %s: %s"), $outfile, $r)."]]" if $r;
+			error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
 		}
 		else {
 			$r = $im->Read(srcfile($file));
-			return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+			error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 
 			$r = $im->Resize(geometry => "${w}x${h}");
-			return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
+			error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
 			# don't actually write file in preview mode
 			if (! $params{preview}) {
@@ -84,7 +84,7 @@ sub preprocess (@) { #{{{
 	}
 	else {
 		$r = $im->Read(srcfile($file));
-		return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+		error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 		$imglink = $file;
 	}
 
@@ -101,7 +101,7 @@ sub preprocess (@) { #{{{
 	}
 
 	if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
-		return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
+		error sprintf(gettext("failed to determine size of image %s"), $file)
 	}
 
 	my $imgtag='<img src="'.$imgurl.
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 32915c342..5517e3c94 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -98,7 +98,7 @@ sub preprocess_inline (@) { #{{{
 	my %params=@_;
 	
 	if (! exists $params{pages}) {
-		return "[[inline ".gettext("missing pages parameter")."]]";
+		error gettext("missing pages parameter");
 	}
 	my $raw=yesno($params{raw});
 	my $archive=yesno($params{archive});
diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 82b38f4cb..ab199b723 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -94,9 +94,7 @@ sub genmap ($) { #{{{
 	
 	waitpid $pid, 0;
 	$SIG{PIPE}="DEFAULT";
-	if ($sigpipe) {
-		return  "[[linkmap ".gettext("failed to run dot")."]]";
-	}
+	error gettext("failed to run dot") if $sigpipe;
 
 	return $ret;
 } #}}}
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index d00b6854f..4e0e9e8c7 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -138,7 +138,7 @@ sub preprocess (@) { #{{{
 		# editable page as a stylesheet
 		my $stylesheet=bestlink($page, $value.".css");
 		if (! length $stylesheet) {
-			return "[[meta ".gettext("stylesheet not found")."]]";
+			error gettext("stylesheet not found")
 		}
 		push @{$metaheaders{$page}}, '<link href="'.urlto($stylesheet, $page).
 			'" rel="'.encode_entities($rel).
@@ -172,7 +172,7 @@ sub preprocess (@) { #{{{
 			add_depends($page, $redir_page);
 			my $link=bestlink($page, $redir_page);
 			if (! length $link) {
-				return "[[meta ".gettext("redir page not found")."]]";
+				error gettext("redir page not found")
 			}
 
 			$value=urlto($link, $page);
@@ -185,7 +185,7 @@ sub preprocess (@) { #{{{
 			my %seen;
 			while (exists $pagestate{$at}{meta}{redir}) {
 				if ($seen{$at}) {
-					return "[[meta ".gettext("redir cycle is not allowed")."]]";
+					error gettext("redir cycle is not allowed")
 				}
 				$seen{$at}=1;
 				$at=$pagestate{$at}{meta}{redir};
diff --git a/IkiWiki/Plugin/pagetemplate.pm b/IkiWiki/Plugin/pagetemplate.pm
index 69a2433a8..205f5a9d7 100644
--- a/IkiWiki/Plugin/pagetemplate.pm
+++ b/IkiWiki/Plugin/pagetemplate.pm
@@ -18,7 +18,7 @@ sub preprocess (@) { #{{{
 	if (! exists $params{template} ||
 	    $params{template} !~ /^[-A-Za-z0-9._+]+$/ ||
 	    ! defined IkiWiki::template_file($params{template})) {
-		 return "[[pagetemplate ".gettext("bad or missing template")."]]";
+		 error gettext("bad or missing template")
 	}
 
 	if ($params{page} eq $params{destpage}) {
diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index c6fa76e3f..614d42885 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -34,7 +34,7 @@ sub needsbuild (@) { #{{{
 sub preprocess (@) { #{{{
 	my %params=@_;
 	if (! exists $params{from} || ! exists $params{to}) {
-		return "[[ping ".gettext("requires 'from' and 'to' parameters")."]]";
+		error gettext("requires 'from' and 'to' parameters");
 	}
 	if ($params{from} eq $config{url}) {
 		$pagestate{$params{destpage}}{pinger}{$params{to}}=1;
diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index 5208a44ec..70378cf1b 100644
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -29,7 +29,7 @@ sub preprocess (@) { #{{{
 
 	my $grmfile = '/usr/share/polygen/ita/polygen.grm';
 	if (! -d '/usr/share/polygen') {
-		return "[[".gettext("polygen not installed")."]]";
+		error gettext("polygen not installed");
 	}
 	find({wanted => sub {
 			if (substr($File::Find::name, -length($grammar)) eq $grammar) {
@@ -48,7 +48,7 @@ sub preprocess (@) { #{{{
 	}
 
 	if ($?) {
-		$res="[[".gettext("polygen failed")."]]";
+		error gettext("command failed");
 	}
 
 	# Strip trailing spaces and newlines so that we flow well with the
diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 9e885741e..6fc96f8b3 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -29,14 +29,14 @@ sub preprocess (@) { #{{{
 	}
 
 	if (! exists $params{formula}) {
-		return "[[postsparkline ".gettext("missing formula")."]]";
+		error gettext("missing formula")
 	}
 	my $formula=$params{formula};
 	$formula=~s/[^a-zA-Z0-9]*//g;
 	$formula=IkiWiki::possibly_foolish_untaint($formula);
 	if (! length $formula ||
 	    ! IkiWiki::Plugin::postsparkline::formula->can($formula)) {
-		return "[[postsparkline ".gettext("unknown formula")."]]";
+		error gettext("unknown formula");
 	}
 
 	add_depends($params{page}, $params{pages});
@@ -53,7 +53,7 @@ sub preprocess (@) { #{{{
 
 	my @data=eval qq{IkiWiki::Plugin::postsparkline::formula::$formula(\\\%params, \@list)};
 	if ($@) {
-		return "[[postsparkline error $@]]";
+		error $@;
 	}
 
 	if (! @data) {
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index f1a38ea48..8df60cfe2 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -24,7 +24,7 @@ sub preprocess_shortcut (@) { #{{{
 	my %params=@_;
 
 	if (! defined $params{name} || ! defined $params{url}) {
-		return "[[shortcut ".gettext("missing name or url parameter")."]]";
+		error gettext("missing name or url parameter");
 	}
 
 	hook(type => "preprocess", no_override => 1, id => $params{name},
diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 69b3512c2..bcff46aeb 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -60,13 +60,13 @@ sub preprocess (@) { #{{{
 			}
 		}
 		elsif (! length $value) {
-			return "[[sparkline ".gettext("parse error")." \"$key\"]]";
+			error gettext("parse error")." \"$key\"";
 		}
 		elsif ($key eq 'featurepoint') {
 			my ($x, $y, $color, $diameter, $text, $location)=
 				split(/\s*,\s*/, $value);
 			if (! defined $diameter || $diameter < 0) {
-				return "[[sparkline ".gettext("bad featurepoint diameter")."]]";
+				error gettext("bad featurepoint diameter");
 			}
 			$x=int($x);
 			$y=int($y);
@@ -76,7 +76,7 @@ sub preprocess (@) { #{{{
 			if (defined $location) {
 				$location=$locmap{$location};
 				if (! defined $location) {
-					return "[[sparkline ".gettext("bad featurepoint location")."]]";
+					error gettext("bad featurepoint location");
 				}
 			}
 			$php.=qq{\$sparkline->SetFeaturePoint($x, $y, '$color', $diameter};
@@ -87,23 +87,23 @@ sub preprocess (@) { #{{{
 	}
 
 	if ($c eq 0) {
-		return "[[sparkline ".gettext("missing values")."]]";
+		error gettext("missing values");
 	}
 
 	my $height=int($params{height} || 20);
 	if ($height < 2 || $height > 100) {
-		return "[[sparkline ".gettext("bad height value")."]]";
+		error gettext("bad height value");
 	}
 	if ($style eq "Bar") {
 		$php.=qq{\$sparkline->Render($height);\n};
 	}
 	else {
 		if (! exists $params{width}) {
-			return "[[sparkline ".gettext("missing width parameter")."]]";
+			error gettext("missing width parameter");
 		}
 		my $width=int($params{width});
 		if ($width < 2 || $width > 1024) {
-			return "[[sparkline ".gettext("bad width value")."]]";
+			error gettext("bad width value");
 		}
 		$php.=qq{\$sparkline->RenderResampled($width, $height);\n};
 	}
@@ -141,7 +141,7 @@ sub preprocess (@) { #{{{
 		waitpid $pid, 0;
 		$SIG{PIPE}="DEFAULT";
 		if ($sigpipe) {
-			return  "[[sparkline ".gettext("failed to run php")."]]";
+			error gettext("failed to run php");
 		}
 
 		if (! $params{preview}) {
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 11474c8f0..892ea182e 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -19,7 +19,7 @@ sub preprocess (@) { #{{{
 
 	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}));
 		add_depends($params{page}, $params{file});
@@ -61,7 +61,7 @@ sub preprocess (@) { #{{{
 			defined $params{delimiter} ? $params{delimiter} : "|",);
 	}
 	else {
-		return "[[table ".gettext("unknown data format")."]]";
+		error gettext("unknown data format");
 	}
 
 	my $header;
@@ -69,7 +69,7 @@ sub preprocess (@) { #{{{
 		$header=shift @data;
 	}
 	if (! @data) {
-		return "[[table ".gettext("empty data")."]]";
+		error gettext("empty data");
 	}
 
 	my @lines;
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index aa1f57c07..c33dbbb83 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -16,7 +16,7 @@ sub preprocess (@) { #{{{
 	my %params=@_;
 
 	if (! exists $params{id}) {
-		return "[[template ".gettext("missing id parameter")."]]";
+		error gettext("missing id parameter")
 	}
 
 	my $template_page="templates/$params{id}";
@@ -42,7 +42,7 @@ sub preprocess (@) { #{{{
 		);
 	};
 	if ($@) {
-		return "[[template ".gettext("failed to process:")." $@]]";
+		error gettext("failed to process:")." $@"
 	}
 
 	$params{basename}=IkiWiki::basename($params{page});
diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index f9ec90d87..4faef7be1 100644
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -14,7 +14,7 @@ sub preprocess (@) { #{{{
 	
 	foreach my $param (qw{match pagespec}) {
 		if (! exists $params{$param}) {
-			return "[[testpagespec $param parameter is required]]";
+			error sprintf(gettext("%s parameter is required"), $param);
 		}
 	}
 
diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index 8c3e88c69..6a6bdd4fa 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -27,14 +27,14 @@ sub preprocess (@) { #{{{
 	
 	my $code = $params{code};
 	if (! defined $code && ! length $code) {
-		return "[[teximg ".gettext("missing tex code"). "]]";
+		error gettext("missing tex code");
 	}
 
 	if (check($code)) {
 		return create($code, check_height($height), \%params);
 	}
 	else {
-		return "[[teximg ".gettext("code includes disallowed latex commands"). "]]";
+		error gettext("code includes disallowed latex commands")
 	}
 } #}}}
 
@@ -85,7 +85,7 @@ sub create ($$$) { #{{{
 			.qq{" class="teximg" />};
 	}
 	else {
-		return qq{[[teximg <a href="$logurl">}.gettext("failed to generate image from code")."</a>]]";
+		error qq{<a href="$logurl">}.gettext("failed to generate image from code")."</a>";
 	}
 } #}}}
 
-- 
cgit v1.2.3