Changeset 12267

Timestamp:

20 Dec 2014, 15:59:04 (10 years ago)

Author:

Henrik Bettermann

Message:

Use a baseclass for document batch processors.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• documents/batching.py (modified) (4 diffs)
• utils/tests/test_batching.py (modified) (4 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/batching.py

@@ -41 +41 @@
 
 
-class PDFDocumentProcessor(BatchProcessor):
-    """A batch processor for IPDFDocument objects.
+class DocumentProcessorBase(BatchProcessor):
+    """A base for batch processors for IDocument objects.
     """
     grok.implements(IBatchProcessor)
     grok.provides(IBatchProcessor)
     grok.context(Interface)
-    util_name = 'pdfdocumentprocessor'
-    grok.name(util_name)
+    grok.baseclass()
 
-    name = _('Public PDF Document Processor')
-    iface = IPDFDocument
+    util_name = None
+    name = None
+    iface = None
 
     location_fields = ['document_id',]
-    factory_name = 'waeup.PDFDocument'
+    factory_name = None
 
     additional_fields = ['class_name']
@@ -98 +98 @@
         """Update obj to the values given in row.
         """
-        items_changed = super(PDFDocumentProcessor, self).updateEntry(
+        items_changed = super(DocumentProcessorBase, self).updateEntry(
             obj, row, site, filename)
         # Log actions...
@@ -111 +111 @@
         """
         errs, inv_errs, conv_dict = super(
-            PDFDocumentProcessor, self).checkConversion(row, mode=mode)
+            DocumentProcessorBase, self).checkConversion(row, mode=mode)
         # We need to check if the class_name corresponds with the
         # processor chosen. This is to avoid accidentally wrong imports.
@@ -121 +121 @@
         return errs, inv_errs, conv_dict
 
+class PDFDocumentProcessor(DocumentProcessorBase):
+    """A batch processor for IPDFDocument objects.
+    """
+    util_name = 'pdfdocumentprocessor'
+    grok.name(util_name)
+
+    name = _('Public PDF Document Processor')
+    iface = IPDFDocument
+
+    factory_name = 'waeup.PDFDocument'
 
 class HTMLDocumentProcessor(PDFDocumentProcessor):

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/tests/test_batching.py

@@ -188 +188 @@
             ['name', 'dinoports', 'owner', 'taxpayer'],
             mode='create', user='Bob', logger=self.logger)
-        num_succ, num_fail, finished_path, failed_path = result
+        num, num_fail, finished_path, failed_path = result
         self.resultpath = [finished_path, failed_path]
-        assert num_succ == 4
+        assert num == 4
         assert num_fail == 0
         assert finished_path.endswith('/newcomers.finished.csv')
@@ -201 +201 @@
             ['name', 'dinoports', 'owner', 'taxpayer'],
             mode='create', user='Bob', logger=self.logger)
-        num_succ, num_fail, finished_path, failed_path = result
+        num, num_fail, finished_path, failed_path = result
         self.resultpath = [finished_path, failed_path]
         assert len(self.stoneville) == 4
@@ -215 +215 @@
             ['name', 'dinoports', 'owner', 'taxpayer'],
             mode='create', user='Bob', logger=self.logger)
-        num_succ, num_fail, finished_path, failed_path = result
+        num, num_fail, finished_path, failed_path = result
         self.resultpath = [finished_path, failed_path]
         assert isinstance(self.stoneville['Barneys Home'].dinoports, int)
@@ -231 +231 @@
             ['name', 'dinoports', 'owner', 'taxpayer'],
             mode='create', user='Bob', logger=self.logger)
-        num_succ, num_fail, finished_path, failed_path = result
+        num, num_fail, finished_path, failed_path = result
         self.resultpath = [finished_path, failed_path]
         log_contents = open(self.logfile, 'rb').read()