Index: openacs-4/packages/dotlrn/www/admin/term.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.xql,v
diff -u -r1.7.10.1 -r1.7.10.2
--- openacs-4/packages/dotlrn/www/admin/term.xql	30 Sep 2004 17:14:09 -0000	1.7.10.1
+++ openacs-4/packages/dotlrn/www/admin/term.xql	22 Nov 2004 22:23:08 -0000	1.7.10.2
@@ -20,7 +20,8 @@
                     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 dotlrn_class_instances_full.term_id = :term_id
+	    $keyword_clause
+            and dotlrn_class_instances_full.term_id = :term_id
 	    [template::list::page_where_clause -and -name "classes" -key "dotlrn_class_instances_full.class_instance_id"]
 	    [template::list::orderby_clause -orderby -name "classes"]
         </querytext>
@@ -33,7 +34,8 @@
                     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 dotlrn_class_instances_full.term_id = :term_id
+	    $keyword_clause
+            and dotlrn_class_instances_full.term_id = :term_id
             [template::list::orderby_clause -orderby -name "classes"]
         </querytext>
     </fullquery>
@@ -45,7 +47,8 @@
                     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 dotlrn_class_instances_full.term_id = :term_id
+	    $keyword_clause
+            and dotlrn_class_instances_full.term_id = :term_id
             and dotlrn_class_instances_full.department_key = :department_key
 	    [template::list::page_where_clause -and -name "classes" -key "dotlrn_class_instances_full.class_instance_id"]
 	    [template::list::orderby_clause -orderby -name "classes"]
@@ -59,7 +62,8 @@
                     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 dotlrn_class_instances_full.term_id = :term_id
+	    $keyword_clause
+            and dotlrn_class_instances_full.term_id = :term_id
             and dotlrn_class_instances_full.department_key = :department_key
             [template::list::orderby_clause -orderby -name "classes"]
         </querytext>
@@ -72,7 +76,7 @@
                     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 "classes" -key "dotlrn_class_instances_full.class_instance_id"]
 	    [template::list::orderby_clause -orderby -name "classes"]
         </querytext>
@@ -85,6 +89,7 @@
                     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
+       	    $keyword_clause
             [template::list::orderby_clause -orderby -name "classes"]
         </querytext>
     </fullquery>
@@ -96,7 +101,8 @@
                     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 dotlrn_class_instances_full.department_key = :department_key
+	    $keyword_clause
+            and dotlrn_class_instances_full.department_key = :department_key
 	    [template::list::page_where_clause -and -name "classes" -key "dotlrn_class_instances_full.class_instance_id"]
 	    [template::list::orderby_clause -orderby -name "classes"]
         </querytext>
@@ -109,9 +115,21 @@
                     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 dotlrn_class_instances_full.department_key = :department_key
+	    $keyword_clause
+            and dotlrn_class_instances_full.department_key = :department_key
             [template::list::orderby_clause -orderby -name "classes"]
         </querytext>
     </fullquery>
 
+    <partialquery name="select_all_instances_keyword">
+      <querytext>
+	  where lower(dotlrn_class_instances_full.pretty_name) like '%'||lower(:keyword)||'%'
+      </querytext>
+    </partialquery>
+
+    <partialquery name="select_all_instances_without_keyword">
+      <querytext>
+	  where 1 = 1
+      </querytext>
+    </partialquery>
 </queryset>