Index: openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql	12 Jul 2004 14:49:57 -0000	1.5
+++ openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql	13 Jan 2005 13:57:29 -0000	1.6
@@ -3,6 +3,12 @@
 <queryset>
 <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
+    <fullquery name="select_default_min_level">
+        <querytext>
+            select 2 as min_level from dual
+	</querytext>
+    </fullquery>
+
     <fullquery name="select_folder_contents">
         <querytext>
             select
@@ -12,30 +18,29 @@
               fs_tree.content_type,
               r.content_length, r.title,
               fs_tree.parent_id as folder_id,
-              content_item.get_path(o.object_id) as item_path,
               lpad(' ',(the_level - 1), ' ') as spaces,
               rels.related_object_id as homework_file_id,
-              c.first_names || ' ' || c.last_name as file_owner_name,
+              p.first_names || ' ' || p.last_name as file_owner_name,
               o.creation_user
-            from cr_item_rels rels, acs_objects o, cr_revisions r, cr_folders f, acs_users_all c,
+            from cr_item_rels rels, acs_objects o, cr_revisions r, cr_folders f, persons p,
               (select cr_items.*, level as the_level
                from cr_items
                where level >= :min_level and level <= :max_level
                start with item_id in ([join $list_of_folder_ids ", "])
                connect by parent_id = prior item_id) fs_tree
             where o.object_id = fs_tree.item_id
-             and c.user_id(+) = o.creation_user
               and f.folder_id(+) = fs_tree.item_id
-              $qualify_by_owner
+              and p.person_id(+) = o.creation_user
+	      and r.revision_id(+) = fs_tree.live_revision 
               and r.item_id(+) = fs_tree.item_id
-	      and r.item_id(+) = fs_tree.live_revision 
               and rels.item_id(+) = o.object_id
               and rels.relation_tag(+) = 'homework_correction'
               and not exists (select 1
                               from cr_item_rels
                               where related_object_id = o.object_id
                                 and relation_tag = 'homework_correction')
-            order by item_path
+              $qualify_by_owner
+            order by content_item.get_path(fs_tree.item_id)
         </querytext>
     </fullquery>