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.1 -r1.2
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	13 Aug 2001 01:02:59 -0000	1.1
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	22 Sep 2001 05:39:21 -0000	1.2
@@ -18,7 +18,7 @@
       <querytext>
       
     	begin
-        	:1 := content_folder.get_label(:folder_id);
+        	:1 := file_storage.get_folder_name(:folder_id);
     	end;
 
       </querytext>
@@ -68,7 +68,7 @@
       <querytext>
 
       	begin
-	    :1 := content_item.get_title(:item_id);
+	    :1 := file_storage.get_title(:item_id);
 	end;
 
       </querytext>
@@ -78,11 +78,11 @@
 <fullquery name="fs_context_bar_list.context_bar">      
       <querytext>
       
-    	select case when content_item.get_content_type(i.item_id) = 'content_folder' 
-	            then '?folder_id=' 
-	             else 'file?file_id=' 
+    	select case when file_storage.get_content_type(i.item_id) = 'content_folder' 
+	            then 'index?folder_id=' 
+	            else 'file?file_id=' 
 	       end || i.item_id,
-               content_item.get_title(i.item_id)
+               file_storage.get_title(i.item_id)
     	from   cr_items i
     	where  item_id not in (
         		       	select i2.item_id
Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	6 Sep 2001 15:53:14 -0000	1.5
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	22 Sep 2001 05:39:36 -0000	1.6
@@ -15,7 +15,7 @@
 <fullquery name="fs_get_folder_name.folder_name">      
       <querytext>
 
-	select content_folder__get_label(:folder_id);
+	select file_storage__get_folder_name(:folder_id);
 
       </querytext>
 </fullquery>
@@ -67,7 +67,7 @@
 <fullquery name="fs_context_bar_list.title">      
       <querytext>
 
-	select content_item__get_title(:item_id);
+	select file_storage__get_title(:item_id)
 
       </querytext>
 </fullquery>
@@ -76,11 +76,11 @@
 <fullquery name="fs_context_bar_list.context_bar">      
       <querytext>
 
-    	select (case when content_item__get_content_type(j.item_id) = 'content_folder' 
-	             then '?folder_id=' 
+    	select (case when file_storage__get_content_type(j.item_id) = 'content_folder' 
+	             then 'index?folder_id=' 
 	             else 'file?file_id=' 
                 end) || j.item_id,
-           	content_item__get_title(j.item_id)
+           	file_storage__get_title(j.item_id)
         from   cr_items i,cr_items j
         where  j.item_id not in (select o2.item_id
         		         from   cr_items o1, cr_items o2
Index: openacs-4/packages/file-storage/www/file-delete-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-delete-oracle.xql	16 Aug 2001 20:29:36 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-delete-oracle.xql	22 Sep 2001 05:46:25 -0000	1.2
@@ -14,25 +14,15 @@
       </querytext>
 </fullquery>
 
-<fullquery name="file_delete">      
+<fullquery name="delete_file">      
       <querytext>
 
 	begin
-        	content_item.delete(:file_id);
+        	file_storage.delete_file(:file_id);
 	end;
 
       </querytext>
 </fullquery>
  
-<fullquery name="file_name">      
-      <querytext>
-      
-    	select title as file_name 
-    	from   cr_revisions 
-    	where  revision_id = content_item.get_live_revision(:file_id)
-
-      </querytext>
-</fullquery>
-
  
 </queryset>
Index: openacs-4/packages/file-storage/www/file-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-delete-postgresql.xql	16 Aug 2001 20:29:57 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-delete-postgresql.xql	22 Sep 2001 05:46:40 -0000	1.2
@@ -14,23 +14,12 @@
       </querytext>
 </fullquery>
 
-<fullquery name="file_delete">      
+<fullquery name="delete_file">      
       <querytext>
 
-        select content_item__delete(:file_id);
+        select file_storage__delete_file(:file_id);
 
       </querytext>
 </fullquery>
  
-<fullquery name="file_name">      
-      <querytext>
-      
-    	select title as file_name 
-    	from   cr_revisions 
-    	where  revision_id = content_item__get_live_revision(:file_id)
-
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/file-storage/www/file-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/file-delete.tcl	17 Aug 2001 14:12:28 -0000	1.2
+++ openacs-4/packages/file-storage/www/file-delete.tcl	22 Sep 2001 05:47:09 -0000	1.3
@@ -40,9 +40,9 @@
 
     db_1row parent_id "select parent_id from cr_items where item_id = :file_id"
 
-    db_exec_plsql file_delete "
+    db_exec_plsql delete_file "
     begin
-        content_item.delete(:file_id);
+        file_storage.delete_file(:file_id);
     end;"
 
     ad_returnredirect "?folder_id=$parent_id"
@@ -51,9 +51,9 @@
     # they need to confirm that they really want to delete the file
 
     db_1row file_name "
-    select title as file_name 
-    from   cr_revisions 
-    where  revision_id = content_item.get_live_revision(:file_id)"
+    	select name as title
+    	from   cr_items
+    	where  item_id = :file_id"
 
     set context_bar [fs_context_bar_list -final "Delete" $file_id]
 
Index: openacs-4/packages/file-storage/www/file-delete.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-delete.xql	16 Aug 2001 20:30:11 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-delete.xql	22 Sep 2001 05:47:23 -0000	1.2
@@ -9,5 +9,14 @@
       </querytext>
 </fullquery>
 
- 
+<fullquery name="file_name">      
+      <querytext>
+      
+    	select name as title
+    	from   cr_items
+    	where  item_id = :file_id
+
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/file-storage/www/file-edit-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-edit-2-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-edit-2-oracle.xql	16 Aug 2001 20:30:28 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-edit-2-oracle.xql	22 Sep 2001 05:47:37 -0000	1.2
@@ -3,13 +3,13 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="rename">      
+<fullquery name="rename_file">      
       <querytext>
       
 	begin
-    		content_item.rename (
-        		item_id => :file_id,
-        		name => :name
+    		file_storage.rename_file (
+        		file_id => :file_id,
+        		title => :title
     			);
 	end;
 
@@ -22,7 +22,7 @@
       
     	select count(*)
     	from   cr_items
-    	where  name = :name
+    	where  name = :title
     	and    parent_id = content_item.get_parent_folder(:file_id)
 
       </querytext>
Index: openacs-4/packages/file-storage/www/file-edit-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-edit-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-edit-2-postgresql.xql	16 Aug 2001 20:30:42 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-edit-2-postgresql.xql	22 Sep 2001 05:47:50 -0000	1.2
@@ -3,12 +3,12 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="rename">      
+<fullquery name="rename_file">      
       <querytext>
 
-    	select content_item__rename (
-        	:file_id, -- item_id
-        	:name	  -- name
+    	select file_storage__rename_file (
+        	:file_id, -- file_id
+        	:title	  -- title
     		);
 
       </querytext>
@@ -20,7 +20,7 @@
       
     	select count(*)
     	from   cr_items
-    	where  name = :name
+    	where  name = :title
     	and    parent_id = content_item__get_parent_folder(:file_id)
 
       </querytext>
Index: openacs-4/packages/file-storage/www/file-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-edit-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-edit-2.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-edit-2.tcl	22 Sep 2001 05:48:01 -0000	1.2
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     file_id:integer,notnull
-    name:notnull
+    title:notnull
 } -validate {
     valid_file -requires {file_id} {
 	if ![fs_file_p $file_id] {
@@ -19,11 +19,11 @@
 
 ad_require_permission $file_id write
 
-if [catch {db_exec_plsql rename "
+if [catch {db_exec_plsql rename_file "
 begin
     content_item.rename (
         item_id => :file_id,
-        name => :name
+        name => :title
     );
 end;"} errmsg] {
 
Index: openacs-4/packages/file-storage/www/file-edit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-edit-oracle.xql	16 Aug 2001 20:31:01 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-edit-oracle.xql	22 Sep 2001 05:48:14 -0000	1.2
@@ -6,7 +6,7 @@
 <fullquery name="file_info">      
       <querytext>
       
-	select content_item.get_title(:file_id) as title,name
+	select name as title
 	from   cr_items
 	where  item_id = :file_id
 
Index: openacs-4/packages/file-storage/www/file-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-edit-postgresql.xql	16 Aug 2001 20:31:14 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-edit-postgresql.xql	22 Sep 2001 05:48:26 -0000	1.2
@@ -6,7 +6,7 @@
 <fullquery name="file_info">      
       <querytext>
       
-	select content_item__get_title(:file_id) as title,name
+	select name as title
 	from   cr_items
 	where  item_id = :file_id
 
Index: openacs-4/packages/file-storage/www/file-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-edit.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-edit.tcl	22 Sep 2001 05:48:52 -0000	1.2
@@ -14,7 +14,6 @@
     }
 } -properties {
     file_id:onevalue
-    name:onevalue
     context_bar:onevalue
     title:onevalue
 }
@@ -25,8 +24,7 @@
 ad_require_permission $file_id write
 
 db_1row file_info "
-select content_item.get_title(:file_id) as title,
-       name
+select name as title
 from   cr_items
 where  item_id = :file_id"