Changeset 3350 for WAeUP_SRP/base

Timestamp:

18 Mar 2008, 18:24:53 (17 years ago)

Author:

joachim

Message:

some fixes
example with_timing enabled

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (4 diffs)
• skins/waeup_student/admitStudents.py (modified) (3 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -1017 +1017 @@
         application = student_object.application
         #self.portal_workflow.doActionFor(application,'open',dest_container=application)
-        self.do_timing()
+        #self.do_timing()
         da = {'Title': 'Application Data'}
         da['jamb_reg_no'] = reg_no
@@ -1060 +1060 @@
         personal = student_object.personal
         #self.portal_workflow.doActionFor(personal,'open',dest_container=personal)
-        self.do_timing()
+        #self.do_timing()
         dp = {'Title': 'Personal Data'}
         dp['sex'] = brain.sex
@@ -1088 +1088 @@
         studycourse = student_object.study_course
         #self.portal_workflow.doActionFor(studycourse,'open',dest_container=studycourse)
-        self.do_timing()
+        #self.do_timing()
         dsc = {}
         dsc['study_course'] = brain.course_admitted
@@ -1106 +1106 @@
         student_object.invokeFactory('PaymentsFolder','payments')
         payments = getattr(student_object,'payments')
-        self.do_timing()
+        #self.do_timing()
         dpay = {}
         dpay['Title'] = 'Payments'

WAeUP_SRP/base/skins/waeup_student/admitStudents.py

@@ -44 +44 @@
 admitted = 0
 cocount = 0
-old_commit_count = -1
+old_commit_count = 0
 commit_after = 40
 d = {'status': 'created'}
@@ -57 +57 @@
         logger.info("Committing %s transactions, total %s" % (commit_after,count))
         cocount += 1
-        if cocount > 2:
+        if with_timing and cocount > 2:
             break
     brain = aq_applicants(Eq('reg_no',reg_no))[0]
@@ -72 +72 @@
         if with_timing:
             data = context.waeup_tool.get_timing_data()
-            logger.info("timing %(i_time)6.2f/%(a_time)6.2f" % data['total'])
+            for k,d in data.items():
+                s = "timing line %s" % k
+                s += " %(i_time)6.2f/%(a_time)6.2f" % d
+                logger.info(s)
         admitted += 1
     else: