Index: openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql,v
diff -u -r1.25.2.7 -r1.25.2.8
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	9 Aug 2004 21:48:37 -0000	1.25.2.7
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	11 Aug 2004 05:47:00 -0000	1.25.2.8
@@ -207,21 +207,22 @@
   <fullquery name="fs::delete_file.delete_file">      
       <querytext>
 	
+	
 	begin
-		file_storage.delete_file(
+	   :1 := file_storage.delete_file(
 			:item_id
 			);
 	end;
 
       </querytext>
   </fullquery>
 
-  <fullquery name="fs::delete_file.delete_file">      
+  <fullquery name="fs::delete_folder.delete_folder">      
       <querytext>
-		file_storage.delete_folder (
-			:folder_id,
-                        :cascade_p
-			)
+
+	begin
+	        file_storage.delete_folder(:folder_id, :cascade_p );
+	end;
       </querytext>
   </fullquery>
   
Index: openacs-4/packages/file-storage/www/delete-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/delete-oracle.xql,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/file-storage/www/delete-oracle.xql	5 Aug 2004 01:21:15 -0000	1.1.2.3
+++ openacs-4/packages/file-storage/www/delete-oracle.xql	11 Aug 2004 05:48:49 -0000	1.1.2.4
@@ -15,7 +15,7 @@
 
  <fullquery name="get_to_be_deleted">    
    <querytext>
-	select fs.object_id as fs_object_id, fs.name, fs.parent_id,
+	select fs.object_id as fs_object_id, fs.name, fs.type, fs.parent_id,
       	acs_permission.permission_p(fs.object_id, :user_id, 'write') as delete_p
       	from fs_objects fs
       	where fs.object_id in ('$object_id_list')