Changeset 3177

Timestamp:

18 Feb 2008, 10:06:25 (17 years ago)

Author:

joachim

Message:

pending only only depends on "pending data only" some fixes for FacultyImport?

Location:

WAeUP_SRP

Files:

• base/WAeUPImport.py (modified) (3 diffs)
• base/WAeUPTool.py (modified) (3 diffs)
• uniben/profiles/default/vocabularies/import_names.xml (modified) (1 diff)

WAeUP_SRP/base/WAeUPImport.py

@@ -506 +506 @@
 class FacultyImport(WAeUPImport):###(
     name = "faculty"
-    plural_name = "%ss" % name
+    plural_name = "faculties"
     commit_after = 100
 
@@ -526 +526 @@
             f = getattr(academics_folder,fid,None)
             f.getContent().edit(mapping=mapping)
-            return fid,msg,mapping
+            break
+        return fid,msg,mapping
         ###)
 
@@ -538 +539 @@
             if f is None:
                 msg =  "Faculty with ID: %s does not exist" % fid
-                break
             f.getContent().edit(mapping=mapping)
+            break
         return fid,msg,mapping
     ###)

WAeUP_SRP/base/WAeUPTool.py

@@ -1346 +1346 @@
         students_folder = self.portal_url.getPortalObject().campus.students
         pending_only = False
-        pend_str = '_pending'
+        pend_str = '--'
         elapse = time.time()
         #
         # preparations
         #
-        if name.endswith(pend_str):
+        if filename == pend_str:
             pending_only = True
-            name = name[:-len(pend_str)]
         mode = "create"
         if edit:
@@ -1360 +1359 @@
             else:
                 mode = "edit"
-        # schema = stool._getOb(iname)
-        # if schema is None:
-        #     em = 'No such schema %s' % iname
-        #     logger.error('No such schema %s' % iname)
-        #     return em
-        # pending_schema = stool._getOb("%s_pending" % iname)
-        # if pending_schema is None:
-        #     em = 'No such schema %s_pending' % iname
-        #     logger.error('No such schema %s_pending' % iname)
-        #     return em
-        # layout = ltool._getOb(iname)
-        # if layout is None:
-        #     em = 'No such layout %s' % iname
-        #     logger.error(em)
-        #     return em
         importer_name = ''.join([part.capitalize() for part in name.split('_')])
         importer = eval("%sImport" % importer_name)(mode,self)
@@ -1570 +1554 @@
         else:
             added_pending = total_pending - pending_at_start 
-            msg += "%(pending_fn)s: added = %(added_pending)d, already in = %(already_in)s " % vars()
-        msg += ", total %(total_pending)d; " % vars()
+            msg += "%(pending_fn)s: added = %(added_pending)d, already in = %(already_in)s, " % vars()
+        msg += " total %(total_pending)d; " % vars()
         logger.info(msg)
         return msg

WAeUP_SRP/uniben/profiles/default/vocabularies/import_names.xml

@@ -11 +11 @@
  <item key="course" msgid="">Course Data</item>
  <item key="course_result" msgid="">Course Result Data</item>
- <item key="course_result_pending" msgid="">Pending Course Results only</item>
  <item key="certificate" msgid="">Certificate Data</item>
  <item key="certificate_course" msgid="">Certificate Course Data</item>
  <item key="application" msgid="">Application Data</item>
  <item key="verdict" msgid="">Verdicts</item>
- <item key="verdict_pending" msgid="">Pending Verdicts only</item>
 </object>