Don't execute perm_redirects directly from conf_perm_redirect to avoid tripping over sitemaps and other code that sources config files but doesn't want to actually *do* anything. Also hide paths with simple or pattern redirects from sitemaps.

This commit is contained in:
Uriel 2009-02-14 07:09:27 +00:00
parent af66a69dd9
commit 7ba725cf92
3 changed files with 20 additions and 14 deletions

View file

@ -39,20 +39,22 @@ fn listDir {
if(test -f $d/_werc/config)
. ./$d/_werc/config
echo '<ul class="sitemap-list">'
if(~ $#perm_redir_to 0) {
echo '<ul class="sitemap-list">'
for(i in `{ls -dF $d^*/ $d^*.md $d^*.html $d^*.txt >[2]/dev/null | sed $dirfilter}) {
desc=`{get_file_title $i}
u=`{echo $i|sed 's!'$sitedir'!!; '$dirclean's!/index$!/!; '}
if(! ~ $#desc 0 && ! ~ $desc '')
desc=' - '$"desc
n=`{echo /$u|sed 's/_/ /g; s,.*/([^/]+)/?$,\1,'}
echo '<li><a href="'$base_url$u'">'^$"n^'</a>' $"desc '</li>'
echo $base_url^$u >> $tmpfile
if(test -d $i)
@{ listDir $i }
for(i in `{ls -dF $d^*/ $d^*.md $d^*.html $d^*.txt >[2]/dev/null | sed $dirfilter}) {
desc=`{get_file_title $i}
u=`{echo $i|sed 's!'$sitedir'!!; '$dirclean's!/index$!/!; '}
if(! ~ $#desc 0 && ! ~ $desc '')
desc=' - '$"desc
n=`{echo /$u|sed 's/_/ /g; s,.*/([^/]+)/?$,\1,'}
echo '<li><a href="'$base_url$u'">'^$"n^'</a>' $"desc '</li>'
echo $base_url^$u >> $tmpfile
if(test -d $i)
@{ listDir $i }
}
echo '</ul>'
}
echo '</ul>'
}
fltr_cache listDir $sitedir/