Index: openacs-4/packages/file-storage/tcl/file-storage-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/tcl/file-storage-procs.xql	22 May 2002 08:50:52 -0000	1.7
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.xql	22 May 2002 16:42:31 -0000	1.8
@@ -43,11 +43,11 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::get_folder_name.select_folder_name">
+    <fullquery name="fs::get_object_name.select_object_name">
         <querytext>
             select name
-            from fs_folders
-            where folder_id = :folder_id
+            from fs_objects
+            where object_id = :object_id
         </querytext>
     </fullquery>
 
@@ -69,16 +69,24 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::publish_simple_object_to_file_system.select_object_content">
+    <fullquery name="fs::publish_object_to_file_system.select_object_info">
         <querytext>
             select fs_objects.*
             from fs_objects
             where fs_objects.object_id = :object_id
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::publish_object_to_file_system.select_object_metadata">
+    <fullquery name="fs::publish_simple_object_to_file_system.select_object_info">
         <querytext>
+            select fs_objects.*
+            from fs_objects
+            where fs_objects.object_id = :object_id
+        </querytext>
+    </fullquery>
+
+    <fullquery name="fs::publish_versioned_object_to_file_system.select_object_metadata">
+        <querytext>
             select fs_objects.*,
                    cr_items.storage_type,
                    cr_items.storage_area_key,
@@ -92,15 +100,15 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::publish_object_to_file_system.select_object_content">
+    <fullquery name="fs::publish_versioned_object_to_file_system.select_object_content">
         <querytext>
             select content
             from cr_revisions
             where revision_id = $live_revision
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::publish_object_to_file_system.select_file_name">
+    <fullquery name="fs::publish_versioned_object_to_file_system.select_file_name">
         <querytext>
             select filename
             from cr_revisions