Changeset 2495

Timestamp:

1 Nov 2007, 07:11:20 (17 years ago)

Author:

Henrik Bettermann

Message:

fix for #313 and #386

File:

• WAeUP_SRP/base/WAeUPTool.py (modified) (4 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -1407 +1407 @@
         students_folder = self.portal_url.getPortalObject().campus.students
         start = True
-        tr_count = 1
+        tr_count = 0
         total_imported = 0
         total_not_imported = 0
@@ -1477 +1477 @@
             ds = DataStructure(data=item,datamodel=dm)
             error_string = ""
+            total += 1
             for k in import_keys:
                 if not validators[k](ds,mode=mode):
@@ -1497 +1498 @@
                 em = format % item
                 imported.append(em)
-                logger.info("%(total_imported)d of %(total)d %(em)s" % vars())
                 tr_count += 1
                 total_imported += 1
-            total += 1
+                logger.info("%(total_imported)d of %(total)d %(em)s" % vars())
+            
             if total and not total % 100:
                 transaction.commit()
@@ -1521 +1522 @@
             open("%s/import/%s_not_imported%s.csv" % (i_home,filename,current),"a").write(
                                                 '\n'.join(not_imported))
-        em = "Imported: %d, not imported: %d of total %d" % (total_imported,total_not_imported,total)
+        em = " Finished: %d imported, %d not imported (of total %d)" % (total_imported,total_not_imported,total)
+        logger.info(em)
         return em
     ###)