Changeset 1005 for WAeUP_SRP/trunk

Timestamp:

7 Dec 2006, 09:29:29 (18 years ago)

Author:

joachim

Message:

pume import check for duplicate on import

File:

• WAeUP_SRP/trunk/Students.py (modified) (4 diffs)

WAeUP_SRP/trunk/Students.py

@@ -269 +269 @@
         update = name.endswith('update')
         no_import = []
-        s = ','.join(['"(%s)"' % fn for fn in csv_fields])
+        s = ','.join(['"%s"' % fn for fn in csv_fields])
         no_import.append('%s' % s)
-        open("%s/import/%s_not_imported.csv" % (i_home,name),"w").write(
-                    '\n'.join(no_import))
+        current = DateTime.DateTime().strftime("%d-%m-%y_%H_%M_%S")
+        no_import_name = "%s/import/%s_not_imported_%s.csv" % (i_home,name,current)
+        open(no_import_name,"w").write('\n'.join(no_import))
         no_import = []
         logger = logging.getLogger('%s_import' % name)
@@ -285 +286 @@
         format = ','.join(['"%%(%s)s"' % fn for fn in csv_fields])
         eduplicate = '"dupplicate",%s' % format
+        added = 'added ,%s' % format
         for jamb in result:
             dict = {}
@@ -293 +295 @@
             if len(res) > 0:
                 if update:
-                    pume.modifyRecord(**dict)
+                    try:
+                        pume.modifyRecord(**dict)
+                    except ValueError:
+                        logger.info(eduplicate % jamb)
+                        continue
+                    except KeyError:
+                        pume.addRecord(**dict)
+                        logger.info(added % jamb)
+                        continue
                 else:
                     data = res[0]
@@ -316 +326 @@
         logger.info('End loading from %s.csv' % name)
         if len(no_import) > 1:
-            open("%s/import/%s_not_imported.csv" % (i_home,name),"w+").write(
-            '\n'.join(no_import))
+            open(no_import_name,"w+").write('\n'.join(no_import))
         return self.REQUEST.RESPONSE.redirect("%s" % self.REQUEST.get('URL1'))
     ###)