Changeset 3346

Timestamp:

17 Mar 2008, 10:54:14 (17 years ago)

Author:

joachim

Message:

fix for #108 fceokene: additional commas in csv-files are ignored
getCertificatesDict now returns a dictionary of dictinaries
admitOne uses it.

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (3 diffs)
• skins/waeup_academics/getCertificatesDict.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -943 +943 @@
         da['app_mobile'] = brain.phone
 
-        da['entry_mode'] = self._v_certificates[brain.course_admitted][1]
+        da['entry_mode'] = self._v_certificates[brain.course_admitted]['study_mode']
 
         #if brain.entry_mode:
@@ -1402 +1402 @@
         if filename == pend_str:
             pending_only = True
-        # mode = "create"
-        # if edit:
-        #     if filename.endswith('_toDelete'):
-        #         mode = "delete"
-        #     else:
-        #         mode = "edit"
         importer_name = ''.join([part.capitalize() for part in name.split('_')])
         importer = eval("%sImport" % importer_name)(self)
@@ -1513 +1507 @@
             empty_value_keys = []
             for k,v in record.items():
+                if k is None:
+                    continue
                 if v:
                     if v == EMPTY:

WAeUP_SRP/base/skins/waeup_academics/getCertificatesDict.py

@@ -3 +3 @@
 """
 Return the certificates as dictionary
-
-"""
 
 try:
@@ -11 +9 @@
     def set_trace():
         pass
+"""
 
-if key is None:
-    res = context.portal_catalog.search({'meta_type': "Certificate"})
-    dict = {}
-   
-    for d in res:
-        c = d.getObject().getContent()
-        if not hasattr(c,'study_mode'):
-            continue
-        dict[d.getId] = (c.title,c.study_mode)
-    #set_trace()    
-    return dict
+res = context.portal_catalog.search({'meta_type': "Certificate"})
+dict = {}
 
-res = context.portal_catalog.search({'meta_type': "Certificate", 'id': key})
-if res:
-    return res[0].Title
-raise KeyError
+for d in res:
+    c = d.getObject().getContent()
+    if not hasattr(c,'study_mode'):
+        continue
+    #dict[d.getId] = (c.title,c.study_mode)
+    dict[d.getId] = {'title': c.title,
+                     'study_mode': c.study_mode,
+                     }
+return dict
+