Changeset 2283 for WAeUP_SRP/base

Timestamp:

27 Sep 2007, 17:08:18 (17 years ago)

Author:

joachim

Message:

fix if invalid is created

File:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -27 +27 @@
 from Globals import InitializeClass
 from OFS.SimpleItem import SimpleItem
+from zExceptions import BadRequest
 
 from Products.CMFCore.utils import getToolByName
@@ -920 +921 @@
             return '', "Faculty with ID: %s exists" % fid
         logger.info('Creating Faculty %(code)s, %(title)s' % mapping)
-        academics_folder.invokeFactory('Faculty', fid)
+        try:
+            academics_folder.invokeFactory('Faculty', fid)
+        except BadRequest,E:
+            return '', "%s" % E
         f = getattr(academics_folder,fid,None)
         f.getContent().edit(mapping=mapping)
@@ -958 +962 @@
             if d is None or d.portal_type == "Faculty":
                 logger.info('Creating Department %(code)s, %(title)s' % mapping)
-                f.invokeFactory('Department', did)
+                try:
+                    f.invokeFactory('Department', did)
+                except BadRequest,E:
+                    return '', "%s" % E
                 d = getattr(f,did)
                 d.invokeFactory('CoursesFolder','courses')
@@ -1009 +1016 @@
         if c is not None:
             return '', "Duplicate Department ID: %s" % did
-        d.invokeFactory('Course', course_id)
+        try:
+            d.invokeFactory('Course', course_id)
+        except BadRequest,E:
+            return '', "%s" % E
         self._v_course_list.append(course_id)
         c = getattr(d,course_id)
@@ -1047 +1057 @@
         if c is not None:
             return '', "Duplicate Department ID: %s" % did
-        d.invokeFactory('Certificate', certificate_id)
+        try:
+            d.invokeFactory('Certificate', certificate_id)
+        except BadRequest,E:
+            return '', "%s" % E
         self._v_certificate_list.append(certificate_id)
         c = getattr(d,certificate_id)
@@ -1375 +1388 @@
                 adapters = [MappingStorageAdapter(schema, item)]
                 logger.info('%s starts import from %s.csv' % (member,filename))
-                #import_keys = [k for k in item.keys() if not k.startswith('ignore')]
                 attrs = csv.reader(open("%s/import/%s.csv" % (i_home,filename),"rb")).next()
                 import_keys = [k for k in attrs if not k.startswith('ignore')]