Index: openacs-4/packages/dotlrn-fs/dotlrn-fs.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/dotlrn-fs.info,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-fs/dotlrn-fs.info	19 Feb 2002 19:41:49 -0000	1.7
+++ openacs-4/packages/dotlrn-fs/dotlrn-fs.info	5 Mar 2002 07:53:23 -0000	1.8
@@ -21,7 +21,6 @@
         <files>
             <file type="package_spec" path="dotlrn-fs.info"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/dotlrn-fs-create.sql"/>
-            <file type="query_file" db_type="oracle" path="tcl/dotlrn-fs-procs-oracle.xql"/>
             <file type="tcl_procs" path="tcl/dotlrn-fs-procs.tcl"/>
             <file type="query_file" path="tcl/dotlrn-fs-procs.xql"/>
         </files>
Index: openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	21 Feb 2002 19:00:21 -0000	1.2
+++ openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	5 Mar 2002 07:51:11 -0000	1.3
@@ -3,34 +3,26 @@
 <queryset>
 <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="select_files_and_folders">
-    <querytext>
-        select cr_items.item_id as file_id,
-               cr_folders.label as name,
-               0 as file_live_rev,
-               'Folder' as type,
-               0 as ordering_key,
-               (select count(*) from cr_items i where i.parent_id = cr_items.item_id) as num
-        from cr_items,
-             cr_folders
-        where cr_items.item_id = :my_folder_id
- 	and cr_items.item_id = cr_folders.folder_id
-        and 't' = acs_permission.permission_p(cr_items.item_id, :user_id, 'read')
-        order by ordering_key, name
-    </querytext>
-</fullquery>
+    <fullquery name="select_files_and_folders">
+        <querytext>
+            select fs_folders_and_files.file_id,
+                   fs_folders_and_files.name,
+                   fs_folders_and_files.live_revision,
+                   fs_folders_and_files.type,
+                   fs_folders_and_files.content_size
+            from fs_folders_and_files
+            where fs_folders_and_files.file_id = :my_folder_id
+            and 't' = acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'read')
+            order by fs_folders_and_files.sort_key,
+                     fs_folders_and_files.name
+        </querytext>
+    </fullquery>
 
-<fullquery name="select_package_id">
-<querytext>
+    <fullquery name="select_package_id">
+        <querytext>
+            select file_storage.get_package_id(:my_folder_id)
+            from dual
+        </querytext>
+    </fullquery>
 
-select package_id 
-from (select item_id 
-      from cr_items 
-      connect by prior parent_id = item_id 
-      start with item_id = :my_folder_id) this, fs_root_folders 
-where item_id = folder_id
-
-</querytext>
-</fullquery>
-
 </queryset>