Changeset 3022 for WAeUP_SRP/base

Timestamp:

14 Jan 2008, 17:58:33 (17 years ago)

Author:

joachim

Message:

new improved version of search students

File:

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

WAeUP_SRP/base/skins/waeup_student/search_students.py

@@ -41 +41 @@
 except:
     aq_portal = context.portal_catalog_real.evalAdvancedQuery
+students_catalog = context.students_catalog
 aq_students = context.students_catalog.evalAdvancedQuery
 
@@ -189 +190 @@
 review_set = []
 search_set = []
+query = None
 if len(term) > 0:
     if what == "student_id":
@@ -201 +203 @@
                              )
     elif what == "department":
-        res = context.students_catalog(department=term.strip())
+        query = Eq('department', term.strip())
         logger.info('%s searches for student in department %s' % (member,term))
-        search_set = [r.id for r in res]
+        # res = context.students_catalog(department=term.strip())
+        # logger.info('%s searches for student in department %s' % (member,term))
+        # search_set = [r.id for r in res]
     elif what == "matric_no":
-        res = context.students_catalog(matric_no=term.strip())
+        query = Eq('matric_no', term.strip())
         logger.info('%s searches for student with matric_no %s' % (member,term))
-        search_set = [r.id for r in res]
+        # res = context.students_catalog(matric_no=term.strip())
+        # logger.info('%s searches for student with matric_no %s' % (member,term))
+        # search_set = [r.id for r in res]
     elif what == "jamb_reg_no":
         st_l = "%s" % term.strip().lower()
         st_u = "%s" % term.strip().upper()
-        res = aq_students(In('jamb_reg_no',(st_l,st_u)))
+        query = In('jamb_reg_no',(st_l,st_u))
         logger.info('%s searches for student with jamb_reg_no %s' % (member,term))
-        search_set = [r.id for r in res]
+        # res = aq_students(In('jamb_reg_no',(st_l,st_u)))
+        # logger.info('%s searches for student with jamb_reg_no %s' % (member,term))
+        # search_set = [r.id for r in res]
     elif what == "name":
         if len(term) < 4:
@@ -221 +229 @@
                                                 allowed = allowed,
                                                )
-        pt = ('StudentPersonal')
-        query = In('portal_type',pt) & Eq('SearchableText',"%s*" % term.strip())
+        # pt = ('StudentPersonal')
+        # query = In('portal_type',pt) & Eq('SearchableText',"%s*" % term.strip())
+        # logger.info('%s searches for student with name %s' % (member,term))
+        # res = aq_portal(query)
+        # if res:
+        #     for r in res:
+        #         pl = r.getPath().split('/')
+        #         search_set.append(pl[pl.index('students') + 1])
+        query = Eq('name',"%s*" % term.strip())
         logger.info('%s searches for student with name %s' % (member,term))
-        res = aq_portal(query)
-        if res:
-            for r in res:
-                pl = r.getPath().split('/')
-                search_set.append(pl[pl.index('students') + 1])
+        # res = aq_students(query)
+        # if res:
+        #     for r in res:
+        #         search_set += r.id,
 
 if only_review or with_review or co_view:
@@ -234 +248 @@
     #review_res = aq_portal(query)
     #review_res = context.portal_catalog(review_state = state)
-
-    query = Eq('review_state',state)
-    review_res = aq_students(query)
+    if query is not None:
+        query = Eq('review_state',state) & query
+    else:
+        query = Eq('review_state',state)
+    #review_res = aq_students(query)
     logger.info('%s searches for students in review_state %s' % (member,state))
 
@@ -242 +258 @@
     only_review = False
     with_review = True
-    query = In('faculty',faculties) | In('department',departments)
-    res = aq_students(query)
-    search_set = [r.id for r in res]
+    if query is not None:
+        query = query & In('faculty',faculties) | In('department',departments)
+    else:
+        query = In('faculty',faculties) | In('department',departments)
+    # res = aq_students(query)
+    # search_set.extend([r.id for r in res])
 elif ca_view:
     only_review = False
@@ -250 +269 @@
     courses = [cl.split('/')[0] for cl in certificate_levels]
     levels = [cl.split('/')[1] for cl in certificate_levels]
-    query = In('course',courses) & In('level',levels)
-    res = aq_students(query)
-    search_set = [r.id for r in res]
-if review_res:
-    review_set = [r.id for r in review_res]
-
-#from Products.zdb import set_trace;set_trace()
-
-if only_review:
-    all = review_set
-elif with_review:
-    all = []
-    for i in search_set:
-        if i in review_set:
-            all.append(i)
-else:
-    all = search_set
-
-items = all[:500]
+    if query is not None:
+        query = query & In('course',courses) & In('level',levels)
+    # res = aq_students(query)
+    # search_set.extend([r.id for r in res])
+
+# if review_res:
+    # review_set = [r.id for r in review_res]
+
+# if only_review:
+    # all = review_set
+# elif with_review:
+    # all = []
+    # for i in search_set:
+    #     if i in review_set:
+    #         all.append(i)
+# else:
+    # all = search_set
+    
+# res = aq_students(query)
+# all = [r.id for r in res]
+
+# items = all[:500]
+# students = []
+# if items:
+#     for item in items:
+#         students_catalog = context.students_catalog
+#         record = students_catalog(id = item)
+#         if record:
+#             record = record[0]
+#         else:
+#             return item+' not found in students_catalog'
+#         info = {}
+#         for field in students_catalog.schema() + students_catalog.indexes():
+#             info[field] = getattr(record, field)
+#         else:
+#             students.append(info)
+#     return context.search_students_form(rendered = rend,
+#                              psm = "",
+#                              info = user_info,
+#                              students = students,
+#                              allowed = allowed,
+#                              co_view = co_view,
+#                              ca_view = ca_view
+#                              )
+student_records = aq_students(query)
 students = []
-if items:
-    for item in items:
-        stcat = context.students_catalog
-        record = stcat(id = item)
-        if record:
-            record = record[0]
-        else:
-            return item+' not found in students_catalog'
+if student_records:
+    for student_record in student_records:
         info = {}
-        for field in stcat.schema() + stcat.indexes():
-            info[field] = getattr(record, field)
+        for field in students_catalog.schema() + students_catalog.indexes():
+            info[field] = getattr(student_record, field)
         else:
             students.append(info)