Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-admin/acs-admin.info 16 Sep 2002 12:40:26 -0000 1.15
+++ openacs-4/packages/acs-admin/acs-admin.info 24 Sep 2002 00:14:39 -0000 1.16
@@ -147,6 +147,10 @@
+
+
+
+
Index: openacs-4/packages/acs-content-repository/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/index.vuh,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-content-repository/www/index.vuh 14 Sep 2001 04:53:02 -0000 1.4
+++ openacs-4/packages/acs-content-repository/www/index.vuh 24 Sep 2002 00:14:40 -0000 1.5
@@ -21,13 +21,16 @@
[db_string content_root "select content_item.get_root_folder from dual"]
set template_root \
[db_string template_root "select content_template.get_root_folder from dual"]
+
# Serve the page
-ns_log notice "RESOLVING URL: $the_root $the_url"
+# DRB: Note that content::init modifies the local variable the_root, which is treated
+# as though it's been passed by reference. This requires that the redirect treat the
+# path as an absolute path within the filesystem.
+
if { [content::init the_url the_root $content_root $template_root public $revision_id] } {
set file "$the_root/$the_url"
- ns_log notice "RESOLVED URL: $file"
- rp_serve_abstract_file $file
+ rp_internal_redirect -absolute_path $file
} else {
# ns_returnnotfound
set page "[ad_header {Content Item Not Found}]"
Index: openacs-4/packages/acs-content-repository/www/doc/guide/publish.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/publish.html,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-content-repository/www/doc/guide/publish.html 13 Sep 2002 16:46:25 -0000 1.2
+++ openacs-4/packages/acs-content-repository/www/doc/guide/publish.html 24 Sep 2002 00:14:41 -0000 1.3
@@ -52,9 +52,12 @@
[db_string template_root "select content_template.get_root_folder from dual"]
# Serve the page
+# DRB: Note that content::init modifies the local variable the_root, which is treated
+# as though it's been passed by reference. This requires that the redirect treat the
+# path as an absolute path within the filesystem.
if { [content::init the_url the_root $content_root $template_root] } {
set file "$the_root/$the_url"
- rp_serve_abstract_file $file
+ rp_internal_redirect -absolute_path $file
} else {
ns_returnnotfound
}
@@ -146,4 +149,4 @@