Changeset 1887

Timestamp:

13 Jun 2007, 03:46:47 (18 years ago)

Author:

Henrik Bettermann

Message:

no_import file was very confusing

File:

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

WAeUP_SRP/trunk/Students.py

@@ -149 +149 @@
         no_import_name = "%s/import/%s_not_imported_%s.csv" % (i_home,name,current)
         #open(no_import_name,"w").write('\n'.join(no_import))
-        logger = logging.getLogger('Import.%s' % name)
+        logger = logging.getLogger('Students.loadPumeResultsFromCSV' % name)
         starttime = DateTime.now()
         logger.info('Start loading from %s.csv' % name)
@@ -161 +161 @@
         import_format = ','.join(['"%%(%s)s"' % fn for fn in csv_d.keys()])
         eduplicate = '%s,"duplicate"' % format
+        eoriginal = '%s,"original"' % format
         einvalidjamb = '%s,"invalid JambRegNo"' % format
         added = 'added ,%s' % format
@@ -200 +201 @@
                         for f,fn in csv_d.items():
                             dd[fn] = getattr(data,f)
-                        no_import.append(eduplicate % dd)
+                        no_import.append(eoriginal % dd)
                         no_import.append(eduplicate % jamb)
                     continue
@@ -528 +529 @@
                 not_imported.append( format_error % result)
                 total_not_imported += 1
-                continue                
+                continue
             if study_course.objectIds():
                 em = 'Already registered level %s for %s, but is supposed to study %s at level %s' % (old_current_level,old_study_course,new_study_course,current_level)