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.4 -r1.5
--- openacs-4/packages/file-storage/tcl/file-storage-procs.xql	4 Apr 2002 03:01:06 -0000	1.4
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.xql	26 Apr 2002 21:07:10 -0000	1.5
@@ -1,46 +1,40 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="fs_folder_p.object_type">      
-      <querytext>
+    <fullquery name="fs_folder_p.object_type">      
+        <querytext>
+            select object_type 
+            from acs_objects
+            where object_id = :folder_id
+        </querytext>
+    </fullquery>
 
-       	select object_type 
-       	from   acs_objects
-       	where  object_id = :folder_id
+    <fullquery name="fs_context_bar_list.parent_id">      
+        <querytext>
+            select parent_id
+            from cr_items
+            where item_id = :item_id
+        </querytext>
+    </fullquery>
 
-      </querytext>
-</fullquery>
+    <fullquery name="fs_maybe_create_new_mime_type.mime_type_exists">      
+        <querytext>
+            select count(*)
+            from cr_mime_types
+            where mime_type = :mime_type
+        </querytext>
+    </fullquery>
 
-<fullquery name="fs_context_bar_list.parent_id">      
-      <querytext>
+    <fullquery name="fs_maybe_create_new_mime_type.new_mime_type">      
+        <querytext>
+            insert into cr_mime_types
+            (mime_type, file_extension)
+            values
+            (:mime_type, :extension)
+        </querytext>
+    </fullquery>
 
-	select parent_id from cr_items where item_id = :item_id
-
-      </querytext>
-</fullquery>
-
-<fullquery name="fs_maybe_create_new_mime_type.mime_type_exists">      
-      <querytext>
-
-	select count(*) from cr_mime_types
-    	where  mime_type = :mime_type
-
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="fs_maybe_create_new_mime_type.new_mime_type">      
-      <querytext>
-
-	insert into cr_mime_types
-	(mime_type, file_extension)
-	values
-	(:mime_type, :extension)
-
-      </querytext>
-</fullquery>
-
-    <fullquery name="fs::get_folder.get_folder">
+    <fullquery name="fs::get_folder.select_folder">
         <querytext>
             select item_id
             from cr_items
@@ -49,17 +43,30 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::get_folder_contents_count.get_folder_contents_count">
+    <fullquery name="fs::get_folder_name.select_folder_name">
         <querytext>
-            select (select count(*)
-                    from cr_items
-                    where cr_items.parent_id = :folder_id)
-                   +
-                   (select count(*)
-                    from fs_simple_objects
-                    where fs_simple_objects.folder_id = :folder_id)
+            select name
+            from fs_folders
+            where folder_id = :folder_id
+        </querytext>
+    </fullquery>
+
+    <fullquery name="fs::folder_p.select_folder_p">
+        <querytext>
+            select count(*)
             from dual
+            where exists (select 1
+                          from fs_folders
+                          where folder_id = :object_id)
         </querytext>
     </fullquery>
 
+    <fullquery name="fs::get_folder_contents_count.select_folder_contents_count">
+        <querytext>
+            select count(*)
+            from fs_folders
+            where folder_id = :folder_id
+        </querytext>
+    </fullquery>
+
 </queryset>