Index: WAeUP_SRP/trunk/skins/waeup_default/getReviewInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/getReviewInfo.py	(revision 1869)
+++ WAeUP_SRP/trunk/skins/waeup_default/getReviewInfo.py	(revision 1870)
@@ -25,10 +25,12 @@
     d_review = ''
 if context.portal_type != "Student":
-    student_id = context.getStudentId()
-    if student_id:
-        res = context.portal_catalog(id = student_id,portal_type='Student')
-        if res:
-            s_review = res[-1].review_state
-            return "%s / %s" % (s_review,d_review)
+    s_review = context.getStudentReviewState()
+    if s_review:
+        return "%s / %s" % (s_review,d_review)
+    # student_id = context.getStudentId()
+    # if student_id:
+    #     res = context.portal_catalog(id = student_id,portal_type='Student')
+    #     if res:
+    #         return "%s / %s" % (s_review,d_review)
 return "%s" % (d_review)
 
Index: WAeUP_SRP/trunk/skins/waeup_student/getStudentReviewState.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/getStudentReviewState.py	(revision 1869)
+++ WAeUP_SRP/trunk/skins/waeup_student/getStudentReviewState.py	(revision 1870)
@@ -12,13 +12,19 @@
 return the review_state of the Student
 """
-from Products.AdvancedQuery import Eq, Between, Le,In
 try:
-    aq_portal = context.portal_catalog.evalAdvancedQuery
+    from Products.zdb import set_trace
 except:
-    aq_portal = context.portal_catalog_real.evalAdvancedQuery
+    def set_trace():
+        pass
+# from Products.AdvancedQuery import Eq, Between, Le,In
+# try:
+#     aq_portal = context.portal_catalog.evalAdvancedQuery
+# except:
+#     aq_portal = context.portal_catalog_real.evalAdvancedQuery
 if student_id is None:
     student_id = context.getStudentId()
-query = Eq('id',student_id)
-res = aq_portal(query)
+#query = Eq('id',student_id)
+#res = aq_portal(query)
+res = context.students_catalog(id = student_id)
 if not res:
     return None
