Changeset 9836 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

7 Jan 2013, 08:01:24 (12 years ago)

Author:

Henrik Bettermann

Message:

Rename jobconfig to exportconfig.

Improve logging of exporting, downloading and discarding exports.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/pages.py (modified) (2 diffs)
• browser/templates/datacenterexportpage.pt (modified) (1 diff)
• browser/tests/test_browser.py (modified) (3 diffs)
• students/browser.py (modified) (3 diffs)
• students/browser_templates/exportconfig.pt (moved) (moved from main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/exportjobsjobconfig.pt)
• students/tests/test_browser.py (modified) (1 diff)

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

@@ -1556 +1556 @@
             job_id = self.context.start_export_job(
                 exporter, self.request.principal.id)
+            ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
+            self.context.logger.info(
+                '%s - exported: %s, job_id=%s' % (ob_class, exporter, job_id))
         if DISCARD and job_id:
             entry = self.context.entry_from_job_id(job_id)
             self.context.delete_export_entry(entry)
+            ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
+            self.context.logger.info(
+                '%s - discarded: job_id=%s' % (ob_class, job_id))
             self.flash(_('Discarded export') + ' %s' % job_id)
         self.entries = doll_up(self, user=None)
@@ -1591 +1597 @@
         #    self.context.entry_from_job_id(job_id))
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-        self.context.logger.info('%s - exported: %s' % (ob_class, filename))
+        self.context.logger.info(
+            '%s - downloaded: %s, job_id=%s' % (ob_class, filename, job_id))
         return result
 

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterexportpage.pt

@@ -34 +34 @@
 <p i18n:translate="">
   Student data exports have to be further configured. You can create CSV files
-  on the corresponding <a href="jobconfig">configuration page</a>.
+  on the corresponding <a href="@@exportconfig">configuration page</a>.
 </p>
 

main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py

@@ -224 +224 @@
             self.app['datacenter'].storage, 'logs', 'datacenter.log')
         logcontent = open(logfile).read()
+        self.assertTrue('zope.mgr - browser.pages.ExportCSVPage - exported: '
+                        'faculties, job_id=' in logcontent)
         self.assertTrue('zope.mgr - browser.pages.ExportCSVView - '
-                        'exported: WAeUP.Kofa_faculties.csv' in logcontent)
+                        'downloaded: WAeUP.Kofa_faculties.csv, job_id=' in logcontent)
         return
 
@@ -308 +310 @@
             'current_session\r\n')
         self.cleanup_run_job() 
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'datacenter.log')
+        logcontent = open(logfile).read()
+        self.assertTrue(
+            'zope.mgr - students.browser.DatacenterExportJobContainerJobConfig '
+            '- exported: students (None, None, None, None), job_id='
+            in logcontent)
+        self.assertTrue(
+            'zope.mgr - browser.pages.ExportCSVView '
+            '- downloaded: WAeUP.Kofa_students.csv, job_id=' in logcontent)
         return
 
@@ -317 +329 @@
         self.browser.getControl("Discard").click()
         self.assertTrue('Discarded export' in self.browser.contents)
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'datacenter.log')
+        logcontent = open(logfile).read()
+        self.assertTrue(
+            'zope.mgr - browser.pages.ExportCSVPage - discarded: job_id='
+            in logcontent)
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -2666 +2666 @@
     def update(self, CREATE=None, DISCARD=None, job_id=None):
         if CREATE:
-            self.redirect(self.url('jobconfig'))
+            self.redirect(self.url('@@exportconfig'))
             return
         if DISCARD and job_id:
             entry = self.context.entry_from_job_id(job_id)
             self.context.delete_export_entry(entry)
+            ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
+            self.context.logger.info(
+                '%s - discarded: job_id=%s' % (ob_class, job_id))
             self.flash(_('Discarded export') + ' %s' % job_id)
         self.entries = doll_up(self, user=self.request.principal.id)
@@ -2681 +2684 @@
     """
     grok.baseclass()
-    grok.name('jobconfig')
+    grok.name('exportconfig')
     grok.require('waeup.showStudents')
-    grok.template('exportjobsjobconfig')
+    grok.template('exportconfig')
     label = _('Configure student data export')
     pnav = 1
@@ -2735 +2738 @@
         if mode == 'all':
             mode = None
-        self.context.start_export_job(exporter, self.request.principal.id,
+        job_id = self.context.start_export_job(exporter,
+                                      self.request.principal.id,
                                       current_session=session,
                                       current_level=level,
                                       current_mode=mode,
                                       depcode=self.depcode)
+        ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
+        self.context.logger.info(
+            '%s - exported: %s (%s, %s, %s, %s), job_id=%s'
+            % (ob_class, exporter, session, level, mode, self.depcode, job_id))
         self.flash(_('Export started for students with') +
                    ' current_session=%s, current_level=%s, study_mode=%s' % (

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -2775 +2775 @@
         logcontent = open(logfile).read()
         self.assertTrue(
-            'INFO - zope.mgr - students.browser.ExportJobContainerDownload - '
-            'exported: WAeUP.Kofa_students.csv'
+            'zope.mgr - students.browser.DepartmentExportJobContainerJobConfig '
+            '- exported: students (2004, 100, ug_ft, dep1), job_id='
             )
+        self.assertTrue(
+            'zope.mgr - students.browser.ExportJobContainerDownload '
+            '- downloaded: WAeUP.Kofa_students.csv, job_id='
+            )
+        self.assertTrue(
+            'zope.mgr - students.browser.ExportJobContainerOverview '
+            '- discarded: job_id='
+            )