Index: openacs-4/packages/file-storage/www/file-move-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-move-oracle.xql	16 Aug 2001 20:32:20 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-move-oracle.xql	22 Sep 2001 05:50:04 -0000	1.2
@@ -7,7 +7,7 @@
       <querytext>
       
 	begin
-    		:1 := content_item.get_title(:file_id);
+    		:1 := file_storage.get_title(:file_id);
 	end;
 
       </querytext>
Index: openacs-4/packages/file-storage/www/file-move-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/www/file-move-postgresql.xql	16 Aug 2001 20:32:33 -0000	1.1
+++ openacs-4/packages/file-storage/www/file-move-postgresql.xql	22 Sep 2001 05:50:16 -0000	1.2
@@ -6,7 +6,7 @@
 <fullquery name="file_name">      
       <querytext>
  
-	select content_item__get_title(:file_id);
+	select file_storage__get_title(:file_id);
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/file-storage/www/version-delete-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/version-delete-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/version-delete-oracle.xql	28 Aug 2001 03:50:30 -0000	1.3
+++ openacs-4/packages/file-storage/www/version-delete-oracle.xql	22 Sep 2001 05:59:00 -0000	1.4
@@ -3,29 +3,29 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="version_delete">      
+<fullquery name="delete_version">      
       <querytext>
-      
-    	begin
-        	if :version_id = content_item.get_live_revision(:item_id) then
-            		content_revision.delete (:version_id);
-            		content_item.set_live_revision(content_item.get_latest_revision(:item_id));
-        	else
-            		content_revision.delete (:version_id);
-        	end if;
-    	end;
 
+	begin
+	   :1 := file_storage.delete_version(
+			:item_id,
+			:version_id
+			);
+	end;
+
       </querytext>
 </fullquery>
 
-<fullquery name="delete_item">      
+<fullquery name="delete_file">      
       <querytext>
-
+	
 	begin
-		content_item.delete(:item_id);
+		file_storage.delete_file(
+			:item_id
+			);
 	end;
 
       </querytext>
 </fullquery>
- 
+
 </queryset>
Index: openacs-4/packages/file-storage/www/version-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/version-delete-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/version-delete-postgresql.xql	25 Aug 2001 00:44:31 -0000	1.2
+++ openacs-4/packages/file-storage/www/version-delete-postgresql.xql	22 Sep 2001 05:59:16 -0000	1.3
@@ -3,32 +3,24 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="version_delete">      
+<fullquery name="delete_version">      
       <querytext>
-	
-	begin
 
-        	if :version_id = content_item__get_live_revision(:item_id)
-		then
-            		PERFORM content_revision__delete(:version_id);
-            		PERFORM content_item__set_live_revision(content_item__get_latest_revision(:item_id));
-        	else
-            		PERFORM content_revision__delete(:version_id);
-        	end if;
-
-		return 0;
-	end;
-
+	select file_storage__delete_version(
+			:item_id,
+			:version_id
+			);
       </querytext>
 </fullquery>
 
-<fullquery name="delete_item">      
+<fullquery name="delete_file">      
       <querytext>
 
-	select content_item__delete(:item_id);
-
+	select file_storage__delete_file(
+			:item_id
+			);
       </querytext>
 </fullquery>
- 
+
 </queryset>