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.11.10.1 -r1.11.10.2
--- openacs-4/packages/dotlrn/www/admin/class.xql	29 Oct 2004 02:50:47 -0000	1.11.10.1
+++ openacs-4/packages/dotlrn/www/admin/class.xql	22 Nov 2004 22:43:44 -0000	1.11.10.2
@@ -12,6 +12,33 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="select_all_classes_instances">
+        <querytext>
+            select dotlrn_class_instances_full.*,
+                   (select count(*)
+                    from dotlrn_member_rels_approved
+                    where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members
+            from dotlrn_class_instances_full
+            where 1=1
+            $keyword_clause
+	    [template::list::page_where_clause -and -name "class_instances" -key "dotlrn_class_instances_full.class_instance_id"]
+	    [template::list::orderby_clause -orderby -name "class_instances"]
+       </querytext>
+    </fullquery>
+
+    <fullquery name="select_all_classes_instances_paginator">
+        <querytext>
+            select dotlrn_class_instances_full.*,
+                   (select count(*)
+                    from dotlrn_member_rels_approved
+                    where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members
+            from dotlrn_class_instances_full
+            where 1=1
+            $keyword_clause
+            [template::list::orderby_clause -orderby -name "class_instances"]
+        </querytext>
+    </fullquery>
+
     <fullquery name="select_all_class_instances">
         <querytext>
             select dotlrn_class_instances_full.*,
@@ -20,6 +47,7 @@
                     where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.class_key = :class_key 
+            $keyword_clause
 	    [template::list::page_where_clause -and -name "class_instances" -key "dotlrn_class_instances_full.class_instance_id"]
 	    [template::list::orderby_clause -orderby -name "class_instances"]
        </querytext>
@@ -33,6 +61,7 @@
                     where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.class_key = :class_key
+            $keyword_clause
             [template::list::orderby_clause -orderby -name "class_instances"]
         </querytext>
     </fullquery>
@@ -45,6 +74,7 @@
                     where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.class_key = :class_key
+            $keyword_clause
             and dotlrn_class_instances_full.term_id = :term_id
 	    [template::list::page_where_clause -and -name "class_instances" -key "dotlrn_class_instances_full.class_instance_id"]
 	    [template::list::orderby_clause -orderby -name "class_instances"]
@@ -59,9 +89,16 @@
                     where dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id) as n_members
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.class_key = :class_key
+            $keyword_clause
             and dotlrn_class_instances_full.term_id = :term_id
             [template::list::orderby_clause -orderby -name "class_instances"]
         </querytext>
     </fullquery>
 
+    <partialquery name="class_instances_keyword">
+      <querytext>
+	and dotlrn_class_instances_full.pretty_name like '%'||:keyword||'%'
+      </querytext>
+    </partialquery>
+
 </queryset>