X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/35c90a5b582f0d40a122b151580e313c2b157b6f..766311f45b4351488d7dad519a6471094a58da16:/IkiWiki/Plugin/polygen.pm

diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index c14889167..8ce62b754 100644
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -7,26 +7,41 @@ package IkiWiki::Plugin::polygen;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 use File::Find;
 
-sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "polygen",
-		call => \&preprocess);
-} # }}}
+sub import {
+	hook(type => "getsetup", id => "polygen", call => \&getsetup);
+	hook(type => "preprocess", id => "polygen", call => \&preprocess);
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+	return 
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+			section => "widget",
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 	my $grammar = ($params{grammar} or 'polygen');
 	my $symbol = ($params{symbol} or undef);
+	my $options = ($config{deterministic} ? '-seed 42' : '');
 
 	# Sanitize parameters
 	$grammar =~ IkiWiki::basename($grammar);
+	$grammar =~ s/[^A-Za-z0-9]//g;
 	$grammar =~ s/\.grm$//;
 	$grammar .= '.grm';
 	$symbol =~ s/[^A-Za-z0-9]//g if defined $symbol;
+	$symbol = IkiWiki::possibly_foolish_untaint($symbol) if defined $symbol;
 
 	my $grmfile = '/usr/share/polygen/ita/polygen.grm';
+	if (! -d '/usr/share/polygen') {
+		error gettext("polygen not installed");
+	}
 	find({wanted => sub {
 			if (substr($File::Find::name, -length($grammar)) eq $grammar) {
 				$grmfile = IkiWiki::possibly_foolish_untaint($File::Find::name);
@@ -37,20 +52,20 @@ sub preprocess (@) { #{{{
 	
 	my $res;
 	if (defined $symbol) {
-		$res = `polygen -S $symbol $grmfile 2>/dev/null`;
+		$res = `polygen -S $symbol $options $grmfile 2>/dev/null`;
 	}
 	else {
-		$res = `polygen $grmfile 2>/dev/null`;
+		$res = `polygen $options $grmfile 2>/dev/null`;
 	}
 
 	if ($?) {
-		$res="[[polygen failed]]";
+		error gettext("command failed");
 	}
 
-	# Strip trainling spaces and newlines so that we flow well with the
+	# Strip trailing spaces and newlines so that we flow well with the
 	# markdown text
 	$res =~ s/\s*$//;
 	return $res;
-} # }}}
+}
 
 1