Changeset 12410

Timestamp:

7 Jan 2015, 08:49:38 (10 years ago)

Author:

Henrik Bettermann

Message:

Add exporter and batch processor for REST documents.

Fix DocumentProcessorBase?.

Location:

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

Files:

• documents/batching.py (modified) (5 diffs)
• documents/export.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

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

@@ -37 +37 @@
 from waeup.ikoba.interfaces import IIkobaUtils
 from waeup.ikoba.interfaces import MessageFactory as _
-from waeup.ikoba.documents.interfaces import IPDFDocument, IHTMLDocument
+from waeup.ikoba.documents.interfaces import (
+    IPDFDocument, IHTMLDocument, IRESTDocument)
 from waeup.ikoba.utils.batching import BatchProcessor
 
@@ -54 +55 @@
 
     location_fields = ['document_id',]
+    additional_fields = ['class_name',]
+
     factory_name = None
 
-    additional_fields = ['class_name']
-    additional_headers = ['class_name']
+    mode = None
 
-    mode = None
+    @property
+    def available_fields(self):
+        return sorted(list(set(
+                    self.additional_fields +
+                    getFields(self.iface).keys())))
 
     def parentsExist(self, row, site):
@@ -118 +124 @@
             if class_name != self.factory_name.strip('waeup.'):
                 errs.append(('class_name','wrong processor'))
-        document_id = row.get('document_id', None)
         return errs, inv_errs, conv_dict
+
 
 class PDFDocumentProcessor(DocumentProcessorBase):
@@ -132 +138 @@
     factory_name = 'waeup.PDFDocument'
 
-class HTMLDocumentProcessor(PDFDocumentProcessor):
+
+class HTMLDocumentProcessor(DocumentProcessorBase):
     """A batch processor for IHTMLDocument objects.
     """
@@ -142 +149 @@
 
     factory_name = 'waeup.HTMLDocument'
+
+
+class RESTDocumentProcessor(DocumentProcessorBase):
+    """A batch processor for IRESTDocument objects.
+    """
+    util_name = 'restdocumentprocessor'
+    grok.name(util_name)
+
+    name = _('Public REST Document Processor')
+    iface = IRESTDocument
+
+    factory_name = 'waeup.RESTDocument'

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

@@ -24 +24 @@
 from waeup.ikoba.utils.batching import ExporterBase
 from waeup.ikoba.utils.helpers import iface_names
-from waeup.ikoba.documents.interfaces import IPDFDocument, IHTMLDocument
+from waeup.ikoba.documents.interfaces import (
+    IPDFDocument, IHTMLDocument, IRESTDocument)
 
 
@@ -99 +100 @@
     class_name = 'HTMLDocument'
     title = _(u'Public HTML Documents')
+
+
+class RESTDocumentExporter(DocumentExporterBase):
+    """Exporter for documents.
+    """
+    grok.name('restdocuments')
+    iface = IRESTDocument
+    class_name = 'RESTDocument'
+    title = _(u'Public REST Documents')

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

@@ -131 +131 @@
         'pdfdocuments',
         'htmldocuments',
+        'restdocuments',
         'users',
         'products',
@@ -144 +145 @@
         'pdfdocumentprocessor',
         'htmldocumentprocessor',
+        'restdocumentprocessor',
         'userprocessor')