Index: openacs-4/packages/file-storage/www/folder-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-chunk-oracle.xql,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/file-storage/www/folder-chunk-oracle.xql	13 Aug 2003 13:30:53 -0000	1.7
+++ openacs-4/packages/file-storage/www/folder-chunk-oracle.xql	11 Dec 2003 17:59:29 -0000	1.7.2.1
@@ -12,11 +12,19 @@
                    to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
                    fs_objects.content_size,
                    fs_objects.url,
-                   content_item.get_path(fs_objects.object_id, :root_folder_id) as file_url,
                    fs_objects.sort_key,
                    fs_objects.file_upload_name,
-                   case when fs_objects.last_modified >= (sysdate - :n_past_days) then 1 else 0 end as new_p,
                    case
+                     when :folder_path is null
+                     then fs_objects.name
+                     else :folder_path || '/' || fs_objects.name
+                   end as file_url,
+                   case
+                     when fs_objects.last_modified >= (sysdate - :n_past_days)
+                     then 1
+                     else 0
+                   end as new_p,
+                   case
                      when type = 'url'
                      then acs_permission.permission_p(fs_objects.object_id, :viewing_user_id, 'delete')
                      else 't'
@@ -37,4 +45,13 @@
 
         </querytext>
     </fullquery>
+
+    <fullquery name="get_folder_path">
+        <querytext>
+            declare begin
+                :1 := content_item.get_path(:folder_id, :root_folder_id);
+            end;
+        </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql	13 Aug 2003 13:30:53 -0000	1.8
+++ openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql	11 Dec 2003 17:59:29 -0000	1.8.2.1
@@ -12,11 +12,19 @@
                    to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
                    fs_objects.content_size,
                    fs_objects.url,
-                   content_item__get_path(fs_objects.object_id, :root_folder_id) as file_url,
                    fs_objects.sort_key,
                    fs_objects.file_upload_name,
-                   case when fs_objects.last_modified >= (now() - cast('$n_past_days days' as interval)) then 1 else 0 end as new_p,
                    case
+                     when :folder_path is null
+                     then fs_objects.name
+                     else :folder_path || '/' || fs_objects.name
+                   end as file_url,
+                   case
+                     when fs_objects.last_modified >= (now() - cast('$n_past_days days' as interval))
+                     then 1
+                     else 0
+                   end as new_p,
+                   case
                      when type = 'url'
                      then acs_permission__permission_p(fs_objects.object_id, :viewing_user_id, 'delete')
                      else 't'
@@ -37,4 +45,13 @@
 
         </querytext>
     </fullquery>
+
+    <fullquery name="get_folder_path">
+        <querytext>
+
+            select content_item__get_path(:folder_id, :root_folder_id);
+
+        </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	3 Oct 2003 14:00:13 -0000	1.15
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	11 Dec 2003 17:59:29 -0000	1.15.2.1
@@ -30,8 +30,12 @@
 
 set content_size_total 0
 
-set root_folder_id [fs::get_root_folder]
+if {![exists_and_not_null root_folder_id]} {
+    set root_folder_id [fs::get_root_folder]
+}
 
+set folder_path [db_exec_plsql get_folder_path {}]
+
 db_multirow -extend { last_modified_pretty content_size_pretty } contents select_folder_contents {} {
     set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi]