Changeset 1900

Timestamp:

15 Jun 2007, 07:51:48 (18 years ago)

Author:

Henrik Bettermann

Message:

getSessionResults: avoid memory overflow
WAeUPTool: make addStudent work

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (3 diffs)
• skins/waeup_student/getSessionResults.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -1 @@
-#-*- mode: python; mode: fold -*-
+3#-*- mode: python; mode: fold -*-
 # (C) Copyright 2005 The WAeUP group  <http://www.waeup.org>
 # Author: Joachim Schmitz (js@aixtraware.de)
@@ -261 +261 @@
         students_folder.invokeFactory('Student', sid)
         student_obj = getattr(students_folder,sid)
-        password = self.generatePassword()
-        self.makeStudentMember(sid,password)
         f2t = self.student_field2types
         #from pdb import set_trace; set_trace()
@@ -269 +267 @@
         if dict.get('sex'):
             d['jamb_sex']  = 'F'
+            
         entry_session = dict.get('entry_session')
-        wfaction = 'return'
-        wft = 'wf_transition_returning'
-        if entry_session == self.getSessionId():
+        if entry_session == self.getSessionId()[-2:]:
             wfaction = 'admit'
             wft = 'wf_transition_admitted'
+            password = None
+        else:    
+            wfaction = 'return'
+            wft = 'wf_transition_returning'
+            password = self.generatePassword()
+            self.makeStudentMember(sid,password)            
+            
         for pt in f2t.keys():
             student_obj.invokeFactory(pt,f2t[pt]['id'])

WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py

@@ -53 +53 @@
 #    return None
 
-res = results(matric_no = matric_no)
-results = res
+if matric_no:
+    res = results(matric_no = matric_no)
+    results = res
+else: 
+    results = []