Index: openacs-4/packages/dotlrn/www/admin/class.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/class.xql	12 Jan 2002 09:27:16 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/class.xql	6 Mar 2002 22:35:15 -0000	1.5
@@ -10,33 +10,13 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="select_current_class_instances">
+  <fullquery name="select_class_instances">
     <querytext>
       select class_instance_id
-      from dotlrn_class_instances_current
+      from dotlrn_class_instances
       where class_key = :class_key
+      and term_id = :term_id
       order by class_instance_id
     </querytext>
   </fullquery>
-
-  <fullquery name="select_current_and_future_class_instances">
-    <querytext>
-      select class_instance_id
-      from dotlrn_class_instances_not_old
-      where class_key = :class_key
-      order by class_instance_id
-    </querytext>
-  </fullquery>
-
-  <fullquery name="can_instantiate_class">
-    <querytext>
-      select count(*)
-      from dotlrn_terms
-      where dotlrn_terms.end_date > sysdate
-      and not exists (select 1
-                      from dotlrn_class_instances
-                      where dotlrn_class_instances.class_key = :class_key
-                      and dotlrn_class_instances.term_id = dotlrn_terms.term_id)
-    </querytext>
-  </fullquery>
 </queryset>