Index: openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.xql,v
diff -u -N -r1.1.1.1 -r1.1.1.1.4.1
--- openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.xql	17 Feb 2003 20:56:16 -0000	1.1.1.1
+++ openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.xql	2 Jun 2004 08:48:57 -0000	1.1.1.1.4.1
@@ -35,12 +35,12 @@
    <querytext>
       
      select f.name, folder.label as folder_name,
-       u.first_names || ' ' || u.last_name as student_name
-     from cr_items f, cr_folders folder, cc_users u, acs_objects o
+       p.first_names || ' ' || p.last_name as student_name
+     from cr_items f, cr_folders folder, persons p, acs_objects o
      where f.item_id = :file_id
        and o.object_id = :file_id
        and folder.folder_id = :folder_id
-       and u.user_id = o.creation_user
+       and p.person_id = o.creation_user
 
    </querytext>
 </fullquery>
@@ -50,11 +50,11 @@
    <querytext>
       
      select f.name, folder.label as folder_name,
-       u.first_names || ' ' || u.last_name as admin_name
-     from cr_items f, cr_folders folder, cc_users u
+       p.first_names || ' ' || p.last_name as admin_name
+     from cr_items f, cr_folders folder, persons p
      where item_id = :homework_file_id
        and folder.folder_id = :folder_id
-       and u.user_id = :user_id
+       and p.person_id = :user_id
 
    </querytext>
 </fullquery>
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.2.2.1 -r1.2.2.2
--- openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql	3 Apr 2004 00:22:06 -0000	1.2.2.1
+++ openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql	2 Jun 2004 08:48:57 -0000	1.2.2.2
@@ -15,16 +15,16 @@
               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, cc_users 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 p.person_id(+) = o.creation_user
               and f.folder_id(+) = fs_tree.item_id
               $qualify_by_owner
               and r.item_id(+) = fs_tree.item_id