swerc

commit a6f22dcb204c8ebee625fc4cc5f63e9101973542
parent e8050fd7c64b8e2d82c02eee7712dfc8b938ecde
Author: uriel@soma <unknown>
Date:   Sat, 14 Feb 2009 07:09:27 +0000

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.
Diffstat:
M
bin/werc.rc
 | 
2
++
M
bin/wercconf.rc
 | 
6
++++--
M
lib/sitemap.tpl
 | 
28
+++++++++++++++-------------

3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/bin/werc.rc b/bin/werc.rc
@@ -81,6 +81,8 @@ fn werc_exec_request {
     }
     cd $werc_root
 
+    if(~ $#perm_redir_to 1)
+        perm_redirect $perm_redir_to
     f=();t=()
     for(i in $perm_redir_patterns) {
         if(~ $#f 0)
diff --git a/bin/wercconf.rc b/bin/wercconf.rc
@@ -1,9 +1,11 @@
 # To be used from config files
 fn conf_perm_redirect {
     if(~ $#* 1)
-        perm_redirect $1
-    if not
+        perm_redir_to=$1
+    if not {
         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 {
diff --git a/lib/sitemap.tpl b/lib/sitemap.tpl
@@ -39,20 +39,22 @@ fn listDir {
     if(test -f $d/_werc/config)
         . ./$d/_werc/config
 
-    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 }
+    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 }
+        }
+        echo '</ul>'
     }
-    echo '</ul>'
 }
 
 fltr_cache listDir $sitedir/