Index: WAeUP_SRP/base/skins/waeup_academics/getCertificatesDict.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getCertificatesDict.py	(revision 3339)
+++ WAeUP_SRP/base/skins/waeup_academics/getCertificatesDict.py	(revision 3339)
@@ -0,0 +1,29 @@
+##parameters=key=None
+# $Id: getCertificatesVoc.py 3254 2008-02-28 13:06:20Z joachim $
+"""
+Return the certificates as dictionary
+
+"""
+
+try:
+    from Products.zdb import set_trace
+except:
+    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", 'id': key})
+if res:
+    return res[0].Title
+raise KeyError
Index: WAeUP_SRP/base/skins/waeup_academics/getCertificatesList.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getCertificatesList.py	(revision 3337)
+++ 	(revision )
@@ -1,28 +1,0 @@
-##parameters=key=None
-# $Id: getCertificatesVoc.py 3254 2008-02-28 13:06:20Z joachim $
-"""
-Return the certificates as list
-
-"""
-
-try:
-    from Products.zdb import set_trace
-except:
-    def set_trace():
-        pass
-
-if key is None:
-    res = context.portal_catalog.search({'meta_type': "Certificate"})
-    l = []
-    #set_trace()
-    for d in res:
-        c = d.getObject().getContent()
-        if not hasattr(c,'study_mode'):
-            continue
-        l.append((d.getId,c.title,c.study_mode))
-    return l
-
-res = context.portal_catalog.search({'meta_type': "Certificate", 'id': key})
-if res:
-    return res[0].Title
-raise KeyError
Index: WAeUP_SRP/base/skins/waeup_academics/getCertificatesVoc.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getCertificatesVoc.py	(revision 3337)
+++ WAeUP_SRP/base/skins/waeup_academics/getCertificatesVoc.py	(revision 3339)
@@ -1,3 +1,3 @@
-##parameters=key=None 
+##parameters=key=None
 # $Id$
 """
@@ -6,8 +6,8 @@
 """
 if key is None:
-    res = context.portal_catalog.search({'meta_type': "Certificate"})    
+    res = context.portal_catalog.search({'meta_type': "Certificate"})
     return [(d.getId,d.Title,) for d in res]
 res = context.portal_catalog.search({'meta_type': "Certificate", 'id': key})
 if res:
-    return [-1].Title
+    return res[0].Title
 raise KeyError
Index: WAeUP_SRP/base/skins/waeup_academics/getDepartmentsVoc.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getDepartmentsVoc.py	(revision 3337)
+++ WAeUP_SRP/base/skins/waeup_academics/getDepartmentsVoc.py	(revision 3339)
@@ -6,9 +6,9 @@
 """
 if key is None:
-    res = context.portal_catalog.search({'meta_type': "Department"})    
+    res = context.portal_catalog.search({'meta_type': "Department"})
     return [(d.getId(),d.Title,) for d in res]
 res = context.portal_catalog.search({'meta_type': "Department", 'id': key})
 if res:
-    return res[-1].Title
+    return res[0].Title
 
 raise KeyError
Index: WAeUP_SRP/base/skins/waeup_academics/getFacultiesVoc.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getFacultiesVoc.py	(revision 3337)
+++ WAeUP_SRP/base/skins/waeup_academics/getFacultiesVoc.py	(revision 3339)
@@ -1,3 +1,3 @@
-##parameters=key=None 
+##parameters=key=None
 # $Id$
 """
@@ -6,8 +6,8 @@
 """
 if key is None:
-    res = context.portal_catalog.search({'meta_type': "Faculty"})    
+    res = context.portal_catalog.search({'meta_type': "Faculty"})
     return [(d.getId,d.Title,) for d in res]
 res = context.portal_catalog.search({'meta_type': "Faculty", 'id': key})
 if res:
-    return [-1].Title
+    return res[0].Title
 raise KeyError
