Changeset 1034 for WAeUP_SRP/trunk

Timestamp:

12 Dec 2006, 12:33:53 (18 years ago)

Author:

joachim

Message:

fixed some bugs

File:

• WAeUP_SRP/trunk/skins/waeup_student/search_students.py (modified) (7 diffs)

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -57 +57 @@
         'search_string': ''
         }
-#from Products.zdb import set_trace
-#set_trace()
 rend,psm,ds = lt.renderLayout(layout_id= 'student_search',
                       schema_id= 'student_search',
@@ -75 +73 @@
                              allowed = True,
                              )
-#set_trace()
 what = ds.get('search_mode')
 state = ds.get('review_state')
@@ -103 +100 @@
 review_res = None
 query = None
+review_set = []
 if len(term) > 0:
     if what == "student_id":
@@ -113 +111 @@
                              allowed = True,
                              )
+    elif what == "department":
+        res = context.students_catalog(department=term.strip())
+        search_set = [r.id for r in res]
     elif what in st_queries:
         if what == "jamb_reg_no":
@@ -128 +129 @@
         query = In('portal_type',pt) & Eq('SearchableText',"%s*" % term.strip())
         res = evalAdvancedQuery(query)
-        if with_review:
-            query_step += 10
-            review_res = evalAdvancedQuery(In('portal_type',student_objects) & Eq('review_state',state))
         search_set = []
         if res:
@@ -136 +134 @@
                 pl = r.getPath().split('/')
                 search_set.append(pl[pl.index('students') + 1])
-        review_set = []
-        if review_res:
-            for r in review_res:
-                pl = r.getPath().split('/')
-                review_set.append(pl[pl.index('students') + 1])
-    elif what == "department":
-        res = context.students_catalog(department=term.strip())
-        search_set = [r.id for r in res]
+if with_review:
+    query_step += 10
+    review_res = evalAdvancedQuery(In('portal_type',student_objects) & Eq('review_state',state))
+review_set = []
+if review_res:
+    for r in review_res:
+        pl = r.getPath().split('/')
+        review_set.append(pl[pl.index('students') + 1])
 all = []
 if only_review:
@@ -153 +151 @@
 else:
     all = search_set
-for a in all[:1000]:
+for a in all[:500]:
     if a in items:
         continue