swerc

commit 501dac6aac6ce16f6c098c75bd0c782fcf1f8dc9
parent e327cec28f685a1677cfba50b087995c72b38b35
Author: uriel@engel.se.cat-v.org <unknown>
Date:   Tue, 19 Jun 2007 03:53:34 +0200

Fix RSS feeds, this sucks and needs to be heavily reworked
Diffstat:
M
bin/controller.rc
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/bin/controller.rc b/bin/controller.rc
@@ -15,7 +15,7 @@ body=index
 template=_default
 sidebar=sidebar
 basedir=/gsoc/www
-baseuri=http://$site
+baseuri=http://$site/
 for(i in siteTitle siteSubTitle title extraHeaders)
     $i = ''
 
@@ -132,7 +132,7 @@ fpath=$sitedir
 for ( i in '' $args ) {
     fpath = $fpath/$i
     # We don't want blog settings to cascade into posts, note that we are inBlog instead
-    if ( ! ~ $#blogDirs 0 ) {
+    if ( ! ~ $#blogDirs 0 && ! ~ $body */indexrss ) {
         inBlog = $blogDirs
         blogDirs = () 
     }
@@ -202,6 +202,10 @@ if(! ~ $REQUEST_URI */index.rss) {
 	exit
 }
 
+if ( ~ $body */[bB]log/indexrss */[bB]log//indexrss && ~ $#blogDirs 0 )
+    blogDirs = `{basename -d $body}
+
+
 uri = `{echo $uri | sed 's/indexrss$//'}
 uri=$baseuri$"uri