Changeset 1845 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

2 Jun 2007, 11:01:49 (17 years ago)

Author:

joachim

Message:

modifications to use QueueCatalog?

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• add_course_result.py (modified) (1 diff)
• create_level.py (modified) (5 diffs)
• getStudentReviewState.py (modified) (1 diff)
• getStudyLevelInfo.py (modified) (1 diff)
• refresh_level.py (modified) (1 diff)
• search_students.py (modified) (6 diffs)
• student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/add_course_result.py

@@ -25 +25 @@
 course_cat = context.courses_catalog
 from Products.AdvancedQuery import Eq, Between, Le,In
-aq_portal = context.portal_catalog.evalAdvancedQuery
+try:
+    aq_portal = context.portal_catalog.evalAdvancedQuery
+except:
+    aq_portal = context.portal_catalog_real.evalAdvancedQuery
 course_id = request.get('course_id')
 

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -13 +13 @@
         pass
 from Products.AdvancedQuery import Eq, Between, Le,In
-aq_portal = context.portal_catalog.evalAdvancedQuery
+try:
+    aq_portal = context.portal_catalog.evalAdvancedQuery
+except:
+    aq_portal = context.portal_catalog_real.evalAdvancedQuery
 aq_courses = context.courses_catalog.evalAdvancedQuery
 
@@ -37 +40 @@
     logger.info('%s tried to add already existing level %s' % (student.id,current_level))
     return
+logger.info('%s started to create level %s' % (student.id,current_level))
 
 ##if in_progress in ('not started','started'):
@@ -53 +57 @@
 else:
     context.invokeFactory('StudentStudyLevel',"%s" % current_level)
-    logger.info('%s started to create level %s' % (student.id,current_level))
     level = getattr(context,"%s" % current_level)
     context.portal_workflow.doActionFor(level,'open')
@@ -76 +79 @@
         c_res = aq_courses(query)
         if not c_res:
-            logger.info('%s", course %s not found in courses_catalog' % (student.id,co.CosCode))
+            #logger.info('%s", course %s not found in courses_catalog' % (student.id,co.CosCode))
             continue
         course_cat_entry = c_res[0]
@@ -86 +89 @@
                 score = int(co.Score)
             except:
-                logger.info('%s, course %s has invalid score %s"' % (student.id,
-                                                                    co.CosCode,
-                                                                    co.Score))
+                # logger.info('%s, course %s has invalid score %s"' % (student.id,
+                #                                                     co.CosCode,
+                #                                                     co.Score))
                 continue
             if int(c_res[0].passmark) <= score:

WAeUP_SRP/trunk/skins/waeup_student/getStudentReviewState.py

@@ -12 +12 @@
 return the review_state of the Student
 """
+from Products.AdvancedQuery import Eq, Between, Le,In
 try:
-    from Products.AdvancedQuery import Eq, Between, Le,In
     aq_portal = context.portal_catalog.evalAdvancedQuery
 except:
-    aq_portal = None
+    aq_portal = context.portal_catalog_real.evalAdvancedQuery
 if student_id is None:
     student_id = context.getStudentId()

WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py

@@ -26 +26 @@
         
 from Products.AdvancedQuery import Eq, Between, Le,In
-aq_portal = context.portal_catalog.evalAdvancedQuery
+try:
+    aq_portal = context.portal_catalog.evalAdvancedQuery
+except:
+    aq_portal = context.portal_catalog_real.evalAdvancedQuery
 request = context.REQUEST
 #session = request.SESSION

WAeUP_SRP/trunk/skins/waeup_student/refresh_level.py

@@ -19 +19 @@
         pass
 from Products.AdvancedQuery import Eq, Between, Le,In
-aq_portal = context.portal_catalog.evalAdvancedQuery
+try:
+    aq_portal = context.portal_catalog.evalAdvancedQuery
+except:
+    aq_portal = context.portal_catalog_real.evalAdvancedQuery
 aq_courses = context.courses_catalog.evalAdvancedQuery
 

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -31 +31 @@
 if is_anon:
     allowed = False
+from Products.AdvancedQuery import Eq, Between, Le,In
 try:
-    from Products.AdvancedQuery import Eq, Between, Le,In
-    evalAdvancedQuery = context.portal_catalog.evalAdvancedQuery
-    aq_students = context.students_catalog.evalAdvancedQuery
+    aq_portal = context.portal_catalog.evalAdvancedQuery
 except:
-    evalAdvancedQuery = None
+    aq_portal = context.portal_catalog_real.evalAdvancedQuery
+aq_students = context.students_catalog.evalAdvancedQuery
 
 def cmp_id(a,b):
@@ -81 +81 @@
         query = In('portal_type',('Faculty',)) &\
                  In('localUsersWithRoles', ("user:%s" % member,))
-        res = evalAdvancedQuery(query)
+        res = aq_portal(query)
         logger.info('ClearanceOfficer %s initiated student_search' % member)
         faculties = []
@@ -90 +90 @@
         query = In('portal_type',('Department',)) &\
                  In('localUsersWithRoles', ("user:%s" % member,))
-        res = evalAdvancedQuery(query)
+        res = aq_portal(query)
         departments = []
         if res:
@@ -107 +107 @@
         query = In('portal_type',('StudyLevel',)) &\
                  In('localUsersWithRoles', ("user:%s" % member,))
-        res = evalAdvancedQuery(query)
+        res = aq_portal(query)
         logger.info('CourseAdviser %s initiated student_search' % member)
         certificate_level = []
@@ -195 +195 @@
         query = In('portal_type',pt) & Eq('SearchableText',"%s*" % term.strip())
         logger.info('%s searches for student with name %s' % (member,term))
-        res = evalAdvancedQuery(query)
+        res = aq_portal(query)
         if res:
             for r in res:
@@ -207 +207 @@
         logger.info('"%s","start 100"' % member)
     query = Eq('review_state',state)
-    review_res = evalAdvancedQuery(query)
+    review_res = aq_portal(query)
 
     logger.info('%s searches for students in review_state %s' % (member,state))

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -12 +12 @@
 return the current student_index
 """
-from Products.AdvancedQuery import Eq, Between, Le,In
-evalAdvancedQuery = context.portal_catalog.evalAdvancedQuery
+# from Products.AdvancedQuery import Eq, Between, Le,In
+# try:
+#     aq_portal = context.portal_catalog.evalAdvancedQuery
+# except:
+#     aq_portal = context.portal_catalog_real.evalAdvancedQuery
 
 request = context.REQUEST