aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-03-23 20:01:26 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-03-23 20:01:26 -0400
commitcb8d1c86425999eb3572326679fae9a033664150 (patch)
tree08cea19c0f50b5cc76d68895b0a945e724fe14a7 /IkiWiki/Plugin
parentd2911a20a6913e46035a8731acafba6faf5997f9 (diff)
downloadikiwiki-cb8d1c86425999eb3572326679fae9a033664150.tar
ikiwiki-cb8d1c86425999eb3572326679fae9a033664150.tar.gz
revert destpage part of f7bdc2385
destpage does not normally need to be worried about when creating other files as part of the process of rendering a page. Using destpage results in inlined pages creating two copies of such files. It works to not use destpage in this case because the inlining page depends on the source page, so if the source page is modified or deleted the inlining page will be updated.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/graphviz.pm4
-rw-r--r--IkiWiki/Plugin/img.pm4
-rw-r--r--IkiWiki/Plugin/linkmap.pm6
-rw-r--r--IkiWiki/Plugin/sparkline.pm4
-rw-r--r--IkiWiki/Plugin/teximg.pm8
5 files changed, 13 insertions, 13 deletions
diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index ec48bad2c..fe3559857 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -29,10 +29,10 @@ sub render_graph (\%) { #{{{
# Use the sha1 of the graphviz code as part of its filename.
eval q{use Digest::SHA1};
error($@) if $@;
- my $dest=$params{destpage}."/graph-".
+ my $dest=$params{page}."/graph-".
IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
".png";
- will_render($params{destpage}, $dest);
+ will_render($params{page}, $dest);
if (! -e "$config{destdir}/$dest") {
my $pid;
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index c5b86bad8..b6e7c9e41 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -39,7 +39,7 @@ sub preprocess (@) { #{{{
my $file = bestlink($params{page}, $image);
- my $dir = $params{destpage};
+ my $dir = $params{page};
my $base = IkiWiki::basename($file);
eval q{use Image::Magick};
@@ -56,7 +56,7 @@ sub preprocess (@) { #{{{
my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
$imglink = "$dir/${w}x${h}-$base";
- will_render($params{destpage}, $imglink);
+ will_render($params{page}, $imglink);
if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
$r = $im->Read($outfile);
diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 5b87277ac..82b38f4cb 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -53,11 +53,11 @@ sub genmap ($) { #{{{
}
}
- my $dest=$params{destpage}."/linkmap.png";
+ my $dest=$params{page}."/linkmap.png";
# Use ikiwiki's function to create the file, this makes sure needed
# subdirs are there and does some sanity checking.
- will_render($params{destpage}, $dest);
+ will_render($params{page}, $dest);
writefile($dest, $config{destdir}, "");
# Run dot to create the graphic and get the map data.
@@ -86,7 +86,7 @@ sub genmap ($) { #{{{
close OUT;
local $/=undef;
- my $ret="<object data=\"".urlto($dest, $params{page}).
+ my $ret="<object data=\"".urlto($dest, $params{destpage}).
"\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
<IN>.
"</object>";
diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 0b9ddd8d2..69b3512c2 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -114,10 +114,10 @@ sub preprocess (@) { #{{{
# the base for its filename.
eval q{use Digest::SHA1};
error($@) if $@;
- my $fn=$params{destpage}."/sparkline-".
+ my $fn=$params{page}."/sparkline-".
IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($php)).
".png";
- will_render($params{destpage}, $fn);
+ will_render($params{page}, $fn);
if (! -e "$config{destdir}/$fn") {
my $pid;
diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index f7fd91ddf..0753a9a77 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -70,10 +70,10 @@ sub create ($$$) { #{{{
my $digest = md5_hex($code, $height);
- my $imglink= $params->{destpage} . "/$digest.png";
- my $imglog = $params->{destpage} . "/$digest.log";
- will_render($params->{destpage}, $imglink);
- will_render($params->{destpage}, $imglog);
+ my $imglink= $params->{page} . "/$digest.png";
+ my $imglog = $params->{page} . "/$digest.log";
+ will_render($params->{page}, $imglink);
+ will_render($params->{page}, $imglog);
my $imgurl=urlto($imglink, $params->{destpage});
my $logurl=urlto($imglink, $params->{destpage});