Index: openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl,v
diff -u -N -r1.1.2.11 -r1.1.2.12
--- openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl	18 Nov 2005 15:55:59 -0000	1.1.2.11
+++ openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl	25 Nov 2005 11:42:46 -0000	1.1.2.12
@@ -124,7 +124,7 @@
         return "file_storage"		
     }    
 
-ad_proc -callback application-track::getGeneralInfo -impl file_storage {} { 
+    ad_proc -callback application-track::getGeneralInfo -impl file_storage {} { 
         callback implementation 
     } {
     
@@ -142,7 +142,7 @@
     } 
 
 
-ad_proc -callback application-track::getSpecificInfo -impl file_storage {} { 
+    ad_proc -callback application-track::getSpecificInfo -impl file_storage {} { 
         callback implementation 
     } {
    	
@@ -152,18 +152,20 @@
 
 	set my_query {
 	
-		SELECT f.name as name, f.file_id, f.type as type, f.content_size as size,
+	SELECT f.name as name, f.file_id, f.type as type, f.content_size as size,
+              fo.name as folder_name,
 		       to_char(f.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified,
 		       to_char(o.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date,
 		       (select site_node__url(site_nodes.node_id)
                        from site_nodes, acs_objects
                        where site_nodes.object_id = file_storage__get_package_id(f.parent_id) and acs_objects.object_id = f.file_id) as url,
-                       com.community_id as class_id                       
-                FROM fs_files f,dotlrn_communities_full com,acs_objects o, acs_objects o2
+                       com.community_id as class_id
+                FROM fs_files f,fs_folders fo,dotlrn_communities_full com,acs_objects o, acs_objects o2
 		WHERE f.file_id = o.object_id
         and com.community_id=:class_instance_id
 		      and o2.object_id= file_storage__get_package_id(f.parent_id)
-		      and o2.context_id=com.package_id 
+		      and o2.context_id=com.package_id
+		      and fo.folder_id = f.parent_id
 		      
 		      }
 	      
@@ -181,8 +183,13 @@
 	 	    html {align center}	 	    
 	 	                 
 	        }
+	        folder {
+	            label "Folder"
+	            display_col folder_name 	              	              
+	 	    html {align center}	 	
+	        }
 	        size {
-	            label "Size"
+	            label "Size (bytes)"
 	            display_col size
 	 	    html {align center}	 	         
 	 	          
@@ -202,5 +209,4 @@
 	}
 	
 	
-    }      
-        
+    }      
\ No newline at end of file