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

Removed the pagefile function, which was confusingly close in name to 

newpagefile.

Note that newpagefile is not used here (or in recentchanges) because
the internal use pages they generate are transient and unlikely to
benefit from being put each in their own subdir.
master
Joey Hess 2008-09-29 18:56:24 -04:00
parent 2ba168ac83
commit 121efb246f
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IkiWiki/Plugin/aggregate.pm
View File

@ -158,11 +158,11 @@ sub migrate_to_internal { #{{{
next if $data->{expired}; next if $data->{expired};
$config{aggregateinternal} = 0; $config{aggregateinternal} = 0;
my $oldname = pagefile($data->{page}); my $oldname = "$config{srcdir}/".htmlfn($data->{page});
my $oldoutput = $config{destdir}."/".IkiWiki::htmlpage($data->{page}); my $oldoutput = $config{destdir}."/".IkiWiki::htmlpage($data->{page});
$config{aggregateinternal} = 1; $config{aggregateinternal} = 1;
my $newname = pagefile($data->{page}); my $newname = "$config{srcdir}/".htmlfn($data->{page});
debug "moving $oldname -> $newname"; debug "moving $oldname -> $newname";
if (-e $newname) { if (-e $newname) {
@ -364,13 +364,13 @@ sub garbage_collect () { #{{{
foreach my $guid (values %guids) { foreach my $guid (values %guids) {
# any guid whose feed is gone should be removed # any guid whose feed is gone should be removed
if (! exists $feeds{$guid->{feed}}) { if (! exists $feeds{$guid->{feed}}) {
unlink pagefile($guid->{page}) unlink "$config{srcdir}/".htmlfn($guid->{page})
if exists $guid->{page}; if exists $guid->{page};
delete $guids{$guid->{guid}}; delete $guids{$guid->{guid}};
} }
# handle expired guids # handle expired guids
elsif ($guid->{expired} && exists $guid->{page}) { elsif ($guid->{expired} && exists $guid->{page}) {
unlink pagefile($guid->{page}); unlink "$config{srcdir}/".htmlfn($guid->{page});
delete $guid->{page}; delete $guid->{page};
delete $guid->{md5}; delete $guid->{md5};
} }
@ -570,7 +570,7 @@ sub add_page (@) { #{{{
} }
my $c=""; my $c="";
while (exists $IkiWiki::pagecase{lc $page.$c} || while (exists $IkiWiki::pagecase{lc $page.$c} ||
-e pagefile($page.$c)) { -e "$config{srcdir}/".htmlfn($page.$c)) {
$c++ $c++
} }
@ -581,7 +581,7 @@ sub add_page (@) { #{{{
$c=""; $c="";
$page=$feed->{dir}."/item"; $page=$feed->{dir}."/item";
while (exists $IkiWiki::pagecase{lc $page.$c} || while (exists $IkiWiki::pagecase{lc $page.$c} ||
-e pagefile($page.$c)) { -e "$config{srcdir}/".htmlfn($page.$c)) {
$c++ $c++
} }
} }
@ -621,7 +621,7 @@ sub add_page (@) { #{{{
if (defined $mtime && $mtime <= time) { if (defined $mtime && $mtime <= time) {
# Set the mtime, this lets the build process get the right # Set the mtime, this lets the build process get the right
# creation time on record for the new page. # creation time on record for the new page.
utime $mtime, $mtime, pagefile($guid->{page}); utime $mtime, $mtime, "$config{srcdir}/".htmlfn($guid->{page});
# Store it in pagectime for expiry code to use also. # Store it in pagectime for expiry code to use also.
$IkiWiki::pagectime{$guid->{page}}=$mtime; $IkiWiki::pagectime{$guid->{page}}=$mtime;
} }
@ -679,12 +679,6 @@ sub htmlabs ($$) { #{{{
return $ret; return $ret;
} #}}} } #}}}
sub pagefile ($) { #{{{
my $page=shift;
return "$config{srcdir}/".htmlfn($page);
} #}}}
sub htmlfn ($) { #{{{ sub htmlfn ($) { #{{{
return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext}); return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});
} #}}} } #}}}