q/thirdculture-werc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
bin/werc.rc
View file

@ -81,6 +81,8 @@ fn werc_exec_request {
} }
cd $werc_root cd $werc_root
if(~ $#perm_redir_to 1)
perm_redirect $perm_redir_to
f=();t=() f=();t=()
for(i in $perm_redir_patterns) { for(i in $perm_redir_patterns) {
if(~ $#f 0) if(~ $#f 0)

6
bin/wercconf.rc
View file

@ -1,9 +1,11 @@
# To be used from config files # To be used from config files
fn conf_perm_redirect { fn conf_perm_redirect {
if(~ $#* 1) if(~ $#* 1)
perm_redirect $1 perm_redir_to=$1
if not if not {
perm_redir_patterns=($perm_redir_patterns $1 $2) perm_redir_patterns=($perm_redir_patterns $1 $2)
conf_hide_paths $1 # XXX Will hide paths even if replacement string is the same as matched sctring.
}
} }
fn conf_hide_paths { fn conf_hide_paths {

26
lib/sitemap.tpl
View file

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