urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Joey Hess 2008-03-23 20:01:26 -04:00
parent d2911a20a6
commit cb8d1c8642
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/graphviz.pm
View File

@ -29,10 +29,10 @@ sub render_graph (\%) { #{{{
# Use the sha1 of the graphviz code as part of its filename. # Use the sha1 of the graphviz code as part of its filename.
eval q{use Digest::SHA1}; eval q{use Digest::SHA1};
error($@) if $@; error($@) if $@;
my $dest=$params{destpage}."/graph-". my $dest=$params{page}."/graph-".
IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)). IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
".png"; ".png";
will_render($params{destpage}, $dest); will_render($params{page}, $dest);
if (! -e "$config{destdir}/$dest") { if (! -e "$config{destdir}/$dest") {
my $pid; my $pid;

4
IkiWiki/Plugin/img.pm
View File

@ -39,7 +39,7 @@ sub preprocess (@) { #{{{
my $file = bestlink($params{page}, $image); my $file = bestlink($params{page}, $image);
my $dir = $params{destpage}; my $dir = $params{page};
my $base = IkiWiki::basename($file); my $base = IkiWiki::basename($file);
eval q{use Image::Magick}; eval q{use Image::Magick};
@ -56,7 +56,7 @@ sub preprocess (@) { #{{{
my $outfile = "$config{destdir}/$dir/${w}x${h}-$base"; my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
$imglink = "$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)) { if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
$r = $im->Read($outfile); $r = $im->Read($outfile);

6
IkiWiki/Plugin/linkmap.pm
View File

@ -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 # Use ikiwiki's function to create the file, this makes sure needed
# subdirs are there and does some sanity checking. # subdirs are there and does some sanity checking.
will_render($params{destpage}, $dest); will_render($params{page}, $dest);
writefile($dest, $config{destdir}, ""); writefile($dest, $config{destdir}, "");
# Run dot to create the graphic and get the map data. # Run dot to create the graphic and get the map data.
@ -86,7 +86,7 @@ sub genmap ($) { #{{{
close OUT; close OUT;
local $/=undef; 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". "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
<IN>. <IN>.
"</object>"; "</object>";

4
IkiWiki/Plugin/sparkline.pm
View File

@ -114,10 +114,10 @@ sub preprocess (@) { #{{{
# the base for its filename. # the base for its filename.
eval q{use Digest::SHA1}; eval q{use Digest::SHA1};
error($@) if $@; error($@) if $@;
my $fn=$params{destpage}."/sparkline-". my $fn=$params{page}."/sparkline-".
IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($php)). IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($php)).
".png"; ".png";
will_render($params{destpage}, $fn); will_render($params{page}, $fn);
if (! -e "$config{destdir}/$fn") { if (! -e "$config{destdir}/$fn") {
my $pid; my $pid;

8
IkiWiki/Plugin/teximg.pm
View File

@ -70,10 +70,10 @@ sub create ($$$) { #{{{
my $digest = md5_hex($code, $height); my $digest = md5_hex($code, $height);
my $imglink= $params->{destpage} . "/$digest.png"; my $imglink= $params->{page} . "/$digest.png";
my $imglog = $params->{destpage} . "/$digest.log"; my $imglog = $params->{page} . "/$digest.log";
will_render($params->{destpage}, $imglink); will_render($params->{page}, $imglink);
will_render($params->{destpage}, $imglog); will_render($params->{page}, $imglog);
my $imgurl=urlto($imglink, $params->{destpage}); my $imgurl=urlto($imglink, $params->{destpage});
my $logurl=urlto($imglink, $params->{destpage}); my $logurl=urlto($imglink, $params->{destpage});