Changeset 2004

Timestamp:

10 Jul 2007, 04:50:22 (17 years ago)

Author:

Henrik Bettermann

Message:

logging improved

File:

• WAeUP_SRP/trunk/skins/waeup_utilities/ti_306_resolve.py (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_utilities/ti_306_resolve.py

@@ -39 +39 @@
 
 total = len(pins)
+logger.info('started, %d PINs found' % total)
 
 for brain in pins:
@@ -49 +50 @@
         sbrain = sbrains[0]
     else:
-        logger.info('%s, %s' % (brain.student,brain.pin))
+        logger.info('%s %s' % (brain.pin,brain.student))
         continue
     try:
@@ -56 +57 @@
         logger.info('%s, application does not exist' % (brain.student))
         continue
-    application.getContent().edit(mapping={'app_ac_pin ': brain.pin})
-    logger.info('%s, %s replaced' % (brain.student,brain.pin))
+    prefix,batch_no,number = brain.pin[:3],brain.pin[3:-10],brain.pin[-10:]
+    app_doc = application.getContent()
+    if app_doc.app_ac_pin.startswith('APP'):
+        logger.info('%s, %s, %s already shows correct PIN %s (reason: check_admission failed the first time)' % (count, brain.student,sbrain.id,app_doc.app_ac_pin))
+        continue
+    app_doc.edit(mapping={'app_ac_pin' : '%s-%s-%s' % (prefix,batch_no,number)})
+    logger.info('%s, %s, %s, %s-%s-%s replaced' % (count, brain.student,sbrain.id,prefix,batch_no,number))
     count += 1
     if count and not count % commit_after:
         context.waeup_tool.doCommit()
         logger.info("committed %d transactions" % commit_after)
-        return
 logger.info('finished for %d of %d' % (count,total))
 return