Changeset 6828

Timestamp:

29 Sep 2011, 06:37:15 (13 years ago)

Author:

Henrik Bettermann

Message:

Catch double headers already in import step 2. Do not show table if double headers occur.

Create warning messages in views and use flash method to render warnings.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/pages.py (modified) (5 diffs)
• utils/batching.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -540 +540 @@
         result = []
         num = 0
+        if not self.reader:
+            return
         for row in self.reader:
             if num > 4:
@@ -572 +574 @@
         return parts[1]
 
+    def getWarnings(self):
+        import sys
+        result = []
+        try:
+            headerfields = self.getPreviewHeader()
+            headerfields_clean = list(set(headerfields))
+            if len(headerfields) > len(headerfields_clean):
+                result.append(
+                    "Double headers: each column name may only appear once. ")
+        except:
+            fatal = '%s' % sys.exc_info()[1]
+            result.append(fatal)
+        if result:
+            warnings = ""
+            for line in result:
+                warnings += line + '<br />'
+            warnings += 'Replace imported file!'
+            return warnings
+        return False
+
     def update(self, mode=None, importer=None,
                back1=None, cancel=None, proceed=None):
@@ -596 +618 @@
             return
         self.fullpath = os.path.join(self.context.storage, self.filename)
-        self.reader = csv.DictReader(open(self.fullpath, 'rb'))
+        warnings = self.getWarnings()
+        if not warnings:
+            self.reader = csv.DictReader(open(self.fullpath, 'rb'))
+        else:
+            self.reader = ()
+            self.flash(warnings)
 
 class DatacenterImportStep3(WAeUPPage):
@@ -659 +686 @@
             fatal = '%s' % sys.exc_info()[1]
             result.append(fatal)
-        return result
+        if result:
+            warnings = ""
+            for line in result:
+                warnings += line + '<br />'
+            warnings += 'Edit headers or replace imported file!'
+            return warnings
+        return False
 
     @property
@@ -689 +722 @@
             self.redirect(self.url(self.context, '@@import4'))
             return
-
         self.importer = getUtility(IBatchProcessor, name=self.importername)
         self.reader = csv.DictReader(open(self.fullpath, 'rb'))
+        warnings = self.getWarnings()
+        if warnings:
+            self.flash(warnings)
 
 class DatacenterImportStep4(WAeUPPage):

main/waeup.sirp/trunk/src/waeup/sirp/utils/batching.py

@@ -92 +92 @@
                     "Need at least columns %s for import!" %
                     ', '.join(["'%s'" % x for x in req]))
-        # Check for double fields...
+        # Check for double fields. Cannot happen because this error is
+        # already catched in views
         not_ignored_fields = [x for x in headerfields
                               if not x.startswith('--')]