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.10.2.3 -r1.10.2.4
--- openacs-4/packages/file-storage/tcl/file-storage-procs.xql	7 Mar 2003 00:11:52 -0000	1.10.2.3
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.xql	20 Mar 2003 22:13:59 -0000	1.10.2.4
@@ -57,21 +57,15 @@
     <fullquery name="fs::get_folder_objects.select_folder_contents">
         <querytext>
 
-           select *
-           from (select cr_items.item_id as object_id,
-                   cr_items.name
-                 from cr_items
-                 where cr_items.parent_id = :folder_id
-                 union all
-                 select fs_simple_objects.object_id,
-                   fs_simple_objects.name
-                 from fs_simple_objects
-                 where fs_simple_objects.folder_id = :folder_id) contents
-           where exists (select 1
-                         from acs_object_party_privilege_map m
-                         where m.object_id = contents.object_id
-                           and m.party_id = :user_id
-                           and m.privilege = 'read')
+           select cr_items.item_id as object_id,
+             cr_items.name
+           from cr_items
+           where cr_items.parent_id = :folder_id
+            and exists (select 1
+                        from acs_object_party_privilege_map m
+                        where m.object_id = cr_items.item_id
+                          and m.party_id = :user_id
+                          and m.privilege = 'read')
 
         </querytext>
     </fullquery>
@@ -92,11 +86,11 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::publish_simple_object_to_file_system.select_object_info">
+    <fullquery name="fs::publish_url_to_file_system.select_object_metadata">
         <querytext>
-            select fs_objects.*
-            from fs_objects
-            where fs_objects.object_id = :object_id
+            select fs_urls_full.*
+            from fs_urls_full
+            where fs_urls_full.object_id = :object_id
         </querytext>
     </fullquery>