Changeset 3362

Timestamp:

20 Mar 2008, 16:20:15 (17 years ago)

Author:

joachim

Message:

fix for #112 okene, make create level more errortolerant

Location:

WAeUP_SRP/base

Files:

• WAeUPTables.py (modified) (1 diff)
• skins/waeup_student/create_level.py (modified) (1 diff)
• skins/waeup_student/level_delete.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPTables.py

@@ -1481 +1481 @@
     def addMultipleRecords(self, records): ###(
         """add many records"""
-        added_keys = []
+        existing_uids = []
         for data in records:
-            uid = key = "%(student_id)s|%(level_id)s|%(course_id)s" % data
+            uid = "%(student_id)s|%(level_id)s|%(course_id)s" % data
             data['%s' % self.key] = uid
-            res = self.searchResults({"%s" % self.key : uid})
+            query = Eq(self.key, uid)
+            res = self.course_results.evalAdvancedQuery(query)
             if len(res) > 0:
-                raise ValueError("More than one record with uid %s" % uid)
+                rec = res[0]
+                equal = True
+                for attr in ('student_id','level_id','course_id'):
+                    if getattr(rec,attr,'') != data[attr]:
+                        equal = False
+                        break
+                if equal:
+                    existing_uids += uid,
+                    continue
             self.catalog_object(dict2ob(data), uid=uid)
-        return uid
+        return existing_uids
     ###)
 
     def deleteResultsHere(self,level_id,student_id): ###(
-        #import pdb;pdb.set_trace()
         query = Eq('student_id',student_id) & Eq('level_id', level_id)
         course_results = self.course_results.evalAdvancedQuery(query)
+        #import pdb;pdb.set_trace()
         for result in course_results:
             self.deleteRecord(result.key)

WAeUP_SRP/base/skins/waeup_student/create_level.py

@@ -176 +176 @@
 
 if records:
-    context.course_results.addMultipleRecords(records)
+    existing_uids = context.course_results.addMultipleRecords(records)
+    if existing_uids:
+        logger.info('%s level %s %s existing keys' % (student.id,
+                                                      current_level,
+                                                     ",".join(existing_uids)))
+        
 logger.info('%s finished to create level %s' % (student.id,current_level))
 

WAeUP_SRP/base/skins/waeup_student/level_delete.py

@@ -12 +12 @@
 delete a level, fix students review if necessary
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 
 import logging
-logger = logging.getLogger('Skins.folder_delete')
+logger = logging.getLogger('Skins.level_delete')
 member_id = str(context.portal_membership.getAuthenticatedMember())
 
@@ -50 +55 @@
     for level_id in ids:
         context.course_results.deleteResultsHere(level_id,student_id)
+    logger.info("%s deleted level(s) %s of %s" % (member_id,','.join(ids),student_id))
     here.manage_delObjects(ids)
-
     message = 'portal_status_message=psm_item(s)_deleted'
 else: