From 2e363d78406aa998c6047be4d2cca376e0b79fad Mon Sep 17 00:00:00 2001
From: Ciro Silvano <silvano@syslab.com>
Date: Fri, 26 Sep 2025 18:18:03 +0200
Subject: [PATCH 1/5] chronicon-export: migrated code from recensio.policy

Migrated code to send XML export over SFTP

Refs. https://github.com/syslabcom/scrum/issues/3960
---
 setup.py                                      |   3 +-
 src/recensio/plone/browser/configure.zcml     |   6 +
 src/recensio/plone/browser/export.py          | 189 ++++++++
 .../templates/export_container_contextless.pt |  13 +
 src/recensio/plone/configure.zcml             |   5 +
 src/recensio/plone/export.py                  | 412 ++++++++++++++++++
 src/recensio/plone/interfaces.py              |  15 +
 7 files changed, 642 insertions(+), 1 deletion(-)
 create mode 100644 src/recensio/plone/browser/export.py
 create mode 100644 src/recensio/plone/browser/templates/export_container_contextless.pt
 create mode 100644 src/recensio/plone/export.py

diff --git a/setup.py b/setup.py
index 84851687..87847d5e 100644
--- a/setup.py
+++ b/setup.py
@@ -53,10 +53,11 @@
         "plone.app.discussion",
         "collective.vdexvocabulary",
         "collective.z3cform.datagridfield",
+        "paramiko-ng", 
         "pypdf",
         "reportlab",
         "xlrd",
-        "z3c.jbot",
+        "z3c.jbot"
     ],
     extras_require={
         "test": [
diff --git a/src/recensio/plone/browser/configure.zcml b/src/recensio/plone/browser/configure.zcml
index 7c84c2bd..2a547207 100644
--- a/src/recensio/plone/browser/configure.zcml
+++ b/src/recensio/plone/browser/configure.zcml
@@ -93,6 +93,12 @@
       layer="recensio.plone.interfaces.IRecensioPloneLayer"
       />
 
+  <browser:page
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      name="chronicon-export"
+      class=".export.ChroniconExport"
+      permission="cmf.ManagePortal" />
+
   <!-- Listing views -->
 
   <configure package="eea.facetednavigation.browser">
diff --git a/src/recensio/plone/browser/export.py b/src/recensio/plone/browser/export.py
new file mode 100644
index 00000000..491a7b60
--- /dev/null
+++ b/src/recensio/plone/browser/export.py
@@ -0,0 +1,189 @@
+from datetime import date
+from paramiko import SFTPClient
+from paramiko import Transport
+from paramiko.ssh_exception import SSHException
+from plone import api
+from Products.Five.browser import BrowserView
+from Products.statusmessages.interfaces import IStatusMessage
+from recensio.plone.config import REVIEW_TYPES
+from recensio.plone.interfaces import IReview
+from recensio.plone.export import LZAExporter
+from recensio.plone.export import register_doi
+from recensio.plone.interfaces import IRecensioExporter
+from recensio.plone.controlpanel.settings import IRecensioSettings
+from time import time
+from zope.annotation.interfaces import IAnnotations
+from zope.component import getFactoriesFor
+from zope.component import getUtility
+from zope.component.interfaces import IFactory
+
+import logging
+import transaction
+
+
+log = logging.getLogger(__name__)
+
+EXPORT_TIMESTAMP_KEY = "recensio.policy.metadata_export_timestamp"
+
+
+class MetadataExport(BrowserView):
+    def __call__(self):
+        log.info("Starting export")
+        annotations = IAnnotations(self.context)
+        if self.request.get("force", False):
+            del annotations[EXPORT_TIMESTAMP_KEY]
+        timestamp = annotations.get(EXPORT_TIMESTAMP_KEY, 0)
+        if time() - timestamp < 2 * 60 * 60:  # 2 hours
+            log.info("export already running, abort")
+            return "An export is already running, aborting"
+
+        annotations[EXPORT_TIMESTAMP_KEY] = time()
+        transaction.commit()
+
+        try:
+            exporters = [
+                (name, factory()) for name, factory in getFactoriesFor(IRecensioExporter)
+            ]
+            exporters_to_run = [(name, e) for name, e in exporters if e.needs_to_run()]
+        except Exception as e:
+            log.exception(e)
+            del annotations[EXPORT_TIMESTAMP_KEY]
+            msg = "Error, aborting export: " + str(e)
+            log.error(msg)
+            return msg
+
+        if not exporters_to_run:
+            del annotations[EXPORT_TIMESTAMP_KEY]
+            log.info("export finished, nothing to do")
+            return "Nothing to do, no exporter requested an export run."
+
+        for issue_or_volume in self.issues_and_volumes():
+            for review in self.reviews(issue_or_volume):
+                for name, exporter in exporters_to_run:
+                    try:
+                        exporter.add_review(review)
+                    except Exception as e:
+                        log.error(
+                            "Error in {0} - {1}: {2}".format(
+                                review.getId(), e.__class__.__name__, e
+                            )
+                        )
+            # Free memory after every issue and volume
+            transaction.commit()
+        statuses = []
+        for name, exporter in exporters_to_run:
+            try:
+                status = exporter.export()
+                statuses.append((name, status))
+            except Exception as e:
+                log.error(
+                    "Error in {0} - {1}: {2}".format(name, e.__class__.__name__, e)
+                )
+
+        del annotations[EXPORT_TIMESTAMP_KEY]
+        transaction.commit()
+        log.info("export finished")
+
+        return "<br />\n".join([name + ": " + str(status) for name, status in statuses])
+
+    def items(self, portal_type=(), context=None, depth=None):
+        pc = api.portal.get_tool("portal_catalog")
+        if context is None:
+            context = self.context
+        parent_path = dict(query="/".join(context.getPhysicalPath()))
+        if depth is not None:
+            parent_path["depth"] = depth
+        query = dict(review_state="published", portal_type=portal_type, path=parent_path)
+        results = pc(**query)
+        if None in results:
+            query["b_size"] = len(results)
+            results = pc(**query)
+        for item in results:
+            try:
+                yield item.getObject()
+            except AttributeError:
+                log.warn("Could not getObject: " + item.getPath())
+                continue
+
+    def issues_and_volumes(self):
+        return self.items(portal_type=("Issue", "Volume"))
+
+    def reviews(self, issue):
+        return self.items(portal_type=REVIEW_TYPES, context=issue, depth=1)
+
+
+class ChroniconExport(BrowserView):
+    @property
+    def filename(self):
+        prefix = api.portal.get_registry_record(name="recensio.plone.settings.xml_export_filename_prefix")
+        return "%s_%s_all.zip" % (
+            prefix,
+            date.today().strftime("%d%m%y"),
+        )
+
+    def __call__(self):
+        host = api.portal.get_registry_record(name="recensio.plone.settings.xml_export_server")
+        username = api.portal.get_registry_record(name="recensio.plone.settings.xml_export_username")
+        password = api.portal.get_registry_record(name="recensio.plone.settings.xml_export_password")
+        if not host:
+            return "no host configured"
+        log.info("Starting XML export to sftp")
+
+        exporter = getUtility(IFactory, name="chronicon_exporter")()
+        export_xml = exporter.get_export_obj(self.context)
+        if export_xml is None:
+            msg = "Could not get export file object: {0}".format(
+                exporter.export_filename
+            )
+            log.error(msg)
+            return msg
+
+        zipstream = export_xml.file
+        try:
+            transport = Transport((host, 2222))
+            transport.connect(username=username, password=password)
+            sftp = SFTPClient.from_transport(transport)
+            attribs = sftp.putfo(zipstream.open(), self.filename)
+        except (IOError, SSHException) as ioe:
+            msg = "Export failed, {0}: {1}".format(ioe.__class__.__name__, ioe)
+            log.error(msg)
+            return msg
+        if attribs.st_size == zipstream.size:
+            msg = "Export successful"
+            log.info(msg)
+            return msg
+        else:
+            msg = "Export failed, {0}/{1} bytes transferred".format(
+                attribs.st_size, zipstream.size
+            )
+            log.error(msg)
+            return msg
+
+
+class DaraUpdate(BrowserView):
+    """Send metadata to da|ra, in effect registering the object's DOI or
+    updating its metadata if already registered."""
+
+    def __call__(self):
+        if self.request.get("REQUEST_METHOD") == "POST":
+            status, message = register_doi(self.context)
+            IStatusMessage(self.request).addStatusMessage(message, type=status)
+        self.request.response.redirect(self.context.absolute_url())
+
+
+class ResetLZAExportFlag(BrowserView):
+    def _reset_flag(self, context):
+        paths = []
+        if IReview.providedBy(context):
+            self.exporter._set_exported(context, value=False)
+            paths.append("/".join(context.getPhysicalPath()))
+        for child in getattr(context, "objectValues", lambda: [])():
+            paths += self._reset_flag(child)
+        return paths
+
+    def __call__(self):
+        self.exporter = LZAExporter()
+        paths = self._reset_flag(self.context)
+        return u"Reset LZA export flag for the following objects:\n\n" + u"\n".join(
+            paths
+        )
diff --git a/src/recensio/plone/browser/templates/export_container_contextless.pt b/src/recensio/plone/browser/templates/export_container_contextless.pt
new file mode 100644
index 00000000..f4de2945
--- /dev/null
+++ b/src/recensio/plone/browser/templates/export_container_contextless.pt
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<recensio_package 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:tal="http://xml.zope.org/namespaces/tal"
+	package_journal_name="Jahrbuch des Bundesinstituts für Kultur und Geschichte der Deutschen im östlichen Europa" package_journal_volume="20" package_journal_issue="" package_journal_pubyear="2012" xsi:noNamespaceSchemaLocation="recensio_frompublisher_2015-09-02.xsd"
+	tal:attributes="package_journal_name options/package/publication_title;
+				    package_journal_volume options/package/package_journal_volume_title; 
+					package_journal_issue options/package/package_journal_issue_title; 
+					package_journal_pubyear options/package/package_journal_pubyear">
+					
+<tal:r repeat="review options/reviews"><tal:rep replace="structure review" /></tal:r>
+	
+</recensio_package>
diff --git a/src/recensio/plone/configure.zcml b/src/recensio/plone/configure.zcml
index 52b39bee..73d89d79 100644
--- a/src/recensio/plone/configure.zcml
+++ b/src/recensio/plone/configure.zcml
@@ -44,6 +44,11 @@
   <include package=".viewlets" />
   <include package=".vocabularies" />
 
+  <utility
+      component=".export.ChroniconExporterFactory"
+      provides="zope.component.interfaces.IFactory"
+      name="chronicon_exporter" />
+
   <utility
       factory=".setuphandlers.HiddenProfiles"
       name="recensio.plone-hiddenprofiles"
diff --git a/src/recensio/plone/export.py b/src/recensio/plone/export.py
new file mode 100644
index 00000000..e02c16ff
--- /dev/null
+++ b/src/recensio/plone/export.py
@@ -0,0 +1,412 @@
+# -* coding: utf-8 *-
+from Acquisition import aq_parent
+from base64 import b64encode
+from datetime import datetime
+from datetime import timedelta
+from DateTime import DateTime
+from io import FileIO
+from os import path
+from os import remove
+from os import stat
+from plone import api
+from plone.registry.interfaces import IRegistry
+from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone.utils import safe_unicode
+from recensio.plone.adapter.parentgetter import IParentGetter
+from recensio.plone.interfaces import IRecensioExporter
+from recensio.plone.controlpanel.settings import IRecensioSettings
+from io import StringIO
+from tempfile import NamedTemporaryFile
+from Testing.makerequest import makerequest
+from urllib.request import HTTPError
+from urllib.request import Request
+from urllib.request import urlopen
+from zExceptions import NotFound
+from zipfile import ZipFile
+from zope.annotation import IAnnotations
+from zope.component import queryUtility
+from zope.component.factory import Factory
+from zope.component.hooks import getSite
+from zope.component.interfaces import IFactory
+from zope.interface import implementer
+from zope.pagetemplate.pagetemplatefile import PageTemplateFile
+
+import csv
+import logging
+import tempfile
+
+
+log = logging.getLogger(__name__)
+
+
+class StatusSuccess(object):
+    value = True
+
+    def __repr__(self):
+        return "Success"
+
+
+class StatusFailure(object):
+    value = False
+
+    def __repr__(self):
+        return "Failure"
+
+
+class StatusSuccessFile(StatusSuccess):
+    def __init__(self, filename):
+        self.filename = filename
+
+
+class StatusSuccessFileCreated(StatusSuccessFile):
+    def __repr__(self):
+        return "{0} created".format(self.filename)
+
+
+class StatusSuccessFileExists(StatusSuccessFile):
+    def __init__(self, filename, modified=None):
+        self.filename = filename
+        self.modified = modified
+
+    def __repr__(self):
+        return "current file found ({0}, {1})".format(self.filename, self.modified)
+
+
+class StatusFailureAlreadyInProgress(StatusFailure):
+    def __init__(self, since=None):
+        self.since = since
+
+    def __repr__(self):
+        return "export in progress since {0}".format(self.since)
+
+
+class BaseExporter(object):
+    def get_export_obj(self, portal):
+        try:
+            export_xml = portal.unrestrictedTraverse(self.export_filename)
+        except (KeyError, ValueError, NotFound):
+            export_xml = None
+        return export_xml
+
+    def is_recent(self, export_xml_obj):
+        if export_xml_obj is not None:
+            modified = export_xml_obj.modified()
+            if DateTime() - 6 < modified:
+                return True
+        return False
+
+
+@implementer(IRecensioExporter)
+class ChroniconExporter(BaseExporter):
+    """Export review metadata (but not full text) to a zip file containing one
+    XML file per issue/volume"""
+
+    template = "browser/templates/export_container_contextless.pt"
+    export_filename = "export_metadata_xml.zip"
+    xml_view_name = "@@xml"
+
+    def __init__(self):
+        self.current_issue = None
+        self.issues_xml = {}
+        self.reviews_xml = []
+
+    def get_parent(self, meta_type):
+        if not self.current_issue:
+            return None
+        return IParentGetter(self.current_issue).get_parent_object_of_type(meta_type)
+
+    def get_publication_shortname(self):
+        return unicode(self.get_parent("Publication").getId(), "utf-8")
+
+    def get_publication_title(self):
+        return unicode(self.get_parent("Publication").Title(), "utf-8")
+
+    def get_package_journal_volume(self):
+        return unicode(self.get_parent("Volume").getId(), "utf-8")
+
+    def get_package_journal_volume_title(self):
+        return unicode(self.get_parent("Volume").Title(), "utf-8")
+
+    def get_package_journal_pubyear(self):
+        return self.get_parent("Volume").getYearOfPublication() or None
+
+    def get_package_journal_issue(self):
+        issue = self.get_parent("Issue")
+        if issue is None:
+            return None
+        return unicode(issue.getId(), "utf-8")
+
+    def get_package_journal_issue_title(self):
+        issue = self.get_parent("Issue")
+        if issue is None:
+            return None
+        return unicode(issue.Title(), "utf-8")
+
+    def get_issue_filename(self):
+        issue = self.get_package_journal_issue()
+        if issue is not None:
+            return "recensio_%s_%s_%s.xml" % (
+                self.get_publication_shortname(),
+                self.get_package_journal_volume(),
+                issue,
+            )
+        else:
+            return "recensio_%s_%s.xml" % (
+                self.get_publication_shortname(),
+                self.get_package_journal_volume(),
+            )
+
+    def finish_issue(self):
+        pt = PageTemplateFile(self.template)
+        options = {
+            "package": {
+                "publication_title": self.get_publication_title,
+                "package_journal_volume_title": self.get_package_journal_volume_title,
+                "package_journal_pubyear": self.get_package_journal_pubyear,
+                "package_journal_issue_title": self.get_package_journal_issue_title,
+            },
+            "reviews": self.reviews_xml,
+        }
+        filename = self.get_issue_filename()
+        xml = pt(**options)
+        self.issues_xml[filename] = xml
+        self.reviews_xml = []
+        self.current_issue = None
+
+    @property
+    def cache_filename(self):
+        return path.join(tempfile.gettempdir(), "chronicon_cache.zip")
+
+    def write_zipfile(self, zipfile):
+        for filename, xml in self.issues_xml.items():
+            zipfile.writestr(filename, bytes(xml.encode("utf-8")))
+
+    def get_zipdata(self):
+        cache_file_name = self.cache_filename
+        stream = FileIO(cache_file_name, mode="w")
+        zipfile = ZipFile(stream, "w")
+        self.write_zipfile(zipfile)
+        zipfile.close()
+        stream.close()
+
+        stream = FileIO(cache_file_name, mode="r")
+        zipdata = stream.readall()
+        stream.close()
+        remove(cache_file_name)
+        return zipdata
+
+    def running_export(self):
+        if path.exists(self.cache_filename):
+            mtime = stat(self.cache_filename).st_mtime
+            cache_time = datetime.fromtimestamp(mtime)
+            if datetime.now() - cache_time < timedelta(0, 60 * 60):
+                return cache_time
+
+    def needs_to_run(self):
+        portal = getSite()
+        export_xml_obj = self.get_export_obj(portal)
+        return not self.is_recent(export_xml_obj) and not self.running_export()
+
+    def add_review(self, review):
+        """Expects reviews of the same issue to be added consecutively"""
+        review_issue = IParentGetter(review).get_parent_object_of_type("Issue")
+        if review_issue is None:
+            review_issue = IParentGetter(review).get_parent_object_of_type("Volume")
+        if self.current_issue != review_issue:
+            if self.current_issue:
+                self.finish_issue()
+            self.current_issue = review_issue
+        self.reviews_xml.append(review.restrictedTraverse(self.xml_view_name)())
+
+    def export(self):
+        if self.current_issue:
+            self.finish_issue()
+
+        portal = getSite()
+        export_xml_obj = self.get_export_obj(portal)
+        cache_time = self.running_export()
+        if cache_time:
+            return StatusFailureAlreadyInProgress(cache_time.isoformat())
+
+        pt = getToolByName(portal, "portal_types")
+        type_info = pt.getTypeInfo("File")
+        if export_xml_obj is None:
+            export_xml_obj = type_info._constructInstance(portal, self.export_filename)
+        export_xml_obj.setFile(self.get_zipdata(), filename=self.export_filename)
+        export_xml_obj.setModificationDate(DateTime())
+        return StatusSuccessFileCreated(self.export_filename)
+
+
+@implementer(IRecensioExporter)
+class BVIDExporter(BaseExporter):
+
+    export_filename = "bvid_export.csv"
+
+    def __init__(self):
+        self.items = []
+
+    def needs_to_run(self):
+        portal = getSite()
+        export_file = self.get_export_obj(portal)
+        return not self.is_recent(export_file)
+
+    def add_review(self, review):
+        if review.getBv():
+            try:
+                use_canonical = review.isUseCanonicalUriForBVID()
+            except AttributeError:
+                use_canonical = False
+            if use_canonical:
+                url = review.getCanonical_uri()
+            else:
+                url = review.absolute_url()
+            self.items.append((review.getBv(), url))
+
+    def export(self):
+        csvfile = StringIO()
+        csvwriter = csv.writer(csvfile)
+
+        csvwriter.writerows(self.items)
+
+        portal = getSite()
+        export_file = self.get_export_obj(portal)
+        if export_file is None:
+            pt = getToolByName(portal, "portal_types")
+            type_info = pt.getTypeInfo("File")
+            export_file = type_info._constructInstance(portal, self.export_filename)
+
+        export_file.setFile(csvfile.getvalue(), filename=self.export_filename)
+        export_file.setModificationDate(DateTime())
+        return StatusSuccessFileCreated(self.export_filename)
+
+
+class LZAExporter(ChroniconExporter):
+    """Like ChroniconExporter but
+    * also exports full text (PDF)
+    * only exports each review once, then never again"""
+
+    export_filename = "export_lza_xml.zip"
+    xml_view_name = "@@xml-lza"
+
+    def __init__(self):
+        super(LZAExporter, self).__init__()
+        self.reviews_pdf = {}
+
+    @property
+    def cache_filename(self):
+        return path.join(tempfile.gettempdir(), "lza_cache.zip")
+
+    def _set_exported(self, review, value=True):
+        IAnnotations(review)["LZA_EXPORTED"] = value and True or False
+
+    def _is_exported(self, review):
+        return IAnnotations(review).get("LZA_EXPORTED")
+
+    def add_review(self, review):
+        if self._is_exported(review):
+            return
+        super(LZAExporter, self).add_review(review)
+        pdf_path = "/".join(review.getPhysicalPath()[2:]) + ".pdf"
+        pdf_blob = review.get_review_pdf()["blob"].open()
+        self.reviews_pdf[pdf_path] = pdf_blob.read()
+        pdf_blob.close()
+        self._set_exported(review)
+
+    def write_zipfile(self, zipfile):
+        super(LZAExporter, self).write_zipfile(zipfile)
+        for filename, pdf in self.reviews_pdf.items():
+            zipfile.writestr(filename, bytes(pdf))
+
+
+@implementer(IRecensioExporter)
+class MissingBVIDExporter(BVIDExporter):
+
+    export_filename = "missing_bvid.csv"
+
+    def add_review(self, review):
+        if not review.getBv():
+            if hasattr(review, "getIsbn"):
+                isbn_or_issn = review.getIsbn()
+            else:
+                isbn_or_issn = review.getIssn()
+            self.items.append((review.UID(), isbn_or_issn))
+
+
+class DaraExporter(BaseExporter):
+    def __init__(self):
+        self.reviews_xml = []
+
+    def add_review(self, review):
+        self.reviews_xml.append(review.restrictedTraverse("@@xml-dara")())
+
+    def export(self):
+        pass
+
+
+BVIDExporterFactory = Factory(BVIDExporter, IFactory, "exporter")
+MissingBVIDExporterFactory = Factory(MissingBVIDExporter, IFactory, "exporter")
+ChroniconExporterFactory = Factory(ChroniconExporter, IFactory, "exporter")
+LZAExporterFactory = Factory(LZAExporter, IFactory, "exporter")
+
+
+def register_doi_raw(obj):
+    registry = queryUtility(IRegistry)
+    settings = registry.forInterface(IRecensioSettings)
+    username = settings.doi_registration_username
+    password = settings.doi_registration_password
+    auth = b64encode("{0}:{1}".format(username, password))
+    url = settings.doi_registration_url.encode("utf-8")
+
+    xml = obj.restrictedTraverse("@@xml-dara")().encode("utf-8")
+    headers = {
+        "Content-type": "application/xml;charset=UTF-8",
+        "Authorization": "Basic " + auth,
+    }
+    result = urlopen(Request(url, xml, headers))
+    return_code = result.getcode()
+    result.close()
+    return return_code
+
+
+def register_doi(obj):
+    try:
+        return_code = register_doi_raw(obj)
+    except HTTPError as e:
+        if e.code == 401:
+            message = (
+                "Dara login failed - check DOI registration " "user name and password"
+            )
+        elif e.code == 400:
+            message = "Request rejected by dara - check generated XML"
+        elif e.code == 500:
+            message = "Dara server error - try again later"
+        else:
+            message = "Error returned by dara server: {0}".format(e)
+        status = "error"
+        log.error(message)
+        body = e.read()
+        if "\n" in body:
+            dump_file = NamedTemporaryFile(suffix=".html", delete=False)
+            dump_file.write(body)
+            dump_file.close()
+            log.info("HTTPError dumped to " + dump_file.name)
+        else:
+            log.error(body)
+    except ValueError as e:
+        exc_msg = e.__class__.__name__ + ": " + str(e)
+        message = "Error while updating dara record (" + exc_msg + ")"
+        status = "error"
+    except IOError as e:
+        exc_msg = e.__class__.__name__ + ": " + str(e)
+        message = "Error contacting dara server (" + exc_msg + ")"
+        status = "error"
+    else:
+        if return_code == 201:
+            message = "DOI successfully registered"
+        elif return_code == 200:
+            message = "Metadata updated"
+        else:
+            message = "Success (status {0})".format(return_code)
+        status = "success"
+    return status, message
+
diff --git a/src/recensio/plone/interfaces.py b/src/recensio/plone/interfaces.py
index 8bf5f020..dada0c20 100644
--- a/src/recensio/plone/interfaces.py
+++ b/src/recensio/plone/interfaces.py
@@ -8,3 +8,18 @@ class IRecensioPloneLayer(IDefaultBrowserLayer):
 
 class IReview(Interface):
     """Marker interface for reviews and other select content types."""
+
+class IRecensioExporter(Interface):
+    """Interface for bulk exporting review data"""
+
+    def needs_to_run():
+        """True if the exporter needs to be run at the time of the call,
+        False if the exporter thinks it has nothing to do right now, e.g. a
+        recent export is still stored"""
+
+    def add_review():
+        """Accepts a review that is to be exported in the current run."""
+
+    def export():
+        """Finishes the current export run. This should store the exported
+        data in a way appropriate for the export."""

From 4efcc3979e0ee76fe8d513434ecc1bc06d942ea8 Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Thu, 16 Apr 2026 19:29:22 +0200
Subject: [PATCH 2/5] Completed the takeover of old code that was left out
 during the Plone 6 migration

---
 CHANGES.rst                                   |   4 +-
 docs/recensio-exports.md                      | 476 +++++++++++++++
 src/recensio/plone/browser/configure.zcml     | 103 +++-
 src/recensio/plone/browser/export.py          |  75 ++-
 src/recensio/plone/browser/listing.py         |   2 +-
 .../browser/templates/export_container.pt     |  21 +
 .../templates/export_container_contextless.pt |  29 +-
 .../plone/browser/templates/export_rj.pt      |  60 ++
 .../plone/browser/templates/export_rj_dara.pt | 115 ++++
 .../plone/browser/templates/export_rm.pt      |  61 ++
 .../plone/browser/templates/export_rm_dara.pt | 142 +++++
 .../plone/browser/templates/search.pt         | 530 +++++++++++-----
 src/recensio/plone/browser/xml.py             | 174 ++++++
 src/recensio/plone/config.py                  |   6 +
 src/recensio/plone/export.py                  | 233 +++----
 src/recensio/plone/interfaces.py              |   1 +
 src/recensio/plone/tests/test_exporters.py    | 569 ++++++++++++++++++
 .../registry/solr.xml                         |   2 +-
 18 files changed, 2282 insertions(+), 321 deletions(-)
 create mode 100644 docs/recensio-exports.md
 create mode 100644 src/recensio/plone/browser/templates/export_container.pt
 create mode 100644 src/recensio/plone/browser/templates/export_rj.pt
 create mode 100644 src/recensio/plone/browser/templates/export_rj_dara.pt
 create mode 100644 src/recensio/plone/browser/templates/export_rm.pt
 create mode 100644 src/recensio/plone/browser/templates/export_rm_dara.pt
 create mode 100644 src/recensio/plone/browser/xml.py
 create mode 100644 src/recensio/plone/tests/test_exporters.py

diff --git a/CHANGES.rst b/CHANGES.rst
index f409a052..8cb208d7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,9 @@ Changelog
 2.1.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Complete the XML export revival work.
+  `#3960 <https://github.com/syslabcom/scrum/issues/3960>`_
+  [pilz]
 
 
 2.1.1 (2026-04-05)
diff --git a/docs/recensio-exports.md b/docs/recensio-exports.md
new file mode 100644
index 00000000..b68f71ee
--- /dev/null
+++ b/docs/recensio-exports.md
@@ -0,0 +1,476 @@
+# Recensio export overview
+
+(generated by AI)
+
+This document summarizes the export-related code in:
+
+- `src/recensio/plone/export.py`
+- `src/recensio/plone/browser/export.py`
+- `src/recensio/plone/browser/templates/export_rm.pt`
+- `src/recensio/plone/browser/templates/export_rj.pt`
+
+## High-level picture
+
+The export code has three layers:
+
+1. **Exporter classes** in `export.py`
+   - collect review data
+   - render XML or CSV
+   - store generated files in the portal root
+   - includes `ContainerExportView`, the minimal BrowserView used to render
+     per-issue XML (lives here to avoid a circular import with `browser/export.py`)
+2. **Browser views** in `browser/export.py`
+   - trigger export-related actions
+   - upload an already generated export
+   - trigger DOI registration
+   - reset export flags
+3. **Registry settings** in the control panel
+   - SFTP target for Chronicon uploads
+   - filename prefix for uploaded files
+   - DOI registration endpoint and credentials
+
+There is also an important dependency on review-specific XML views elsewhere in
+the package:
+
+- `@@xml`
+- `@@xml-lza`
+- `@@xml-dara`
+
+The exporters do not build metadata themselves. They call those views on review
+objects and package the results.
+
+## How the pieces hang together
+
+### Chronicon flow
+
+The Chronicon-related workflow is split into two steps:
+
+1. **Generate** a portal-root file object named `export_metadata_xml.zip`
+   using `ChroniconExporter`
+2. **Upload** that existing ZIP to the remote Chronicon SFTP target using the
+   `@@chronicon-export` browser view
+
+So `@@chronicon-export` is an **upload view**, not the generator.
+
+### Generic bulk export flow
+
+`MetadataExport` in `browser/export.py` is a generic bulk-export runner. It:
+
+- finds exporter factories for `IRecensioExporter`
+- filters them with `needs_to_run()`
+- iterates over published `Issue` and `Volume` objects
+- collects published reviews below them
+- feeds each review into each exporter via `add_review()`
+- calls `export()` on each exporter at the end
+
+In the **current package snapshot**, `MetadataExport` is exposed as a browser
+view named `@@metadata-export` on the Plone site root. There are still no
+visible ZCML registrations for the CSV or LZA exporters as `IRecensioExporter`
+factories.
+
+In contrast, the package **does** register a named utility factory for the
+Chronicon exporter:
+
+- `chronicon_exporter` -> `ChroniconExporterFactory`
+
+So the current wiring is clearest for:
+
+- the generic export runner `@@metadata-export`
+- the Chronicon upload view `@@chronicon-export`
+- the DOI update helper `@@dara_update`
+- the LZA reset helper `@@reset-lza-export-flag`
+
+## `export.py`
+
+## `ContainerExportView`
+
+A minimal `BrowserView` that wraps the per-issue XML template:
+
+- template: `browser/templates/export_container_contextless.pt`
+- called by `ChroniconExporter.finish_issue()` to render one XML file per issue
+  or volume
+- lives in `export.py` (not in `browser/export.py`) so that `browser/export.py`
+  can safely import from `export.py` without creating a circular import
+
+## `BaseExporter`
+
+`BaseExporter` provides shared helpers:
+
+- `get_export_obj(portal)`
+  - looks up the generated export file object in the portal root
+- `is_recent(export_xml_obj)`
+  - treats an existing export file as recent if it was modified less than
+    6 days ago
+
+This is used by several exporters to decide whether a fresh export is needed.
+
+## `ChroniconExporter`
+
+Purpose:
+
+- export review metadata as a ZIP file with **one XML file per issue or volume**
+
+Important attributes:
+
+- template: `browser/templates/export_container_contextless.pt`
+- stored portal-root file name: `export_metadata_xml.zip`
+- per-review XML source: `@@xml`
+
+How it works:
+
+- reviews are added in issue/volume order with `add_review(review)`
+- each review is rendered through `review.restrictedTraverse("@@xml")()`
+- when the current issue/volume changes, `finish_issue()` renders one XML file
+  for that container and stores it in memory
+- `export()` writes all gathered XML files into a ZIP archive and stores it as a
+  `File` object in the portal root
+
+Generated internal XML filenames look like:
+
+- `recensio_<publication>_<volume>_<issue>.xml`
+- or `recensio_<publication>_<volume>.xml` when there is no issue layer
+
+Concurrency / freshness behavior:
+
+- `needs_to_run()` returns false if a recent portal-root export already exists
+- `running_export()` uses a temporary cache ZIP in the OS temp directory and
+  treats an export as in progress for up to 1 hour
+
+Return values from `export()` are status objects such as:
+
+- file created
+- current file already exists
+- export already in progress
+
+## `BVIDExporter`
+
+Purpose:
+
+- write a CSV mapping BVID values to review URLs
+
+Stored portal-root file:
+
+- `bvid_export.csv`
+
+Behavior:
+
+- includes only reviews with a BVID
+- writes either the canonical URI or the normal absolute URL depending on the
+  review configuration
+
+## `MissingBVIDExporter`
+
+Purpose:
+
+- write a CSV listing reviews that still miss a BVID
+
+Stored portal-root file:
+
+- `missing_bvid.csv`
+
+Behavior:
+
+- stores `(UID, ISBN/ISSN)` pairs for reviews without a BVID
+
+## `LZAExporter`
+
+Purpose:
+
+- export metadata **and full text PDFs** for long-term archive / deposit use
+
+It subclasses `ChroniconExporter` and changes:
+
+- stored portal-root file: `export_lza_xml.zip`
+- per-review XML source: `@@xml-lza`
+
+Additional behavior:
+
+- includes PDFs inside the ZIP next to the XML metadata
+- marks each exported review with the annotation key `LZA_EXPORTED`
+- skips reviews that were already exported before
+
+This makes LZA export **incremental** by default.
+
+## `DaraExporter`
+
+Purpose:
+
+- collect `@@xml-dara` output for DOI registration-related export
+
+Current state:
+
+- the class exists, but `export()` is still a stub (`pass`)
+
+So it looks like a scaffold or incomplete path rather than an active export
+implementation.
+
+## `register_doi_raw()` and `register_doi()`
+
+These functions handle DOI registration / metadata update against the configured
+da|ra endpoint.
+
+They use registry settings for:
+
+- `doi_registration_url`
+- `doi_registration_username`
+- `doi_registration_password`
+
+Behavior:
+
+- build XML from `@@xml-dara`
+- send it via HTTP Basic Auth
+- translate HTTP/IO/value errors into user-facing status/message pairs
+
+Typical successful messages:
+
+- `DOI successfully registered`
+- `Metadata updated`
+
+## `browser/export.py`
+
+This module contains only **browser views**. It imports `LZAExporter` and
+`register_doi` from `export.py`; the dependency is one-directional.
+
+## `MetadataExport`
+
+Purpose:
+
+- generic bulk-runner for all registered `IRecensioExporter` exporters
+
+What it does:
+
+- uses a portal annotation key
+  `recensio.policy.metadata_export_timestamp`
+  as a coarse lock
+- refuses to start if an export has run within the last 2 hours
+- accepts a `force` request parameter to clear that lock first
+- walks published issues/volumes and published reviews below them
+- calls exporter `add_review()` for each review
+- commits the transaction after each issue/volume to reduce memory pressure
+- calls `export()` on each exporter and returns a HTML `<br />`-joined summary
+
+Registration:
+
+- ZCML name: `metadata-export`
+- context: `Products.CMFPlone.interfaces.IPloneSiteRoot`
+- permission: `zope2.View`
+
+Usage URL:
+
+```text
+https://example.org/Plone/@@metadata-export
+```
+
+Notes:
+
+- this is the browser entry point that orchestrates the bulk export run
+- it supports a `force` request parameter to clear the in-progress timestamp
+  guard before starting
+
+## `@@chronicon-export`
+
+Purpose:
+
+- upload the current Chronicon ZIP from the portal root to a remote SFTP server
+
+Registration:
+
+- ZCML name: `chronicon-export`
+- context: `Products.CMFPlone.interfaces.IPloneSiteRoot`
+- permission: `cmf.ManagePortal`
+
+Usage URL:
+
+```text
+https://example.org/Plone/@@chronicon-export
+```
+
+Configuration used:
+
+- `xml_export_server`
+- `xml_export_username`
+- `xml_export_password`
+- `xml_export_filename_prefix`
+
+Behavior:
+
+1. read SFTP settings from the registry
+2. look up `export_metadata_xml.zip` in the portal root
+3. open an SFTP connection to the configured host on **port 2222**
+4. upload the ZIP
+5. name the remote file as:
+
+```text
+[prefix]_[DDMMYY]_all.zip
+```
+
+Example:
+
+```text
+recensio_050426_all.zip
+```
+
+Important limitation:
+
+- this view only uploads an already prepared ZIP
+- it does **not** regenerate `export_metadata_xml.zip`
+
+Typical return values:
+
+- `no host configured`
+- `Could not get export file object: export_metadata_xml.zip`
+- `Export successful`
+- `Export failed, IOError: ...`
+- `Export failed, SSHException: ...`
+- `Export failed, <sent>/<total> bytes transferred`
+
+## `DaraUpdate`
+
+Purpose:
+
+- register or update DOI metadata for the current object through da|ra
+
+Behavior:
+
+- only performs work on `POST`
+- calls `register_doi(self.context)`
+- stores the result as a Plone status message
+- redirects back to the current object afterwards
+
+Registration:
+
+- ZCML name: `dara_update`
+- context: `recensio.plone.interfaces.IReview`
+- permission: `cmf.ModifyPortalContent`
+
+Usage pattern:
+
+- intended for review objects
+- only does work on `POST`
+- redirects back to the review after execution
+
+## `ResetLZAExportFlag`
+
+Purpose:
+
+- recursively clear the `LZA_EXPORTED` annotation so objects can be exported
+  again by `LZAExporter`
+
+Behavior:
+
+- walks the current context recursively
+- for any object providing `IReview`, resets the LZA export flag to `False`
+- returns a plain text list of affected object paths
+
+Registration:
+
+- ZCML name: `reset-lza-export-flag`
+- context: `*`
+- permission: `cmf.ModifyPortalContent`
+
+Usage pattern:
+
+- can be called on a subtree to clear LZA export flags recursively
+- returns a plain text list of affected paths
+
+## Control panel settings involved
+
+The export code depends on these Recensio settings:
+
+### Chronicon / SFTP
+
+- `xml_export_server`
+- `xml_export_username`
+- `xml_export_password`
+- `xml_export_filename_prefix`
+
+### DOI / da|ra
+
+- `doi_prefix`
+- `doi_registration_url`
+- `doi_registration_username`
+- `doi_registration_password`
+
+## Practical summary
+
+If you want to run the export generation and Chronicon upload path, the
+practical flow is:
+
+1. call `@@metadata-export` on the site root to generate or refresh export
+   artifacts
+2. ensure the Chronicon SFTP settings are configured
+3. call `@@chronicon-export` on the site root as a manager
+
+If you are working on the broader export subsystem, keep in mind:
+
+- `ChroniconExporter`, `LZAExporter`, BVID exporters, and DOI helpers live in
+  `export.py`
+- `ContainerExportView` also lives in `export.py` to avoid a circular import
+- `MetadataExport` is the bulk orchestration layer and is now exposed as
+  `@@metadata-export`
+- `ChroniconExport` handles only the remote SFTP upload step
+- `DaraUpdate` and `ResetLZAExportFlag` are also exposed as browser views
+- some exporter classes still exist in code without obvious factory
+  registrations in the current package ZCML
+
+## Export templates
+
+### `export_rm.pt` — review of monograph
+
+Used for reviews of books/monographs. Fields are read directly as Dexterity
+attributes (Python 3 / Plone 6 — no AT getter methods):
+
+| XML element | Context attribute | Behavior |
+|---|---|---|
+| `isbn` | `context/isbn` | `IBookReview` |
+| `language_reviewed_object` | `context.languageReviewedText` | `ITextReview` |
+| `pages` | `context/pages` | `ISerial` |
+| `place_of_publication` | `context/placeOfPublication` | `IPrintedReview` |
+| `publishing_company` | `context/publisher` | `IPrintedReview` |
+| `series` | `context/series` | `ISerial` |
+| `subtitle` | `context/subtitle` | `IBookReview` |
+| `volume_number` | `context/seriesVol` | `ISerial` |
+| `year` | `context/yearOfPublication` | `IPrintedReview` |
+| `bvid` | `context/bv` | `IBase` |
+| `classification_place` | `context.ddcPlace` | `IBase` |
+| `classification_subject` | `context.ddcSubject` | `IBase` |
+| `classification_time` | `context.ddcTime` | `IBase` |
+| `doi` | `context/doi` (condition: `doiRegistrationActive`) | `IBaseReview` / `ISettingsDoi` |
+| `language_review` | `context.languageReview` | `IBase` |
+| `reviewer` | `context/reviewAuthors` (RelationList) → `author/to_object/lastname` | `IBase` |
+| `page_first` | `context/pageStartOfReviewInJournal` | `IPagesOfReviewInJournal` |
+| `page_last` | `context/pageEndOfReviewInJournal` | `IPagesOfReviewInJournal` |
+
+### `export_rj.pt` — review of journal
+
+Used for reviews of journals / journal articles. Follows the same Dexterity
+attribute pattern as `export_rm.pt`.  Additional journal-specific fields:
+
+| XML element | Context attribute | Behavior / field |
+|---|---|---|
+| `reviewed_journal_editor` | `context/editor` | content type field |
+| `reviewed_journal_issn` | `context/issn` | `IJournalReview` |
+| `reviewed_journal_issue` | `context/issueNumber` | `IJournalReview` |
+| `reviewed_journal_publisher` | `context/publisher` | `IPrintedReview` |
+| `reviewed_journal_pubplace` | `context/placeOfPublication` | `IPrintedReview` |
+| `reviewed_journal_pubyear_real` | `context/yearOfPublication` | `IPrintedReview` |
+| `reviewed_journal_pubyear_fictive` | `context/officialYearOfPublication` | `IJournalReview` |
+| `reviewed_journal_title_short` | `context/shortnameJournal` | `IJournalReview` |
+| `reviewed_journal_volume` | `context/volumeNumber` | `IJournalReview` |
+
+The `reviewer` block, `bvid`, `doi`, classification fields, `page_first` /
+`page_last`, `filename`, `fulltext`, and `originalurl` are identical to
+`export_rm.pt`.
+
+### Note on `reviewAuthors`
+
+`reviewAuthors` (defined on `IBase`) is a Dexterity `RelationList` of
+`RelationValue` objects pointing to `Person` content items. Templates must go
+through `to_object` to reach the actual person:
+
+```xml
+<reviewer tal:repeat="author context/reviewAuthors">
+    <reviewer_last_name tal:content="author/to_object/lastname"/>
+    <reviewer_first_name tal:content="author/to_object/firstname"/>
+</reviewer>
+```
diff --git a/src/recensio/plone/browser/configure.zcml b/src/recensio/plone/browser/configure.zcml
index f27ca2bd..2d5ab578 100644
--- a/src/recensio/plone/browser/configure.zcml
+++ b/src/recensio/plone/browser/configure.zcml
@@ -122,13 +122,114 @@
       layer="recensio.plone.interfaces.IRecensioPloneLayer"
       />
 
+  <!-- XML Representations for rj, rm and containers, which include the former -->
+  <browser:page
+      name="xml"
+      for="recensio.plone.content.publication.IPublication"
+      class=".xml.XMLRepresentationPublication"
+      permission="zope.Public"
+      />
+
+  <browser:page
+      name="xml"
+      for="recensio.plone.content.volume.IVolume"
+      class=".xml.XMLRepresentationVolume"
+      permission="zope.Public"
+      />
+
+  <browser:page
+      name="xml"
+      for="recensio.plone.content.issue.IIssue"
+      class=".xml.XMLRepresentationIssue"
+      template="templates/export_container.pt"
+      permission="zope.Public"
+      />
+
+  <browser:page
+      name="xml"
+      for="recensio.plone.content.review_monograph.IReviewMonograph"
+      class=".xml.XMLRepresentation"
+      template="templates/export_rm.pt"
+      permission="zope.Public"
+      />
+
+  <browser:page
+      name="xml"
+      for="recensio.plone.content.review_journal.IReviewJournal"
+      class=".xml.XMLRepresentation"
+      template="templates/export_rj.pt"
+      permission="zope.Public"
+      />
+
+  <browser:page
+      name="xml"
+      for="recensio.plone.content.review_article_journal.IReviewArticleJournal"
+      class=".xml.XMLRepresentation"
+      template="templates/export_rj.pt"
+      permission="zope.Public"
+      />
+
+  <!-- XML Representations, dara versions  -->
+  <browser:page
+      name="xml-dara"
+      for="recensio.plone.content.review_monograph.IReviewMonograph"
+      class=".xml.XMLRepresentation"
+      template="templates/export_rm_dara.pt"
+      permission="zope.Public"
+      />
+
+  <browser:page
+      name="xml-dara"
+      for="recensio.plone.content.review_journal.IReviewJournal"
+      class=".xml.XMLRepresentation"
+      template="templates/export_rj_dara.pt"
+      permission="zope.Public"
+      />
+
+  <!-- XML Representations, LZA versions  -->
+  <browser:page
+      name="xml-lza"
+      for="recensio.plone.content.review_monograph.IReviewMonograph"
+      class=".xml.XMLRepresentationLZA"
+      template="templates/export_rm.pt"
+      permission="zope.Public"
+      />
+
+  <browser:page
+      name="xml-lza"
+      for="recensio.plone.content.review_journal.IReviewJournal"
+      class=".xml.XMLRepresentationLZA"
+      template="templates/export_rj.pt"
+      permission="zope.Public"
+      />
+
+  <!-- Export views and helpers -->
+  <browser:page
+      name="metadata-export"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".export.MetadataExport"
+      permission="cmf.ModifyPortalContent"
+      />
   <browser:page
       name="chronicon-export"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       class=".export.ChroniconExport"
-      permission="cmf.ManagePortal"
+      permission="cmf.ModifyPortalContent"
+      />
+  <browser:page
+      name="dara_update"
+      for="recensio.plone.interfaces.IReview"
+      class=".export.DaraUpdate"
+      permission="cmf.ModifyPortalContent"
+      />
+  <browser:page
+      name="reset-lza-export-flag"
+      for="*"
+      class=".export.ResetLZAExportFlag"
+      permission="cmf.ModifyPortalContent"
       />
 
+
   <!-- Listing views -->
 
   <configure package="eea.facetednavigation.browser">
diff --git a/src/recensio/plone/browser/export.py b/src/recensio/plone/browser/export.py
index 491a7b60..a16f947e 100644
--- a/src/recensio/plone/browser/export.py
+++ b/src/recensio/plone/browser/export.py
@@ -3,46 +3,48 @@
 from paramiko import Transport
 from paramiko.ssh_exception import SSHException
 from plone import api
+from plone.protect.interfaces import IDisableCSRFProtection
 from Products.Five.browser import BrowserView
 from Products.statusmessages.interfaces import IStatusMessage
-from recensio.plone.config import REVIEW_TYPES
-from recensio.plone.interfaces import IReview
+from recensio.plone.config import REVIEW_TYPES_TO_EXPORT
 from recensio.plone.export import LZAExporter
 from recensio.plone.export import register_doi
 from recensio.plone.interfaces import IRecensioExporter
-from recensio.plone.controlpanel.settings import IRecensioSettings
+from recensio.plone.interfaces import IReview
 from time import time
 from zope.annotation.interfaces import IAnnotations
 from zope.component import getFactoriesFor
 from zope.component import getUtility
 from zope.component.interfaces import IFactory
+from zope.interface import alsoProvides
 
 import logging
-import transaction
 
 
 log = logging.getLogger(__name__)
 
-EXPORT_TIMESTAMP_KEY = "recensio.policy.metadata_export_timestamp"
+EXPORT_TIMESTAMP_KEY = "recensio.plone.metadata_export_timestamp"
 
 
 class MetadataExport(BrowserView):
     def __call__(self):
+        alsoProvides(self.request, IDisableCSRFProtection)
         log.info("Starting export")
         annotations = IAnnotations(self.context)
         if self.request.get("force", False):
-            del annotations[EXPORT_TIMESTAMP_KEY]
+            if EXPORT_TIMESTAMP_KEY in annotations:
+                del annotations[EXPORT_TIMESTAMP_KEY]
         timestamp = annotations.get(EXPORT_TIMESTAMP_KEY, 0)
         if time() - timestamp < 2 * 60 * 60:  # 2 hours
             log.info("export already running, abort")
             return "An export is already running, aborting"
 
         annotations[EXPORT_TIMESTAMP_KEY] = time()
-        transaction.commit()
 
         try:
             exporters = [
-                (name, factory()) for name, factory in getFactoriesFor(IRecensioExporter)
+                (name, factory())
+                for name, factory in getFactoriesFor(IRecensioExporter)
             ]
             exporters_to_run = [(name, e) for name, e in exporters if e.needs_to_run()]
         except Exception as e:
@@ -64,24 +66,16 @@ def __call__(self):
                         exporter.add_review(review)
                     except Exception as e:
                         log.error(
-                            "Error in {0} - {1}: {2}".format(
+                            "Error in {} - {}: {}".format(
                                 review.getId(), e.__class__.__name__, e
                             )
                         )
-            # Free memory after every issue and volume
-            transaction.commit()
         statuses = []
         for name, exporter in exporters_to_run:
-            try:
-                status = exporter.export()
-                statuses.append((name, status))
-            except Exception as e:
-                log.error(
-                    "Error in {0} - {1}: {2}".format(name, e.__class__.__name__, e)
-                )
+            status = exporter.export()
+            statuses.append((name, status))
 
         del annotations[EXPORT_TIMESTAMP_KEY]
-        transaction.commit()
         log.info("export finished")
 
         return "<br />\n".join([name + ": " + str(status) for name, status in statuses])
@@ -93,7 +87,9 @@ def items(self, portal_type=(), context=None, depth=None):
         parent_path = dict(query="/".join(context.getPhysicalPath()))
         if depth is not None:
             parent_path["depth"] = depth
-        query = dict(review_state="published", portal_type=portal_type, path=parent_path)
+        query = dict(
+            review_state="published", portal_type=portal_type, path=parent_path
+        )
         results = pc(**query)
         if None in results:
             query["b_size"] = len(results)
@@ -109,22 +105,31 @@ def issues_and_volumes(self):
         return self.items(portal_type=("Issue", "Volume"))
 
     def reviews(self, issue):
-        return self.items(portal_type=REVIEW_TYPES, context=issue, depth=1)
+        return self.items(portal_type=REVIEW_TYPES_TO_EXPORT, context=issue, depth=1)
 
 
 class ChroniconExport(BrowserView):
     @property
     def filename(self):
-        prefix = api.portal.get_registry_record(name="recensio.plone.settings.xml_export_filename_prefix")
-        return "%s_%s_all.zip" % (
+        prefix = api.portal.get_registry_record(
+            name="recensio.plone.settings.xml_export_filename_prefix"
+        )
+        return "{}_{}_all.zip".format(
             prefix,
             date.today().strftime("%d%m%y"),
         )
 
     def __call__(self):
-        host = api.portal.get_registry_record(name="recensio.plone.settings.xml_export_server")
-        username = api.portal.get_registry_record(name="recensio.plone.settings.xml_export_username")
-        password = api.portal.get_registry_record(name="recensio.plone.settings.xml_export_password")
+        alsoProvides(self.request, IDisableCSRFProtection)
+        host = api.portal.get_registry_record(
+            name="recensio.plone.settings.xml_export_server"
+        )
+        username = api.portal.get_registry_record(
+            name="recensio.plone.settings.xml_export_username"
+        )
+        password = api.portal.get_registry_record(
+            name="recensio.plone.settings.xml_export_password"
+        )
         if not host:
             return "no host configured"
         log.info("Starting XML export to sftp")
@@ -132,28 +137,32 @@ def __call__(self):
         exporter = getUtility(IFactory, name="chronicon_exporter")()
         export_xml = exporter.get_export_obj(self.context)
         if export_xml is None:
-            msg = "Could not get export file object: {0}".format(
+            msg = "Could not get export file object: {}".format(
                 exporter.export_filename
             )
             log.error(msg)
             return msg
 
         zipstream = export_xml.file
+        transport = None
         try:
             transport = Transport((host, 2222))
             transport.connect(username=username, password=password)
             sftp = SFTPClient.from_transport(transport)
             attribs = sftp.putfo(zipstream.open(), self.filename)
-        except (IOError, SSHException) as ioe:
-            msg = "Export failed, {0}: {1}".format(ioe.__class__.__name__, ioe)
+        except (OSError, SSHException) as ioe:
+            msg = f"Export failed, {ioe.__class__.__name__}: {ioe}"
             log.error(msg)
             return msg
+        finally:
+            if transport is not None:
+                transport.close()
         if attribs.st_size == zipstream.size:
             msg = "Export successful"
             log.info(msg)
             return msg
         else:
-            msg = "Export failed, {0}/{1} bytes transferred".format(
+            msg = "Export failed, {}/{} bytes transferred".format(
                 attribs.st_size, zipstream.size
             )
             log.error(msg)
@@ -165,6 +174,7 @@ class DaraUpdate(BrowserView):
     updating its metadata if already registered."""
 
     def __call__(self):
+        alsoProvides(self.request, IDisableCSRFProtection)
         if self.request.get("REQUEST_METHOD") == "POST":
             status, message = register_doi(self.context)
             IStatusMessage(self.request).addStatusMessage(message, type=status)
@@ -182,8 +192,7 @@ def _reset_flag(self, context):
         return paths
 
     def __call__(self):
+        alsoProvides(self.request, IDisableCSRFProtection)
         self.exporter = LZAExporter()
         paths = self._reset_flag(self.context)
-        return u"Reset LZA export flag for the following objects:\n\n" + u"\n".join(
-            paths
-        )
+        return "Reset LZA export flag for the following objects:\n\n" + "\n".join(paths)
diff --git a/src/recensio/plone/browser/listing.py b/src/recensio/plone/browser/listing.py
index d7df71ca..a7c33381 100644
--- a/src/recensio/plone/browser/listing.py
+++ b/src/recensio/plone/browser/listing.py
@@ -79,7 +79,7 @@ def filter_query(self, query):
         Solr indexes across sibling sites recensio, regio, altertum. We should
         return results only from the current site.
         """
-        query = super(RecensioSearch, self).filter_query(query)
+        query = super().filter_query(query)
         if "path" not in query and "parent_path" not in query:
             query["path_parents"] = "/".join(api.portal.get().getPhysicalPath())
         return query
diff --git a/src/recensio/plone/browser/templates/export_container.pt b/src/recensio/plone/browser/templates/export_container.pt
new file mode 100644
index 00000000..2bdb90fe
--- /dev/null
+++ b/src/recensio/plone/browser/templates/export_container.pt
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<recensio_package xmlns:tal="http://xml.zope.org/namespaces/tal"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  package_journal_issue=""
+                  package_journal_name="Jahrbuch des Bundesinstituts für Kultur und Geschichte der Deutschen im östlichen Europa"
+                  package_journal_pubyear="2012"
+                  package_journal_volume="20"
+                  xsi:schemalocation="recensio_frompublisher_2015-09-02.xsd"
+                  tal:attributes="
+                    package_journal_name view/get_publication_title;
+                    package_journal_volume view/get_package_journal_volume_title;
+                    package_journal_issue view/get_package_journal_issue_title;
+                    package_journal_pubyear view/get_package_journal_pubyear;
+                  "
+>
+
+  <tal:r repeat="review view/reviews"><tal:rep replace="structure python:review.restrictedTraverse('@@xml')()"
+             on-error="string:Error in ${review/getId}"
+    /></tal:r>
+
+</recensio_package>
diff --git a/src/recensio/plone/browser/templates/export_container_contextless.pt b/src/recensio/plone/browser/templates/export_container_contextless.pt
index f4de2945..8c991c2a 100644
--- a/src/recensio/plone/browser/templates/export_container_contextless.pt
+++ b/src/recensio/plone/browser/templates/export_container_contextless.pt
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<recensio_package 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tal="http://xml.zope.org/namespaces/tal"
-	package_journal_name="Jahrbuch des Bundesinstituts für Kultur und Geschichte der Deutschen im östlichen Europa" package_journal_volume="20" package_journal_issue="" package_journal_pubyear="2012" xsi:noNamespaceSchemaLocation="recensio_frompublisher_2015-09-02.xsd"
-	tal:attributes="package_journal_name options/package/publication_title;
-				    package_journal_volume options/package/package_journal_volume_title; 
-					package_journal_issue options/package/package_journal_issue_title; 
-					package_journal_pubyear options/package/package_journal_pubyear">
-					
-<tal:r repeat="review options/reviews"><tal:rep replace="structure review" /></tal:r>
-	
+<recensio_package xmlns:tal="http://xml.zope.org/namespaces/tal"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  package_journal_issue=""
+                  package_journal_name="Jahrbuch des Bundesinstituts für Kultur und Geschichte der Deutschen im östlichen Europa"
+                  package_journal_pubyear="2012"
+                  package_journal_volume="20"
+                  xsi:nonamespaceschemalocation="recensio_frompublisher_2015-09-02.xsd"
+                  tal:attributes="
+                    package_journal_name options/package/publication_title;
+                    package_journal_volume options/package/package_journal_volume_title;
+                    package_journal_issue options/package/package_journal_issue_title;
+                    package_journal_pubyear options/package/package_journal_pubyear;
+                  "
+>
+
+  <tal:r repeat="review options/reviews"><tal:rep replace="structure review" /></tal:r>
+
+
 </recensio_package>
diff --git a/src/recensio/plone/browser/templates/export_rj.pt b/src/recensio/plone/browser/templates/export_rj.pt
new file mode 100644
index 00000000..a6473927
--- /dev/null
+++ b/src/recensio/plone/browser/templates/export_rj.pt
@@ -0,0 +1,60 @@
+<rj xmlns:tal="http://xml.zope.org/namespaces/tal"
+    id="ed891fc49fdbbb562278aa88e9ffb40d"
+    tal:attributes="
+      id context/UID;
+    "
+>
+  <reviewer tal:repeat="author context/reviewAuthors">
+    <reviewer_last_name tal:define="
+                          lastname author/to_object/lastname | string:'';
+                        "
+                        tal:content="lastname"
+    >Bla&zcaron;ek</reviewer_last_name>
+    <reviewer_first_name tal:define="
+                           firstname author/to_object/firstname | string:'';
+                         "
+                         tal:content="firstname"
+    >David</reviewer_first_name>
+  </reviewer>
+  <journal>
+    <reviewed_journal_editor tal:content="context/editor">Institut der Akademie der Wissenschaften der Tschechischen Republik</reviewed_journal_editor>
+    <reviewed_journal_issn tal:content="context/issn">1210-9029!</reviewed_journal_issn>
+    <reviewed_journal_issue tal:content="context/issueNumber">2!</reviewed_journal_issue>
+    <reviewed_journal_publisher tal:content="context/publisher">!Slovansk&yacute; &uacute;stav AV &Ccaron;R</reviewed_journal_publisher>
+    <reviewed_journal_pubplace tal:content="context/placeOfPublication">!Praha</reviewed_journal_pubplace>
+    <reviewed_journal_pubyear_real tal:content="context/yearOfPublication">!2009</reviewed_journal_pubyear_real>
+    <reviewed_journal_pubyear_fictive tal:content="context/officialYearOfPublication">2010</reviewed_journal_pubyear_fictive>
+    <reviewed_journal_title tal:content="context/Title">!Germanoslavica. Zeitschrift f&uuml;r germano-slawische Studien</reviewed_journal_title>
+    <reviewed_journal_title_short tal:content="context/shortnameJournal">Germanoslavica</reviewed_journal_title_short>
+    <reviewed_journal_volume tal:content="context/volumeNumber">!20</reviewed_journal_volume>
+    <language_reviewed_object tal:condition="context/languageReviewedText"
+                              tal:content="python:', '.join([view.get_lang_name(x) for x in context.languageReviewedText])"
+    >!English, Deutsch</language_reviewed_object>
+  </journal>
+  <bvid tal:condition="context/bv|nothing"
+        tal:content="context/bv"
+  ></bvid>
+  <classification_place tal:content="python:context.ddcPlace and ', '.join([view.get_voc_title('ddcPlace', x) for x in context.ddcPlace if x]) or ''">Slowenien, Polen, Lettland, Deutschland, Tschechien</classification_place>
+  <classification_subject tal:content="python:context.ddcSubject and ', '.join([view.get_voc_title('ddcSubject', x) for x in context.ddcSubject if x]) or ''">Sprachgeschichte, Wirtschaftsgeschichte, Literaturgeschichte, Siedlungs-, Stadt- und Ortsgeschichte, Bildungs-, Wissenschafts-, Schul- und Universit&auml;tsgeschichte, Sozial- und Kulturgeschichte</classification_subject>
+  <classification_time tal:content="python:context.ddcTime and ', '.join([view.get_voc_title('ddcTime', x) for x in context.ddcTime if x]) or ''">17. Jahrundert, 19. Jahrhundert, 20. Jahrhundert</classification_time>
+  <doi tal:condition="context/doiRegistrationActive"
+       tal:content="context/doi"
+  >10.15463/rec.xxxxxxx</doi>
+  <language_review tal:condition="context/languageReview"
+                   tal:content="python:', '.join([view.get_lang_name(x) for x in context.languageReview])"
+  >Deutsch</language_review>
+  <subject_headings tal:content="python:context.Subject() and ', '.join(context.Subject()) or ''">Slowenisch-deutscher Sprachvergleich, Riga / Handel, Tschechisch-deutscher Sprachkontakt, Arnim, Bettina von</subject_headings>
+  <filename tal:content="string:http://recensio.net/r/${context/UID}">http://recensio.net/r/8578c6f5e0304309991c1b12abeccc30</filename>
+  <fulltext tal:condition="view/include_fulltext"
+            tal:content="python:'/'.join(context.getPhysicalPath()[2:]) + '.pdf'"
+  >francia-recensio/2010-4/mittelalter-moyen-age-500-1500/die-inszenierung-der-vergangenheit-im-mittelalter.pdf</fulltext>
+  <originalurl tal:condition="context/canonical_uri"
+               tal:content="context/canonical_uri"
+  >http://www.recensio.net/rezensionen/zeitschriften/francia-recensio/2010-4/mittelalter-moyen-age-500-1500/die-inszenierung-der-vergangenheit-im-mittelalter</originalurl>
+  <page_first tal:condition="context/pageStartOfReviewInJournal"
+              tal:content="context/pageStartOfReviewInJournal"
+  >2</page_first>
+  <page_last tal:condition="context/pageEndOfReviewInJournal"
+             tal:content="context/pageEndOfReviewInJournal"
+  >3</page_last>
+</rj>
diff --git a/src/recensio/plone/browser/templates/export_rj_dara.pt b/src/recensio/plone/browser/templates/export_rj_dara.pt
new file mode 100644
index 00000000..37c3ed24
--- /dev/null
+++ b/src/recensio/plone/browser/templates/export_rj_dara.pt
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns="http://da-ra.de/schema/kernel-4"
+          xmlns:dara="http://da-ra.de/schema/kernel-4"
+          xmlns:tal="http://xml.zope.org/namespaces/tal"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemalocation="http://da-ra.de/schema/kernel-4 http://www.da-ra.de/fileadmin/media/da-ra.de/Technik/4.0/dara.xsd"
+>
+  <resourcetype>Text</resourcetype>
+  <resourcetypesfree>
+    <resourcetypefree>
+      <language>de</language>
+      <typename>Rezension</typename>
+    </resourcetypefree>
+    <resourcetypefree>
+      <language>en</language>
+      <typename>Review</typename>
+    </resourcetypefree>
+  </resourcetypesfree>
+  <resourceidentifier>
+    <identifier tal:content="context/UID">ed891fc49fdbbb562278aa88e9ffb40d</identifier>
+    <currentversion>1</currentversion>
+  </resourceidentifier>
+  <titles>
+    <title tal:define="
+             title context/getDecoratedTitle;
+             title python:title[:240];
+           ">
+      &lt;language&gt;de&lt;/language&gt;
+      &lt;titlename&gt;Rezension:
+        &lt;tal:title replace="title"&gt;Autor: Titel. Untertitel&lt;/tal:title&gt;&lt;/titlename&gt;
+    </title>
+  </titles>
+  <creators>
+    <creator tal:repeat="author context/getReviewAuthors">
+      <person>
+        <firstname tal:content="author/firstname">Hans</firstname>
+        <middlename></middlename>
+        <lastname tal:content="author/lastname">Testperson</lastname>
+      </person>
+    </creator>
+  </creators>
+  <dataurls>
+    <dataurl tal:content="context/absolute_url">http://www.recensio.net/</dataurl>
+  </dataurls>
+  <doiproposal tal:content="context/getDoi">10.15463/rec.1517192636</doiproposal>
+  <publicationdate>
+    <date tal:content="python:context.getEffectiveDate().strftime('%Y-%m-%d')">1970</date>
+  </publicationdate>
+  <availability>
+    <availabilitytype>Download</availabilitytype>
+  </availability>
+  <rights>
+    <right>
+      <language>de</language>
+      <freetext>
+                Creative-Commons-Lizenz Namensnennung-Keine kommerzielle Nutzung-Keine Bearbeitung (CC-BY-NC-ND)
+                http://creativecommons.org/licenses/by-nc-nd/2.0/deed.de
+      </freetext>
+    </right>
+  </rights>
+  <freekeywords tal:condition="context/Subject">
+    <freekeyword>
+      <language>de</language>
+      <keywords>
+        <keyword tal:repeat="subject context/Subject"
+                 tal:content="subject"
+        >Aufsatzsammlung</keyword>
+      </keywords>
+    </freekeyword>
+  </freekeywords>
+  <relations tal:define="
+               issn context/issn|nothing;
+               canonical_uri context/canonical_uri|nothing;
+             "
+             tal:condition="python: issn or canonical_uri"
+  >
+    <relation tal:condition="issn">
+      <identifier tal:content="issn">978-3-406-68822-5</identifier>
+      <identifiertype>ISSN</identifiertype>
+      <relationtype>Reviews</relationtype>
+    </relation>
+    <relation tal:condition="canonical_uri">
+      <identifier tal:content="canonical_uri">http://www.sehepunkte.de/2016/06/28546.html</identifier>
+      <identifiertype>URL</identifiertype>
+      <relationtype>IsVariantFormOf</relationtype>
+    </relation>
+  </relations>
+  <publications>
+    <publication>
+      <structuredpublication>
+        <documenttype>Journal</documenttype>
+        <authorseditors>
+          <authoreditor>
+            <editor>
+              <name tal:content="context/getEditor">Herausgeber</name>
+            </editor>
+          </authoreditor>
+        </authorseditors>
+        <title tal:content="context/punctuated_title_and_subtitle">Titel der Zeitschrift</title>
+        <year tal:condition="context/getYearOfPublication"
+              tal:content="context/getYearOfPublication"
+        >1970</year>
+        <publisher tal:content="context/getPublisher"></publisher>
+        <places tal:content="context/getPlaceOfPublication"></places>
+        <pids tal:condition="context/issn">
+          <pid>
+            <id>ISSN
+              <tal:isbn tal:replace="context/issn">978-3-406-68822-5</tal:isbn></id>
+            <pidtype>ISSN</pidtype>
+          </pid>
+        </pids>
+      </structuredpublication>
+    </publication>
+  </publications>
+</resource>
diff --git a/src/recensio/plone/browser/templates/export_rm.pt b/src/recensio/plone/browser/templates/export_rm.pt
new file mode 100644
index 00000000..4a0c40b0
--- /dev/null
+++ b/src/recensio/plone/browser/templates/export_rm.pt
@@ -0,0 +1,61 @@
+<rm xmlns:tal="http://xml.zope.org/namespaces/tal"
+    id="ed891fc49fdbbb562278aa88e9ffb40d"
+    tal:attributes="
+      id context/UID;
+    "
+>
+  <book>
+    <tal:repl replace="structure view/list_authors" />
+    <tal:repl replace="structure view/list_editors" />
+    <isbn tal:content="context/isbn">978-5-91022-116-5</isbn>
+    <language_reviewed_object tal:condition="context/languageReviewedText"
+                              tal:content="python:', '.join([view.get_lang_name(x) for x in context.languageReviewedText])"
+    >&Rcy;&ucy;&scy;&scy;&kcy;&icy;&jcy;</language_reviewed_object>
+    <pages tal:content="context/pages">896</pages>
+    <place_of_publication tal:content="context/placeOfPublication">Moskva</place_of_publication>
+    <publishing_company tal:content="context/publisher">AIRO-XXI</publishing_company>
+    <series tal:content="context/series">Quellen und Darstellungen zur Zeitgeschichte</series>
+    <subtitle tal:content="context/subtitle">2: Burnye proryvy, rasbitye nade&zcaron;dy. Russkie i nemcy v me&zcaron;voennye gody</subtitle>
+    <title tal:content="context/Title">Rossija i Germanija v XX veke</title>
+    <volume_number tal:content="context/seriesVol">2</volume_number>
+    <year tal:content="context/yearOfPublication">2010</year>
+  </book>
+  <bvid tal:condition="context/bv|nothing"
+        tal:content="context/bv"
+  ></bvid>
+  <classification_place tal:content="python:context.ddcPlace and ', '.join([view.get_voc_title('ddcPlace', x) for x in context.ddcPlace if x]) or ''">Slowenien, Polen, Lettland, Deutschland, Tschechien</classification_place>
+  <classification_subject tal:content="python:context.ddcSubject and ', '.join([view.get_voc_title('ddcSubject', x) for x in context.ddcSubject if x]) or ''">Sprachgeschichte, Wirtschaftsgeschichte, Literaturgeschichte, Siedlungs-, Stadt- und Ortsgeschichte, Bildungs-, Wissenschafts-, Schul- und Universit&auml;tsgeschichte, Sozial- und Kulturgeschichte</classification_subject>
+  <classification_time tal:content="python:context.ddcTime and ', '.join([view.get_voc_title('ddcTime', x) for x in context.ddcTime if x]) or ''">17. Jahrundert, 19. Jahrhundert, 20. Jahrhundert</classification_time>
+  <doi tal:condition="context/doiRegistrationActive"
+       tal:content="context/doi"
+  >10.15463/rec.xxxxxxx</doi>
+  <language_review tal:condition="context/languageReview"
+                   tal:content="python:', '.join([view.get_lang_name(x) for x in context.languageReview])"
+  >Deutsch</language_review>
+  <reviewer tal:repeat="author context/reviewAuthors">
+    <reviewer_last_name tal:define="
+                          lastname author/to_object/lastname | string:'';
+                        "
+                        tal:content="lastname"
+    >Bla&zcaron;ek</reviewer_last_name>
+    <reviewer_first_name tal:define="
+                           firstname author/to_object/firstname | string:'';
+                         "
+                         tal:content="firstname"
+    >David</reviewer_first_name>
+  </reviewer>
+  <subject_headings tal:content="python:context.Subject() and ', '.join(context.Subject()) or ''">Slowenisch-deutscher Sprachvergleich, Riga / Handel, Tschechisch-deutscher Sprachkontakt, Arnim, Bettina von</subject_headings>
+  <filename tal:content="string:http://recensio.net/r/${context/UID}">http://recensio.net/r/8578c6f5e0304309991c1b12abeccc30</filename>
+  <fulltext tal:condition="view/include_fulltext"
+            tal:content="python:'/'.join(context.getPhysicalPath()[2:]) + '.pdf'"
+  >francia-recensio/2010-4/mittelalter-moyen-age-500-1500/die-inszenierung-der-vergangenheit-im-mittelalter.pdf</fulltext>
+  <originalurl tal:condition="context/canonical_uri"
+               tal:content="context/canonical_uri"
+  >http://www.recensio.net/rezensionen/zeitschriften/francia-recensio/2010-4/mittelalter-moyen-age-500-1500/die-inszenierung-der-vergangenheit-im-mittelalter</originalurl>
+  <page_first tal:condition="context/pageStartOfReviewInJournal"
+              tal:content="context/pageStartOfReviewInJournal"
+  >2</page_first>
+  <page_last tal:condition="context/pageEndOfReviewInJournal"
+             tal:content="context/pageEndOfReviewInJournal"
+  >3</page_last>
+</rm>
diff --git a/src/recensio/plone/browser/templates/export_rm_dara.pt b/src/recensio/plone/browser/templates/export_rm_dara.pt
new file mode 100644
index 00000000..3e67cab1
--- /dev/null
+++ b/src/recensio/plone/browser/templates/export_rm_dara.pt
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns="http://da-ra.de/schema/kernel-4"
+          xmlns:dara="http://da-ra.de/schema/kernel-4"
+          xmlns:tal="http://xml.zope.org/namespaces/tal"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemalocation="http://da-ra.de/schema/kernel-4 http://www.da-ra.de/fileadmin/media/da-ra.de/Technik/4.0/dara.xsd"
+>
+  <resourcetype>Text</resourcetype>
+  <resourcetypesfree>
+    <resourcetypefree>
+      <language>de</language>
+      <typename>Rezension</typename>
+    </resourcetypefree>
+    <resourcetypefree>
+      <language>en</language>
+      <typename>Review</typename>
+    </resourcetypefree>
+  </resourcetypesfree>
+  <resourceidentifier>
+    <identifier tal:content="context/UID">ed891fc49fdbbb562278aa88e9ffb40d</identifier>
+    <currentversion>1</currentversion>
+  </resourceidentifier>
+  <titles>
+    <title tal:define="
+             title context/getDecoratedTitle;
+             title python:title[:240];
+           ">
+      &lt;language&gt;de&lt;/language&gt;
+      &lt;titlename&gt;Rezension:
+        &lt;tal:title replace="title"&gt;Autor: Titel. Untertitel&lt;/tal:title&gt;&lt;/titlename&gt;
+    </title>
+  </titles>
+  <creators>
+    <creator tal:repeat="author context/getReviewAuthors">
+      <person>
+        <firstname tal:content="author/firstname">Hans</firstname>
+        <middlename></middlename>
+        <lastname tal:content="author/lastname">Testperson</lastname>
+      </person>
+    </creator>
+  </creators>
+  <dataurls>
+    <dataurl tal:content="context/absolute_url">http://www.recensio.net/</dataurl>
+  </dataurls>
+  <doiproposal tal:content="context/getDoi">10.15463/rec.1517192636</doiproposal>
+  <publicationdate>
+    <date tal:content="python:context.getEffectiveDate().strftime('%Y-%m-%d')">1970</date>
+  </publicationdate>
+  <availability>
+    <availabilitytype>Download</availabilitytype>
+  </availability>
+  <rights>
+    <right>
+      <language>de</language>
+      <freetext>
+                Creative-Commons-Lizenz Namensnennung-Keine kommerzielle Nutzung-Keine Bearbeitung (CC-BY-NC-ND)
+                http://creativecommons.org/licenses/by-nc-nd/2.0/deed.de
+      </freetext>
+    </right>
+  </rights>
+  <freekeywords tal:condition="context/Subject">
+    <freekeyword>
+      <language>de</language>
+      <keywords>
+        <keyword tal:repeat="subject context/Subject"
+                 tal:content="subject"
+        >Aufsatzsammlung</keyword>
+      </keywords>
+    </freekeyword>
+  </freekeywords>
+  <relations tal:define="
+               isbn context/isbn|nothing;
+               canonical_uri context/canonical_uri|nothing;
+             "
+             tal:condition="python: isbn or canonical_uri"
+  >
+    <relation tal:condition="isbn">
+      <identifier tal:content="isbn">978-3-406-68822-5</identifier>
+      <identifiertype>ISBN</identifiertype>
+      <relationtype>Reviews</relationtype>
+    </relation>
+    <relation tal:condition="canonical_uri">
+      <identifier tal:content="canonical_uri">http://www.sehepunkte.de/2016/06/28546.html</identifier>
+      <identifiertype>URL</identifiertype>
+      <relationtype>IsVariantFormOf</relationtype>
+    </relation>
+  </relations>
+  <publications>
+    <publication>
+      <structuredpublication>
+        <documenttype>BookOrMonograph</documenttype>
+        <authorseditors>
+          <tal:comment replace="nothing">
+                        It seems to happen quite often that there is an editor/author entry where both first
+                        name and last name are the empty string. This causes an error on the dara server if
+                        we don't filter it out.
+          </tal:comment>
+          <tal:authors tal:repeat="author context/getAuthors">
+            <authoreditor tal:condition="python:author['lastname'] or author['firstname']">
+              <author>
+                <firstname tal:content="python:author['firstname'] or 'N/A'">Hans</firstname>
+                <middlename></middlename>
+                <lastname tal:content="python:author['lastname'] or 'N/A'">Testautor</lastname>
+              </author>
+            </authoreditor>
+          </tal:authors>
+          <tal:editorial tal:repeat="editor context/getEditorial">
+            <authoreditor tal:condition="python:editor['lastname'] or editor['firstname']">
+              <editor>
+                <name>
+                  <tal:lastname tal:replace="editor/lastname">Testautor</tal:lastname>
+                  <tal:comma condition="python:editor['lastname'] and editor['firstname']">,</tal:comma>
+                  <tal:firstname tal:replace="editor/firstname">Hans</tal:firstname>
+                </name>
+              </editor>
+            </authoreditor>
+          </tal:editorial>
+        </authorseditors>
+        <title tal:content="context/punctuated_title_and_subtitle">Titel der Monographie</title>
+        <year tal:condition="context/getYearOfPublication"
+              tal:content="context/getYearOfPublication"
+        >1970</year>
+        <publisher tal:content="context/getPublisher"></publisher>
+        <places tal:content="context/getPlaceOfPublication"></places>
+        <volume tal:condition="context/getSeriesVol"
+                tal:content="context/getSeriesVol"
+        ></volume>
+        <anthology tal:condition="context/getSeries"
+                   tal:content="context/getSeries"
+        ></anthology>
+        <pages tal:content="context/getPages"></pages>
+        <pids>
+          <pid>
+            <id>ISBN
+              <tal:isbn tal:replace="context/isbn">978-3-406-68822-5</tal:isbn></id>
+            <pidtype>ISBN</pidtype>
+          </pid>
+        </pids>
+      </structuredpublication>
+    </publication>
+  </publications>
+</resource>
diff --git a/src/recensio/plone/browser/templates/search.pt b/src/recensio/plone/browser/templates/search.pt
index b05c8480..e818d169 100644
--- a/src/recensio/plone/browser/templates/search.pt
+++ b/src/recensio/plone/browser/templates/search.pt
@@ -1,74 +1,120 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
+<html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
       lang="en"
       metal:use-macro="context/@@main_template/macros/master"
-      i18n:domain="plone">
-
-<head>
-  <metal:block metal:fill-slot="head_slot">
-
-    <link rel="alternate" title="RSS 1.0" type="application/rss+xml" href="${context/@@plone_context_state/object_url}/search_rss?${request/QUERY_STRING}"
-          tal:condition="request/SearchableText|nothing"/>
-    <link rel="home" title="Home" i18n:attributes="title" href="${view/navroot_url}" />
-
-  </metal:block>
-
-  <metal:block fill-slot="top_slot"
-               tal:define="disable_column_one python:request.set('disable_plone.leftcolumn',1);
-                           disable_column_two python:request.set('disable_plone.rightcolumn',1);" />
-</head>
-
-<body>
-
-  <div id="content-core" metal:fill-slot="main"
-       tal:define="b_start python:0;
-                   b_start request/b_start | b_start;
-                   batch python: view.results(b_start=b_start);
-                   normalizeString nocall:context/@@plone/normalizeString;">
-
-    <form name="searchform"
-          id="searchform"
-          action="@@search"
-          role="search"
-          class="searchPage pat-formautofocus pat-search"
-          tal:define="portal context/@@plone_portal_state/portal;
-                      first_call not:request/advanced_search|nothing;
-                      st python:request.get('SearchableText', '');
-                      DateTime python:modules['DateTime'].DateTime;
-                      navigation_root_url view/navroot_url;
-                      icons python:context.restrictedTraverse('@@iconresolver');">
-
-        <input type="hidden" name="sort_on" value="" />
-        <input type="hidden" name="sort_order" value="" />
-        <input type="hidden" id="search-batch-start" name="b_start:int" value="${request/b_start|string:0}" />
-        <input type="hidden" id="advanced-search-input" name="advanced_search" value="${python: 'True' if view.show_advanced_search() else 'False'}" />
+      xml:lang="en"
+      i18n:domain="plone"
+>
+
+  <head>
+    <metal:block metal:fill-slot="head_slot">
+
+      <link href="${context/@@plone_context_state/object_url}/search_rss?${request/QUERY_STRING}"
+            rel="alternate"
+            title="RSS 1.0"
+            type="application/rss+xml"
+            tal:condition="request/SearchableText|nothing"
+      />
+      <link href="${view/navroot_url}"
+            rel="home"
+            title="Home"
+            i18n:attributes="title"
+      />
+
+    </metal:block>
+
+    <metal:block fill-slot="top_slot"
+                 tal:define="
+                   disable_column_one python:request.set('disable_plone.leftcolumn',1);
+                   disable_column_two python:request.set('disable_plone.rightcolumn',1);
+                 "
+    />
+  </head>
+
+  <body>
+
+    <div id="content-core"
+         metal:fill-slot="main"
+         tal:define="
+           b_start python:0;
+           b_start request/b_start | b_start;
+           batch python: view.results(b_start=b_start);
+           normalizeString nocall:context/@@plone/normalizeString;
+         "
+    >
+
+      <form class="searchPage pat-formautofocus pat-search"
+            id="searchform"
+            action="@@search"
+            name="searchform"
+            role="search"
+            tal:define="
+              portal context/@@plone_portal_state/portal;
+              first_call not:request/advanced_search|nothing;
+              st python:request.get('SearchableText', '');
+              DateTime python:modules['DateTime'].DateTime;
+              navigation_root_url view/navroot_url;
+              icons python:context.restrictedTraverse('@@iconresolver');
+            "
+      >
+
+        <input name="sort_on"
+               type="hidden"
+               value=""
+        />
+        <input name="sort_order"
+               type="hidden"
+               value=""
+        />
+        <input id="search-batch-start"
+               name="b_start:int"
+               type="hidden"
+               value="${request/b_start|string:0}"
+        />
+        <input id="advanced-search-input"
+               name="advanced_search"
+               type="hidden"
+               value="${python: 'True' if view.show_advanced_search() else 'False'}"
+        />
 
         <div class="input-group">
           <input class="searchPage form-control"
                  name="SearchableText"
-                 type="text"
                  size="25"
                  title="Search Site"
+                 type="text"
                  value="${st}"
                  i18n:attributes="title title_search_title;"
-                 />
+          />
           <span class="input-group-btn">
-            <input class="searchPage allowMultiSubmit btn btn-primary" type="submit"
+            <input class="searchPage allowMultiSubmit btn btn-primary"
+                   type="submit"
                    value="Search"
-                   i18n:attributes="value label_search;" />
+                   i18n:attributes="value label_search;"
+            />
           </span>
         </div>
 
-        <input type="hidden" name="created.range:record" value="min" />
+        <input name="created.range:record"
+               type="hidden"
+               value="min"
+        />
 
         <div class="mt-3">
           <h1 id="search-term">
-            <span tal:condition="not:st" i18n:translate="">Search results</span>
-            <span tal:condition="st" i18n:translate="">
+            <span tal:condition="not:st"
+                  i18n:translate=""
+            >Search results</span>
+            <span tal:condition="st"
+                  i18n:translate=""
+            >
               Search results for
-              <span class="text-muted" tal:content="st" i18n:name="term">
+              <span class="text-muted"
+                    tal:content="st"
+                    i18n:name="term"
+              >
                 Search Term
               </span>
             </span>
@@ -78,10 +124,20 @@
         <div class="d-flex mb-2">
 
           <div class="flex-fill">
-            <a class="nav-link active ps-2" aria-current="page" href="#">
-              <span i18n:translate="batch_x_items_matching_your_criteria" class="d-flex" i18n:domain="plone" id="results-count" >
-                <span i18n:name="number" id="search-results-number" class="badge bg-primary me-2 d-flex justify-content-center align-items-center"
-                      tal:content="batch/sequence_length|string:0">234</span>
+            <a class="nav-link active ps-2"
+               aria-current="page"
+               href="#"
+            >
+              <span class="d-flex"
+                    id="results-count"
+                    i18n:domain="plone"
+                    i18n:translate="batch_x_items_matching_your_criteria"
+              >
+                <span class="badge bg-primary me-2 d-flex justify-content-center align-items-center"
+                      id="search-results-number"
+                      tal:content="batch/sequence_length|string:0"
+                      i18n:name="number"
+                >234</span>
                 items matching your search terms.
               </span>
             </a>
@@ -90,85 +146,156 @@
 
 
 
-          <div class="nav-item dropdown me-3" id="search-filter"
-               tal:condition="view/solr_active">
-            <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false" id="search-filter-toggle" i18n:translate="narrow_search_options">
+          <div class="nav-item dropdown me-3"
+               id="search-filter"
+               tal:condition="view/solr_active"
+          >
+            <a class="nav-link dropdown-toggle"
+               id="search-filter-toggle"
+               aria-expanded="false"
+               href="#"
+               role="button"
+               data-bs-toggle="dropdown"
+               i18n:translate="narrow_search_options"
+            >
               Filter the results
             </a>
-            <div  tal:replace="structure view/search_facets"/>
+            <div tal:replace="structure view/search_facets"></div>
           </div>
 
-          <div class="nav-item dropdown me-3" id="search-filter"
-               tal:condition="not:view/solr_active">
-            <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false" id="search-filter-toggle" i18n:translate="narrow_search_options">
+          <div class="nav-item dropdown me-3"
+               id="search-filter"
+               tal:condition="not:view/solr_active"
+          >
+            <a class="nav-link dropdown-toggle"
+               id="search-filter-toggle"
+               aria-expanded="false"
+               href="#"
+               role="button"
+               data-bs-toggle="dropdown"
+               i18n:translate="narrow_search_options"
+            >
               Filter the results
             </a>
             <div class="dropdown-menu dropdown-menu-md-end">
               <div class="d-flex text-nowrap">
                 <div class="mx-3">
-                  <span class="fw-bold" i18n:translate="label_item_type">Item type</span>
+                  <span class="fw-bold"
+                        i18n:translate="label_item_type"
+                  >Item type</span>
                   <ul class="list-unstyled search-type-options"
-                      tal:define="portal_types portal/portal_types;
-                                  types_list view/types_list;
-                                  all_checked python:(len(types_list) == len(request.get('portal_type', []))) or first_call;
-                                  toggle_select_state python:all_checked and 'true' or 'false';">
+                      tal:define="
+                        portal_types portal/portal_types;
+                        types_list view/types_list;
+                        all_checked python:(len(types_list) == len(request.get('portal_type', []))) or first_call;
+                        toggle_select_state python:all_checked and 'true' or 'false';
+                      "
+                  >
                     <li>
                       <div class="form-check">
-                        <input type="checkbox"
+                        <input class="form-check-input"
+                               id="pt_toggle"
+                               checked="${python:'checked' if all_checked else ''}"
                                name="pt_toggle"
+                               type="checkbox"
                                value="#"
-                               id="pt_toggle"
-                               class="form-check-input"
-                               checked="${python:'checked' if all_checked else ''}" />
-                        <label for="pt_toggle" class="form-check-label"
-                               i18n:translate="label_toggle">Select All/None</label>
+                        />
+                        <label class="form-check-label"
+                               for="pt_toggle"
+                               i18n:translate="label_toggle"
+                        >Select All/None</label>
                       </div>
                     </li>
                     <li tal:repeat="type types_list">
                       <div class="form-check">
-                        <input type="checkbox" name="portal_type:list" class="form-check-input" checked="checked"
-                               value="${type}" id="portal_type_${repeat/type/number}" checked="${python:'checked' if ((type in request.get('portal_type', [])) or first_call) else ''}"/>
-                        <label for="portal_type_${repeat/type/number}" i18n:translate="" class="form-check-label"
-                               tal:content="python: portal_types.getTypeInfo(type).Title()" />
+                        <input class="form-check-input"
+                               id="portal_type_${repeat/type/number}"
+                               checked="${python:'checked' if ((type in request.get('portal_type', [])) or first_call) else ''}"
+                               name="portal_type:list"
+                               type="checkbox"
+                               value="${type}"
+                        />
+                        <label class="form-check-label"
+                               for="portal_type_${repeat/type/number}"
+                               tal:content="python: portal_types.getTypeInfo(type).Title()"
+                               i18n:translate=""
+                        ></label>
                       </div>
                     </li>
                   </ul>
                 </div>
                 <div class="mx-3">
-                  <span class="fw-bold" i18n:translate="label_new_items_since">New items since</span>
+                  <span class="fw-bold"
+                        i18n:translate="label_new_items_since"
+                  >New items since</span>
                   <ul class="list-unstyled"
-                      tal:define="today python:DateTime().earliestTime();
-                                  yesterday python:(today-1).ISO();
-                                  lastweek python:(today-7).ISO();
-                                  lastmonth python:(today-31).ISO();
-                                  ever python:DateTime('1970-01-02').ISO();
-                                  checked python:request.get('created', {}).get('query', ever)">
+                      tal:define="
+                        today python:DateTime().earliestTime();
+                        yesterday python:(today-1).ISO();
+                        lastweek python:(today-7).ISO();
+                        lastmonth python:(today-31).ISO();
+                        ever python:DateTime('1970-01-02').ISO();
+                        checked python:request.get('created', {}).get('query', ever);
+                      "
+                  >
                     <li>
                       <div class="form-check">
-                        <input type="radio" id="query-date-yesterday" name="created.query:record:date" class="form-check-input"
-                               value="${yesterday}" checked="${python:'checked' if checked==yesterday else ''}" />
-                        <label for="query-date-yesterday" i18n:translate="time_yesterday" class="form-check-label">Yesterday</label>
+                        <input class="form-check-input"
+                               id="query-date-yesterday"
+                               checked="${python:'checked' if checked==yesterday else ''}"
+                               name="created.query:record:date"
+                               type="radio"
+                               value="${yesterday}"
+                        />
+                        <label class="form-check-label"
+                               for="query-date-yesterday"
+                               i18n:translate="time_yesterday"
+                        >Yesterday</label>
                       </div>
                     </li>
                     <li>
                       <div class="form-check">
-                        <input type="radio" id="query-date-lastweek" name="created.query:record:date" class="form-check-input"
-                               value="${lastweek}" checked="${python:'checked' if checked==lastweek else ''}" />
-                        <label for="query-date-lastweek" i18n:translate="time_last_week" class="form-check-label">Last week</label>
+                        <input class="form-check-input"
+                               id="query-date-lastweek"
+                               checked="${python:'checked' if checked==lastweek else ''}"
+                               name="created.query:record:date"
+                               type="radio"
+                               value="${lastweek}"
+                        />
+                        <label class="form-check-label"
+                               for="query-date-lastweek"
+                               i18n:translate="time_last_week"
+                        >Last week</label>
                       </div>
                     </li>
                     <li>
                       <div class="form-check">
-                        <input type="radio" id="query-date-lastmonth" name="created.query:record:date" class="form-check-input"
-                               value="${lastmonth}" checked="${python:'checked' if checked==lastmonth else ''}" />
-                        <label for="query-date-lastmonth" i18n:translate="time_last_month" class="form-check-label">Last month</label>
+                        <input class="form-check-input"
+                               id="query-date-lastmonth"
+                               checked="${python:'checked' if checked==lastmonth else ''}"
+                               name="created.query:record:date"
+                               type="radio"
+                               value="${lastmonth}"
+                        />
+                        <label class="form-check-label"
+                               for="query-date-lastmonth"
+                               i18n:translate="time_last_month"
+                        >Last month</label>
                       </div>
                     </li>
                     <li>
                       <div class="form-check">
-                        <input type="radio" id="query-date-ever" name="created.query:record:date" class="form-check-input"
-                               value="${ever}" checked="${python:'checked' if checked==ever else ''}" />
-                        <label for="query-date-ever" i18n:translate="time_ever" class="form-check-label">Ever</label>
+                        <input class="form-check-input"
+                               id="query-date-ever"
+                               checked="${python:'checked' if checked==ever else ''}"
+                               name="created.query:record:date"
+                               type="radio"
+                               value="${ever}"
+                        />
+                        <label class="form-check-label"
+                               for="query-date-ever"
+                               i18n:translate="time_ever"
+                        >Ever</label>
                       </div>
                     </li>
                   </ul>
@@ -178,12 +305,23 @@
           </div>
 
           <div class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false" i18n:translate="sort_by">Sort by</a>
-            <ul class="dropdown-menu dropdown-menu-md-end" id="sorting-options">
+            <a class="nav-link dropdown-toggle"
+               aria-expanded="false"
+               href="#"
+               role="button"
+               data-bs-toggle="dropdown"
+               i18n:translate="sort_by"
+            >Sort by</a>
+            <ul class="dropdown-menu dropdown-menu-md-end"
+                id="sorting-options"
+            >
               <li tal:repeat="item view/sort_options">
-                <a class="dropdown-item" href="${item/url}"
-                   data-sort="${item/sortkey}" data-order="${python:'reverse' if item.reverse else ''}"
-                   tal:content="item/title">sort option</a>
+                <a class="dropdown-item"
+                   href="${item/url}"
+                   data-order="${python:'reverse' if item.reverse else ''}"
+                   data-sort="${item/sortkey}"
+                   tal:content="item/title"
+                >sort option</a>
               </li>
             </ul>
           </div>
@@ -195,55 +333,84 @@
           <metal:searchresults define-macro="search_results">
 
             <div id="search-results"
-                 tal:define="navigation_root_url context/@@plone_portal_state/navigation_root_url;
-                             show_images python:view.show_images;
-                             search_image_scale python:view.search_image_scale;"
-                 data-default-sort="${python:request.get('sort_on') or view.default_sort_on}">
+                 data-default-sort="${python:request.get('sort_on') or view.default_sort_on}"
+                 tal:define="
+                   navigation_root_url context/@@plone_portal_state/navigation_root_url;
+                   show_images python:view.show_images;
+                   search_image_scale python:view.search_image_scale;
+                 "
+            >
 
               <metal:noresults tal:condition="not: batch">
-                <div class="alert alert-info" i18n:translate="description_no_results_found">No results were found.</div>
+                <div class="alert alert-info"
+                     i18n:translate="description_no_results_found"
+                >No results were found.</div>
               </metal:noresults>
 
-              <metal:results tal:condition="batch"
-                             tal:define="isAnon context/@@plone_portal_state/anonymous;
-                                         toLocalizedTime nocall: context/@@plone/toLocalizedTime;
-                                         use_view_action python:context.portal_registry.get('plone.types_use_view_action_in_listings', []);
-                                         allowAnonymousViewAbout python:context.portal_registry['plone.allow_anon_views_about'];
-                                         show_about python:not isAnon or allowAnonymousViewAbout;
-                                         image_scale portal/@@image_scale;
-                                         count_offset python:request.get('b_start', 0)">
-                <ol class="searchResults list-group list-group-numbered" start="${python:count_offset + 1}" style="--list-start: ${count_offset}; counter-reset: section var(--list-start, 0)">
+              <metal:results tal:define="
+                               isAnon context/@@plone_portal_state/anonymous;
+                               toLocalizedTime nocall: context/@@plone/toLocalizedTime;
+                               use_view_action python:context.portal_registry.get('plone.types_use_view_action_in_listings', []);
+                               allowAnonymousViewAbout python:context.portal_registry['plone.allow_anon_views_about'];
+                               show_about python:not isAnon or allowAnonymousViewAbout;
+                               image_scale portal/@@image_scale;
+                               count_offset python:request.get('b_start', 0);
+                             "
+                             tal:condition="batch"
+              >
+                <ol class="searchResults list-group list-group-numbered"
+                    start="${python:count_offset + 1}"
+                    style="--list-start: ${count_offset}; counter-reset: section var(--list-start, 0)"
+                >
                   <tal:results repeat="item batch">
-                    <li tal:define="hasIcon item/getIcon" class="list-group-item list-group-item-action d-flex justify-content-between align-items-start  fs-4">
+                    <li class="list-group-item list-group-item-action d-flex justify-content-between align-items-start fs-4"
+                        tal:define="
+                          hasIcon item/getIcon;
+                        "
+                    >
                       <div class="ms-2 me-auto">
                         <div class="result-title">
-                          <a href="${python:(item_url + '/view') if item_type in use_view_action else item_url}"
-                            class="state-${item/review_state}"
-                            tal:define="item_url item/getURL;
-                                        item_type item/PortalType">
-                                        <span tal:replace="python:item.getDataOrigin().pretty_title_or_id()"></span>
+                          <a class="state-${item/review_state}"
+                             href="${python:(item_url + '/view') if item_type in use_view_action else item_url}"
+                             tal:define="
+                               item_url item/getURL;
+                               item_type item/PortalType;
+                             "
+                          >
+                            <span tal:replace="python:item.getDataOrigin().pretty_title_or_id()"></span>
                           </a>
                         </div>
 
-                        <small class="text-muted small fs-6" i18n:domain="plone"
-                              tal:condition="show_about">
+                        <small class="text-muted small fs-6"
+                               tal:condition="show_about"
+                               i18n:domain="plone"
+                        >
                           <span class="documentAuthor"
-                                i18n:translate="label_by_author">
+                                i18n:translate="label_by_author"
+                          >
                             by
-                            <tal:block tal:condition="item/Creator"
-                                      tal:define="author python:context.portal_membership.getMemberInfo(item.Creator())">
+                            <tal:block tal:define="
+                                         author python:context.portal_membership.getMemberInfo(item.Creator());
+                                       "
+                                       tal:condition="item/Creator"
+                            >
                               <a href="${navigation_root_url}/author/${item/Creator}"
-                                tal:content="python:author and author['fullname'] or item.Creator()"
-                                tal:omit-tag="not:item/Creator"
-                                i18n:name="author">
+                                 tal:content="python:author and author['fullname'] or item.Creator()"
+                                 tal:omit-tag="not:item/Creator"
+                                 i18n:name="author"
+                              >
                                   Bob Dobalina
                               </a>
                             </tal:block>
                           </span>
-                          <span tal:define="publication_date item/EffectiveDate;
-                                            modification_date item/ModificationDate">
-
-                            <span class="documentPublished" tal:condition="python: publication_date != 'None'">
+                          <span tal:define="
+                                  publication_date item/EffectiveDate;
+                                  modification_date item/ModificationDate;
+                                ">
+
+                            <span class="documentPublished"
+                                  tal:condition="python: publication_date != 'None'"
+                            >
                               &mdash;
                               <span i18n:translate="box_published">
                                 published
@@ -253,7 +420,9 @@
                               </span>
                             </span>
 
-                            <span class="documentModified" tal:condition="python: modification_date != publication_date">
+                            <span class="documentModified"
+                                  tal:condition="python: modification_date != publication_date"
+                            >
                               &mdash;
                               <span i18n:translate="box_last_modified">
                                 last modified
@@ -263,13 +432,19 @@
                               </span>
                             </span>
                           </span>
-                          <span tal:define="categories item/Subject|nothing"
-                                tal:condition="categories">
+                          <span tal:define="
+                                  categories item/Subject|nothing;
+                                "
+                                tal:condition="categories"
+                          >
                             &mdash;
                             <tal:filedunder i18n:translate="">filed under:</tal:filedunder>
                             <span tal:repeat="category categories">
-                              <a href="${navigation_root_url}/@@search?Subject%3Alist=${category}" class="link-category" rel="tag"
-                                tal:content="category">
+                              <a class="link-category"
+                                 href="${navigation_root_url}/@@search?Subject%3Alist=${category}"
+                                 rel="tag"
+                                 tal:content="category"
+                              >
                                 Category
                               </a><tal:separator condition="not: repeat/category/end">,</tal:separator>
                             </span>
@@ -277,24 +452,37 @@
                         </small>
 
                         <div class="croppedDescription mt-2 mb-2 fs-5 fw-light"
-                          tal:condition="item/CroppedDescription" tal:content="item/CroppedDescription">
+                             tal:condition="item/CroppedDescription"
+                             tal:content="item/CroppedDescription"
+                        >
                           Cropped description
                         </div>
 
                         <cite class="d-block small text-muted fs-6"
-                              tal:define="breadcrumbs python: view.breadcrumbs(item);
-                                          is_rtl context/@@plone_portal_state/is_rtl;"
-                              tal:condition='breadcrumbs'>
+                              tal:define="
+                                breadcrumbs python: view.breadcrumbs(item);
+                                is_rtl context/@@plone_portal_state/is_rtl;
+                              "
+                              tal:condition="breadcrumbs"
+                        >
                           <span i18n:translate="text_searchitem_location">
                             Located in
                           </span>
                           <span dir="${python:'rtl' if is_rtl else 'ltr'}"
-                                tal:repeat="crumb breadcrumbs">
-                            <tal:item tal:define="is_last repeat/crumb/end;
-                                                  url crumb/absolute_url;
-                                                  title crumb/Title">
-                              <a href="${url}" tal:omit-tag="not: url" tal:content="title">crumb</a>
-                              <span class="breadcrumbSeparator" tal:condition="not: is_last">
+                                tal:repeat="crumb breadcrumbs"
+                          >
+                            <tal:item tal:define="
+                                        is_last repeat/crumb/end;
+                                        url crumb/absolute_url;
+                                        title crumb/Title;
+                                      ">
+                              <a href="${url}"
+                                 tal:content="title"
+                                 tal:omit-tag="not: url"
+                              >crumb</a>
+                              <span class="breadcrumbSeparator"
+                                    tal:condition="not: is_last"
+                              >
                                 <tal:ltr condition="not: is_rtl">/</tal:ltr>
                                 <tal:rtl condition="is_rtl">/</tal:rtl>
                               </span>
@@ -304,19 +492,23 @@
 
                       </div>
 
-                      <a href="${python:(item_url + '/view') if item_type in use_view_action else item_url}"
-                          class="state-${item/review_state}"
-                          tal:condition="python: show_images and hasIcon"
-                          tal:define="item_url item/getURL;
-                                    item_type item/PortalType">
-                          <img class="thumb-icon"
-                            tal:replace="structure python: image_scale.tag(item, 'image', scale=search_image_scale, css_class='thumb-icon')">
+                      <a class="state-${item/review_state}"
+                         href="${python:(item_url + '/view') if item_type in use_view_action else item_url}"
+                         tal:define="
+                           item_url item/getURL;
+                           item_type item/PortalType;
+                         "
+                         tal:condition="python: show_images and hasIcon"
+                      >
+                        <img class="thumb-icon"
+                             tal:replace="structure python: image_scale.tag(item, 'image', scale=search_image_scale, css_class='thumb-icon')"
+                        />
                       </a>
 
                     </li>
                   </tal:results>
                 </ol>
-                <div metal:use-macro="context/batch_macros/macros/navigation" />
+                <div metal:use-macro="context/batch_macros/macros/navigation"></div>
               </metal:results>
             </div>
 
@@ -324,19 +516,25 @@
 
         </div>
 
-        <div class="my-3" id="rss-subscription" i18n:domain="plone"
-            tal:condition="context/@@syndication-util/search_rss_enabled">
-          <a class="mx-2 text-decoration-none -flex  align-items-center"
-             href="${context/@@plone_context_state/object_url}/search_rss?${request/QUERY_STRING}">
-              <img tal:replace="structure python:icons.tag('rss-fill')" />
-              <span i18n:translate="title_subscribe_rss_feed" class="ms-1">
+        <div class="my-3"
+             id="rss-subscription"
+             tal:condition="context/@@syndication-util/search_rss_enabled"
+             i18n:domain="plone"
+        >
+          <a class="mx-2 text-decoration-none -flex align-items-center"
+             href="${context/@@plone_context_state/object_url}/search_rss?${request/QUERY_STRING}"
+          >
+            <img tal:replace="structure python:icons.tag('rss-fill')" />
+            <span class="ms-1"
+                  i18n:translate="title_subscribe_rss_feed"
+            >
                 Subscribe to an always-updated RSS feed.
-              </span>
+            </span>
           </a>
         </div>
 
-    </form>
-  </div>
+      </form>
+    </div>
 
-</body>
+  </body>
 </html>
diff --git a/src/recensio/plone/browser/xml.py b/src/recensio/plone/browser/xml.py
new file mode 100644
index 00000000..12ed6297
--- /dev/null
+++ b/src/recensio/plone/browser/xml.py
@@ -0,0 +1,174 @@
+from html import escape
+from io import BytesIO
+from plone.i18n.locales.languages import _languagelist
+from Products.Five.browser import BrowserView
+from recensio.plone.adapter.parentgetter import IParentGetter
+from recensio.plone.config import REVIEW_TYPES
+from zipfile import ZipFile
+from zope.component import getUtility
+from zope.schema.interfaces import IVocabularyFactory
+
+
+AUTHOR_TMPL = """        <author_%(num)s_first_name>%(firstname)s</author_%(num)s_first_name>
+        <author_%(num)s_last_name>%(lastname)s</author_%(num)s_last_name>
+"""
+EDITOR_TMPL = """        <editor_%(num)s_first_name>%(firstname)s</editor_%(num)s_first_name>
+        <editor_%(num)s_last_name>%(lastname)s</editor_%(num)s_last_name>
+"""
+
+
+class XMLRepresentation(BrowserView):
+    filename = "recensio_exportx.xml"
+    include_fulltext = False
+
+    def get_lang_name(self, code):
+        if not code:
+            return ""
+        return _languagelist.get(code, {"native": code})["native"]
+
+    def get_parent(self, meta_type):
+        return IParentGetter(self.context).get_parent_object_of_type(meta_type)
+
+    def get_publication_shortname(self):
+        return self.get_parent("Publication").getId()
+
+    def get_publication_title(self):
+        return self.get_parent("Publication").Title()
+
+    def get_package_journal_volume(self):
+        return self.get_parent("Volume").getId()
+
+    def get_package_journal_volume_title(self):
+        return self.get_parent("Volume").Title()
+
+    _voc_names = {
+        "ddcPlace": "recensio.plone.vocabularies.region_values",
+        "ddcTime": "recensio.plone.vocabularies.epoch_values",
+        "ddcSubject": "recensio.plone.vocabularies.topic_values",
+    }
+
+    def get_voc_title(self, typ, term):
+        factory = getUtility(IVocabularyFactory, self._voc_names[typ])
+        vocab = factory(self.context)
+        try:
+            return vocab.getTerm(term).title or ""
+        except LookupError:
+            return ""
+
+    def list_authors(self):
+        out = ""
+        num = 1
+        for rel in self.context.authors or []:
+            obj = rel.to_object
+            if obj:
+                out += AUTHOR_TMPL % dict(
+                    num=num,
+                    firstname=escape(obj.firstname or ""),
+                    lastname=escape(obj.lastname or ""),
+                )
+                num += 1
+        return out
+
+    def list_editors(self):
+        out = ""
+        num = 1
+        for rel in self.context.editorial or []:
+            obj = rel.to_object
+            if obj:
+                out += EDITOR_TMPL % dict(
+                    num=num,
+                    firstname=escape(obj.firstname or ""),
+                    lastname=escape(obj.lastname or ""),
+                )
+                num += 1
+        return out
+
+
+class XMLRepresentationLZA(XMLRepresentation):
+    include_fulltext = True
+
+
+class XMLRepresentationContainer(XMLRepresentation):
+    def __call__(self):
+        self.request.response.setHeader("Content-type", "application/zip")
+        self.request.response.setHeader(
+            "Content-disposition", "inline;filename=%s" % self.filename
+        )
+        zipdata = self.get_zipdata()
+        self.request.response.setHeader("content-length", str(len(zipdata)))
+        return zipdata
+
+    def issues(self):
+        pc = self.context.portal_catalog
+        parent_path = dict(query="/".join(self.context.getPhysicalPath()))
+        results = pc(review_state="published", portal_type=("Issue"), path=parent_path)
+        for item in results:
+            yield item.getObject()
+
+    def write_zipfile(self, zipfile):
+        for issue in self.issues():
+            xmlview = issue.restrictedTraverse("@@xml")
+            xml = xmlview.template(xmlview)
+            filename = xmlview.filename
+            zipfile.writestr(filename, bytes(xml.encode("utf-8")))
+
+    def get_zipdata(self):
+        stream = BytesIO()
+        zipfile = ZipFile(stream, "w")
+        self.write_zipfile(zipfile)
+        zipfile.close()
+        zipdata = stream.getvalue()
+        stream.close()
+        return zipdata
+
+
+class XMLRepresentationPublication(XMLRepresentationContainer):
+    @property
+    def filename(self):
+        return "recensio_%s.zip" % (self.get_publication_shortname())
+
+
+class XMLRepresentationVolume(XMLRepresentationContainer):
+    @property
+    def filename(self):
+        return "recensio_{}_{}.zip".format(
+            self.get_publication_shortname(),
+            self.get_package_journal_volume(),
+        )
+
+
+class XMLRepresentationIssue(XMLRepresentation):
+
+    def __call__(self):
+        self.request.response.setHeader("Content-type", "application/xml")
+        self.request.response.setHeader(
+            "Content-disposition", "inline;filename=%s" % self.filename
+        )
+        return self.template(self)
+
+    def get_package_journal_pubyear(self):
+        volume = self.get_parent("Volume")
+        return getattr(volume, "year_of_publication", None) or None
+
+    def get_package_journal_issue(self):
+        return self.get_parent("Issue").getId()
+
+    def get_package_journal_issue_title(self):
+        return self.get_parent("Issue").Title()
+
+    @property
+    def filename(self):
+        return "recensio_{}_{}_{}.xml".format(
+            self.get_publication_shortname(),
+            self.get_package_journal_volume(),
+            self.get_package_journal_issue(),
+        )
+
+    def reviews(self):
+        pc = self.context.portal_catalog
+        parent_path = dict(query="/".join(self.context.getPhysicalPath()), depth=3)
+        results = pc(
+            review_state="published", portal_type=REVIEW_TYPES, path=parent_path
+        )
+        for item in results:
+            yield item.getObject()
diff --git a/src/recensio/plone/config.py b/src/recensio/plone/config.py
index f5744429..0df24ef9 100644
--- a/src/recensio/plone/config.py
+++ b/src/recensio/plone/config.py
@@ -5,3 +5,9 @@
     "Review Article Collection",
     "Review Exhibition",
 ]
+REVIEW_TYPES_TO_EXPORT = [
+    "Review Journal",
+    "Review Monograph",
+    "Review Article Journal",
+    "Review Article Collection",
+]
diff --git a/src/recensio/plone/export.py b/src/recensio/plone/export.py
index e02c16ff..a199c02f 100644
--- a/src/recensio/plone/export.py
+++ b/src/recensio/plone/export.py
@@ -1,26 +1,22 @@
-# -* coding: utf-8 *-
-from Acquisition import aq_parent
-from base64 import b64encode
 from datetime import datetime
 from datetime import timedelta
+from datetime import timezone
 from DateTime import DateTime
-from io import FileIO
+from io import StringIO
 from os import path
 from os import remove
 from os import stat
 from plone import api
+from plone.namedfile.file import NamedBlobFile
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.utils import safe_unicode
+from Products.Five.browser import BrowserView
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from recensio.plone.adapter.parentgetter import IParentGetter
-from recensio.plone.interfaces import IRecensioExporter
 from recensio.plone.controlpanel.settings import IRecensioSettings
-from io import StringIO
+from recensio.plone.interfaces import IRecensioExporter
 from tempfile import NamedTemporaryFile
-from Testing.makerequest import makerequest
-from urllib.request import HTTPError
-from urllib.request import Request
-from urllib.request import urlopen
+from urllib.parse import urlparse
 from zExceptions import NotFound
 from zipfile import ZipFile
 from zope.annotation import IAnnotations
@@ -29,24 +25,28 @@
 from zope.component.hooks import getSite
 from zope.component.interfaces import IFactory
 from zope.interface import implementer
-from zope.pagetemplate.pagetemplatefile import PageTemplateFile
 
 import csv
 import logging
+import requests
 import tempfile
 
 
 log = logging.getLogger(__name__)
 
 
-class StatusSuccess(object):
+class ContainerExportView(BrowserView):
+    template = ViewPageTemplateFile("browser/templates/export_container_contextless.pt")
+
+
+class StatusSuccess:
     value = True
 
     def __repr__(self):
         return "Success"
 
 
-class StatusFailure(object):
+class StatusFailure:
     value = False
 
     def __repr__(self):
@@ -60,7 +60,7 @@ def __init__(self, filename):
 
 class StatusSuccessFileCreated(StatusSuccessFile):
     def __repr__(self):
-        return "{0} created".format(self.filename)
+        return f"{self.filename} created"
 
 
 class StatusSuccessFileExists(StatusSuccessFile):
@@ -69,7 +69,7 @@ def __init__(self, filename, modified=None):
         self.modified = modified
 
     def __repr__(self):
-        return "current file found ({0}, {1})".format(self.filename, self.modified)
+        return f"current file found ({self.filename}, {self.modified})"
 
 
 class StatusFailureAlreadyInProgress(StatusFailure):
@@ -77,10 +77,10 @@ def __init__(self, since=None):
         self.since = since
 
     def __repr__(self):
-        return "export in progress since {0}".format(self.since)
+        return f"export in progress since {self.since}"
 
 
-class BaseExporter(object):
+class BaseExporter:
     def get_export_obj(self, portal):
         try:
             export_xml = portal.unrestrictedTraverse(self.export_filename)
@@ -101,7 +101,6 @@ class ChroniconExporter(BaseExporter):
     """Export review metadata (but not full text) to a zip file containing one
     XML file per issue/volume"""
 
-    template = "browser/templates/export_container_contextless.pt"
     export_filename = "export_metadata_xml.zip"
     xml_view_name = "@@xml"
 
@@ -116,48 +115,49 @@ def get_parent(self, meta_type):
         return IParentGetter(self.current_issue).get_parent_object_of_type(meta_type)
 
     def get_publication_shortname(self):
-        return unicode(self.get_parent("Publication").getId(), "utf-8")
+        return self.get_parent("Publication").getId()
 
     def get_publication_title(self):
-        return unicode(self.get_parent("Publication").Title(), "utf-8")
+        return self.get_parent("Publication").Title()
 
     def get_package_journal_volume(self):
-        return unicode(self.get_parent("Volume").getId(), "utf-8")
+        return self.get_parent("Volume").getId()
 
     def get_package_journal_volume_title(self):
-        return unicode(self.get_parent("Volume").Title(), "utf-8")
+        return self.get_parent("Volume").Title()
 
     def get_package_journal_pubyear(self):
-        return self.get_parent("Volume").getYearOfPublication() or None
+        volume = self.get_parent("Volume")
+        return getattr(volume, "year_of_publication", None) or None
 
     def get_package_journal_issue(self):
         issue = self.get_parent("Issue")
         if issue is None:
             return None
-        return unicode(issue.getId(), "utf-8")
+        return issue.getId()
 
     def get_package_journal_issue_title(self):
         issue = self.get_parent("Issue")
         if issue is None:
             return None
-        return unicode(issue.Title(), "utf-8")
+        return issue.Title()
 
     def get_issue_filename(self):
         issue = self.get_package_journal_issue()
         if issue is not None:
-            return "recensio_%s_%s_%s.xml" % (
+            return "recensio_{}_{}_{}.xml".format(
                 self.get_publication_shortname(),
                 self.get_package_journal_volume(),
                 issue,
             )
         else:
-            return "recensio_%s_%s.xml" % (
+            return "recensio_{}_{}.xml".format(
                 self.get_publication_shortname(),
                 self.get_package_journal_volume(),
             )
 
     def finish_issue(self):
-        pt = PageTemplateFile(self.template)
+        view = ContainerExportView(self.current_issue, self.current_issue.REQUEST)
         options = {
             "package": {
                 "publication_title": self.get_publication_title,
@@ -168,7 +168,7 @@ def finish_issue(self):
             "reviews": self.reviews_xml,
         }
         filename = self.get_issue_filename()
-        xml = pt(**options)
+        xml = view.template(**options)
         self.issues_xml[filename] = xml
         self.reviews_xml = []
         self.current_issue = None
@@ -183,17 +183,16 @@ def write_zipfile(self, zipfile):
 
     def get_zipdata(self):
         cache_file_name = self.cache_filename
-        stream = FileIO(cache_file_name, mode="w")
-        zipfile = ZipFile(stream, "w")
-        self.write_zipfile(zipfile)
-        zipfile.close()
-        stream.close()
-
-        stream = FileIO(cache_file_name, mode="r")
-        zipdata = stream.readall()
-        stream.close()
-        remove(cache_file_name)
-        return zipdata
+        try:
+            open(cache_file_name, "wb").close()
+            with NamedTemporaryFile(mode="w+b", suffix=".zip") as stream:
+                with ZipFile(stream, "w") as zf:
+                    self.write_zipfile(zf)
+                stream.seek(0)
+                return stream.read()
+        finally:
+            if path.exists(cache_file_name):
+                remove(cache_file_name)
 
     def running_export(self):
         if path.exists(self.cache_filename):
@@ -232,8 +231,12 @@ def export(self):
         type_info = pt.getTypeInfo("File")
         if export_xml_obj is None:
             export_xml_obj = type_info._constructInstance(portal, self.export_filename)
-        export_xml_obj.setFile(self.get_zipdata(), filename=self.export_filename)
-        export_xml_obj.setModificationDate(DateTime())
+        export_xml_obj.file = NamedBlobFile(
+            data=self.get_zipdata(),
+            filename=self.export_filename,
+            contentType="application/zip",
+        )
+        export_xml_obj.modification_date = datetime.now(timezone.utc)
         return StatusSuccessFileCreated(self.export_filename)
 
 
@@ -251,16 +254,14 @@ def needs_to_run(self):
         return not self.is_recent(export_file)
 
     def add_review(self, review):
-        if review.getBv():
-            try:
-                use_canonical = review.isUseCanonicalUriForBVID()
-            except AttributeError:
-                use_canonical = False
+        bv = getattr(review, "bv", None)
+        if bv:
+            use_canonical = getattr(review, "use_canonical_uri_for_bvid", False)
             if use_canonical:
-                url = review.getCanonical_uri()
+                url = getattr(review, "canonical_uri", "") or review.absolute_url()
             else:
                 url = review.absolute_url()
-            self.items.append((review.getBv(), url))
+            self.items.append((bv, url))
 
     def export(self):
         csvfile = StringIO()
@@ -275,11 +276,40 @@ def export(self):
             type_info = pt.getTypeInfo("File")
             export_file = type_info._constructInstance(portal, self.export_filename)
 
-        export_file.setFile(csvfile.getvalue(), filename=self.export_filename)
-        export_file.setModificationDate(DateTime())
+        export_file.file = NamedBlobFile(
+            data=csvfile.getvalue().encode("utf-8"),
+            filename=self.export_filename,
+            contentType="text/csv",
+        )
+        export_file.modification_date = datetime.now(timezone.utc)
         return StatusSuccessFileCreated(self.export_filename)
 
 
+@implementer(IRecensioExporter)
+class MissingBVIDExporter(BVIDExporter):
+
+    export_filename = "missing_bvid.csv"
+
+    def add_review(self, review):
+        bv = getattr(review, "bv", None)
+        if not bv:
+            isbn_or_issn = (
+                getattr(review, "isbn", None) or getattr(review, "issn", None) or ""
+            )
+            self.items.append((review.UID(), isbn_or_issn))
+
+
+class DaraExporter(BaseExporter):
+    def __init__(self):
+        self.reviews_xml = []
+
+    def add_review(self, review):
+        self.reviews_xml.append(review.restrictedTraverse("@@xml-dara")())
+
+    def export(self):
+        pass
+
+
 class LZAExporter(ChroniconExporter):
     """Like ChroniconExporter but
     * also exports full text (PDF)
@@ -289,7 +319,7 @@ class LZAExporter(ChroniconExporter):
     xml_view_name = "@@xml-lza"
 
     def __init__(self):
-        super(LZAExporter, self).__init__()
+        super().__init__()
         self.reviews_pdf = {}
 
     @property
@@ -297,7 +327,7 @@ def cache_filename(self):
         return path.join(tempfile.gettempdir(), "lza_cache.zip")
 
     def _set_exported(self, review, value=True):
-        IAnnotations(review)["LZA_EXPORTED"] = value and True or False
+        IAnnotations(review)["LZA_EXPORTED"] = bool(value)
 
     def _is_exported(self, review):
         return IAnnotations(review).get("LZA_EXPORTED")
@@ -305,42 +335,29 @@ def _is_exported(self, review):
     def add_review(self, review):
         if self._is_exported(review):
             return
-        super(LZAExporter, self).add_review(review)
+        super().add_review(review)
         pdf_path = "/".join(review.getPhysicalPath()[2:]) + ".pdf"
-        pdf_blob = review.get_review_pdf()["blob"].open()
-        self.reviews_pdf[pdf_path] = pdf_blob.read()
-        pdf_blob.close()
+        review_view = api.content.get_view(
+            name="review", context=review, request=review.REQUEST
+        )
+        review_pdf = review_view.get_review_pdf()
+        if review_pdf:
+            self.reviews_pdf[pdf_path] = review_pdf
         self._set_exported(review)
 
     def write_zipfile(self, zipfile):
-        super(LZAExporter, self).write_zipfile(zipfile)
-        for filename, pdf in self.reviews_pdf.items():
-            zipfile.writestr(filename, bytes(pdf))
-
-
-@implementer(IRecensioExporter)
-class MissingBVIDExporter(BVIDExporter):
-
-    export_filename = "missing_bvid.csv"
-
-    def add_review(self, review):
-        if not review.getBv():
-            if hasattr(review, "getIsbn"):
-                isbn_or_issn = review.getIsbn()
-            else:
-                isbn_or_issn = review.getIssn()
-            self.items.append((review.UID(), isbn_or_issn))
-
-
-class DaraExporter(BaseExporter):
-    def __init__(self):
-        self.reviews_xml = []
-
-    def add_review(self, review):
-        self.reviews_xml.append(review.restrictedTraverse("@@xml-dara")())
-
-    def export(self):
-        pass
+        super().write_zipfile(zipfile)
+        for filename, review_pdf in self.reviews_pdf.items():
+            pdf_blob = review_pdf.open()
+            try:
+                with zipfile.open(filename, "w") as zip_entry:
+                    while True:
+                        chunk = pdf_blob.read(64 * 1024)
+                        if not chunk:
+                            break
+                        zip_entry.write(chunk)
+            finally:
+                pdf_blob.close()
 
 
 BVIDExporterFactory = Factory(BVIDExporter, IFactory, "exporter")
@@ -354,39 +371,42 @@ def register_doi_raw(obj):
     settings = registry.forInterface(IRecensioSettings)
     username = settings.doi_registration_username
     password = settings.doi_registration_password
-    auth = b64encode("{0}:{1}".format(username, password))
-    url = settings.doi_registration_url.encode("utf-8")
+    url = settings.doi_registration_url
+    if urlparse(url).scheme not in ("http", "https"):
+        raise ValueError(f"Disallowed URL scheme for DOI registration: {url!r}")
 
     xml = obj.restrictedTraverse("@@xml-dara")().encode("utf-8")
-    headers = {
-        "Content-type": "application/xml;charset=UTF-8",
-        "Authorization": "Basic " + auth,
-    }
-    result = urlopen(Request(url, xml, headers))
-    return_code = result.getcode()
-    result.close()
-    return return_code
+    response = requests.post(
+        url,
+        data=xml,
+        headers={"Content-Type": "application/xml;charset=UTF-8"},
+        auth=(username, password),
+        timeout=30,
+    )
+    response.raise_for_status()
+    return response.status_code
 
 
 def register_doi(obj):
     try:
         return_code = register_doi_raw(obj)
-    except HTTPError as e:
-        if e.code == 401:
+    except requests.exceptions.HTTPError as e:
+        status_code = e.response.status_code
+        if status_code == 401:
             message = (
-                "Dara login failed - check DOI registration " "user name and password"
+                "Dara login failed - check DOI registration user name and password"
             )
-        elif e.code == 400:
+        elif status_code == 400:
             message = "Request rejected by dara - check generated XML"
-        elif e.code == 500:
+        elif status_code == 500:
             message = "Dara server error - try again later"
         else:
-            message = "Error returned by dara server: {0}".format(e)
+            message = f"Error returned by dara server: {e}"
         status = "error"
         log.error(message)
-        body = e.read()
+        body = e.response.text
         if "\n" in body:
-            dump_file = NamedTemporaryFile(suffix=".html", delete=False)
+            dump_file = NamedTemporaryFile(suffix=".html", delete=False, mode="w")
             dump_file.write(body)
             dump_file.close()
             log.info("HTTPError dumped to " + dump_file.name)
@@ -396,7 +416,7 @@ def register_doi(obj):
         exc_msg = e.__class__.__name__ + ": " + str(e)
         message = "Error while updating dara record (" + exc_msg + ")"
         status = "error"
-    except IOError as e:
+    except OSError as e:
         exc_msg = e.__class__.__name__ + ": " + str(e)
         message = "Error contacting dara server (" + exc_msg + ")"
         status = "error"
@@ -406,7 +426,6 @@ def register_doi(obj):
         elif return_code == 200:
             message = "Metadata updated"
         else:
-            message = "Success (status {0})".format(return_code)
+            message = f"Success (status {return_code})"
         status = "success"
     return status, message
-
diff --git a/src/recensio/plone/interfaces.py b/src/recensio/plone/interfaces.py
index dada0c20..fb893c8a 100644
--- a/src/recensio/plone/interfaces.py
+++ b/src/recensio/plone/interfaces.py
@@ -9,6 +9,7 @@ class IRecensioPloneLayer(IDefaultBrowserLayer):
 class IReview(Interface):
     """Marker interface for reviews and other select content types."""
 
+
 class IRecensioExporter(Interface):
     """Interface for bulk exporting review data"""
 
diff --git a/src/recensio/plone/tests/test_exporters.py b/src/recensio/plone/tests/test_exporters.py
new file mode 100644
index 00000000..7b085d56
--- /dev/null
+++ b/src/recensio/plone/tests/test_exporters.py
@@ -0,0 +1,569 @@
+"""Tests for recensio.plone.export exporter classes."""
+
+from io import BytesIO
+from plone import api
+from plone.app.testing import setRoles
+from plone.app.testing import SITE_OWNER_NAME
+from plone.app.testing import TEST_USER_ID
+from recensio.plone.export import BVIDExporter
+from recensio.plone.export import ChroniconExporter
+from recensio.plone.export import LZAExporter
+from recensio.plone.export import MissingBVIDExporter
+from recensio.plone.export import register_doi
+from recensio.plone.export import register_doi_raw
+from recensio.plone.export import StatusFailureAlreadyInProgress
+from recensio.plone.export import StatusSuccessFileCreated
+from recensio.plone.export import StatusSuccessFileExists
+from recensio.plone.testing import RECENSIO_PLONE_INTEGRATION_TESTING
+from unittest.mock import MagicMock
+from unittest.mock import patch
+from zipfile import ZipFile
+
+import requests
+import unittest
+
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+
+def _make_review(container, portal_type="Review Monograph", **kw):
+    """Create a minimal review inside *container* and return it."""
+    obj_id = kw.pop("id", "review-%s" % portal_type.replace(" ", "-").lower())
+    with api.env.adopt_user(SITE_OWNER_NAME):
+        review = api.content.create(
+            type=portal_type,
+            id=obj_id,
+            title=kw.pop("title", "A review"),
+            container=container,
+            **kw,
+        )
+    return review
+
+
+def _make_container(portal):
+    """Return a Publication / Volume / Issue hierarchy suitable for tests."""
+    with api.env.adopt_user(SITE_OWNER_NAME):
+        folder = api.content.create(
+            type="Folder",
+            id="test-reviews",
+            title="Test Reviews",
+            container=portal,
+        )
+        pub = api.content.create(
+            type="Publication",
+            id="test-pub",
+            title="Test Publication",
+            container=folder,
+        )
+        vol = api.content.create(
+            type="Volume",
+            id="test-vol",
+            title="Test Volume",
+            container=pub,
+        )
+        issue = api.content.create(
+            type="Issue",
+            id="test-issue",
+            title="Test Issue",
+            container=vol,
+        )
+    return pub, vol, issue
+
+
+# ---------------------------------------------------------------------------
+# Status objects
+# ---------------------------------------------------------------------------
+
+
+class TestStatusObjects(unittest.TestCase):
+
+    def test_success_file_created_repr(self):
+        s = StatusSuccessFileCreated("myfile.zip")
+        self.assertIn("myfile.zip", repr(s))
+        self.assertTrue(s.value)
+
+    def test_success_file_exists_repr(self):
+        s = StatusSuccessFileExists("myfile.zip", "2026-01-01")
+        self.assertIn("myfile.zip", repr(s))
+        self.assertTrue(s.value)
+
+    def test_failure_in_progress_repr(self):
+        s = StatusFailureAlreadyInProgress("2026-01-01T10:00:00")
+        self.assertIn("2026-01-01", repr(s))
+        self.assertFalse(s.value)
+
+
+# ---------------------------------------------------------------------------
+# BVIDExporter
+# ---------------------------------------------------------------------------
+
+
+class TestBVIDExporter(unittest.TestCase):
+
+    layer = RECENSIO_PLONE_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.portal = self.layer["portal"]
+        self.request = self.layer["request"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        pub, vol, self.issue = _make_container(self.portal)
+
+    def tearDown(self):
+        with api.env.adopt_user(SITE_OWNER_NAME):
+            api.content.delete(self.portal["test-reviews"])
+
+    def _make_review_with_bv(self, bv="BV12345", **kw):
+        review = _make_review(self.issue, **kw)
+        review.bv = bv
+        return review
+
+    def test_add_review_without_bv_is_ignored(self):
+        review = _make_review(self.issue)
+        review.bv = None
+        exporter = BVIDExporter()
+        exporter.add_review(review)
+        self.assertEqual(exporter.items, [])
+
+    def test_add_review_with_bv_appends_url(self):
+        review = self._make_review_with_bv()
+        exporter = BVIDExporter()
+        exporter.add_review(review)
+        self.assertEqual(len(exporter.items), 1)
+        bv, url = exporter.items[0]
+        self.assertEqual(bv, "BV12345")
+        self.assertIn("review-", url)
+
+    def test_add_review_uses_canonical_uri_when_configured(self):
+        review = self._make_review_with_bv()
+        review.use_canonical_uri_for_bvid = True
+        review.canonical_uri = "https://example.org/canonical"
+        exporter = BVIDExporter()
+        exporter.add_review(review)
+        _, url = exporter.items[0]
+        self.assertEqual(url, "https://example.org/canonical")
+
+    def test_add_review_falls_back_to_absolute_url_when_canonical_empty(self):
+        review = self._make_review_with_bv()
+        review.use_canonical_uri_for_bvid = True
+        review.canonical_uri = ""
+        exporter = BVIDExporter()
+        exporter.add_review(review)
+        _, url = exporter.items[0]
+        self.assertTrue(url.startswith("http"))
+
+    def test_bv_and_url_captured_in_items(self):
+        review = self._make_review_with_bv(bv="BV99999")
+        review.canonical_uri = "https://example.org/r"
+        review.use_canonical_uri_for_bvid = True
+        exporter = BVIDExporter()
+        exporter.add_review(review)
+        self.assertEqual(len(exporter.items), 1)
+        bv, url = exporter.items[0]
+        self.assertEqual(bv, "BV99999")
+        self.assertEqual(url, "https://example.org/r")
+
+
+# ---------------------------------------------------------------------------
+# MissingBVIDExporter
+# ---------------------------------------------------------------------------
+
+
+class TestMissingBVIDExporter(unittest.TestCase):
+
+    layer = RECENSIO_PLONE_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        pub, vol, self.issue = _make_container(self.portal)
+
+    def tearDown(self):
+        with api.env.adopt_user(SITE_OWNER_NAME):
+            api.content.delete(self.portal["test-reviews"])
+
+    def test_review_without_bv_is_recorded(self):
+        review = _make_review(self.issue)
+        review.bv = None
+        review.isbn = "978-3-16-148410-0"
+        exporter = MissingBVIDExporter()
+        exporter.add_review(review)
+        self.assertEqual(len(exporter.items), 1)
+        uid, isbn_or_issn = exporter.items[0]
+        self.assertEqual(uid, review.UID())
+        self.assertEqual(isbn_or_issn, "978-3-16-148410-0")
+
+    def test_review_with_bv_is_skipped(self):
+        review = _make_review(self.issue)
+        review.bv = "BV12345"
+        exporter = MissingBVIDExporter()
+        exporter.add_review(review)
+        self.assertEqual(exporter.items, [])
+
+    def test_review_without_isbn_or_issn_records_empty_string(self):
+        review = _make_review(self.issue)
+        review.bv = None
+        review.isbn = None
+        review.issn = None
+        exporter = MissingBVIDExporter()
+        exporter.add_review(review)
+        uid, isbn_or_issn = exporter.items[0]
+        self.assertEqual(isbn_or_issn, "")
+
+    def test_export_filename(self):
+        self.assertEqual(MissingBVIDExporter.export_filename, "missing_bvid.csv")
+
+
+# ---------------------------------------------------------------------------
+# ChroniconExporter
+# ---------------------------------------------------------------------------
+
+
+class TestChroniconExporter(unittest.TestCase):
+
+    layer = RECENSIO_PLONE_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        self.pub, self.vol, self.issue = _make_container(self.portal)
+
+    def tearDown(self):
+        with api.env.adopt_user(SITE_OWNER_NAME):
+            api.content.delete(self.portal["test-reviews"])
+
+    def test_get_issue_filename_with_issue(self):
+        exporter = ChroniconExporter()
+        exporter.current_issue = self.issue
+        filename = exporter.get_issue_filename()
+        self.assertIn("recensio_", filename)
+        self.assertIn("test-pub", filename)
+        self.assertIn("test-vol", filename)
+        self.assertIn("test-issue", filename)
+        self.assertTrue(filename.endswith(".xml"))
+
+    def test_get_issue_filename_without_issue_uses_volume(self):
+        exporter = ChroniconExporter()
+        exporter.current_issue = self.vol
+        filename = exporter.get_issue_filename()
+        self.assertNotIn("test-issue", filename)
+        self.assertIn("test-vol", filename)
+        self.assertTrue(filename.endswith(".xml"))
+
+    def test_add_review_calls_xml_view(self):
+        review = _make_review(self.issue)
+        xml_view = MagicMock(return_value="<review/>")
+        exporter = ChroniconExporter()
+        with patch.object(
+            review, "restrictedTraverse", return_value=xml_view
+        ) as mock_rt:
+            exporter.add_review(review)
+            mock_rt.assert_called_once_with(exporter.xml_view_name)
+        xml_view.assert_called_once()
+        self.assertEqual(exporter.reviews_xml, ["<review/>"])
+        self.assertEqual(exporter.current_issue, self.issue)
+
+    def test_add_review_finishes_previous_issue_on_change(self):
+        review1 = _make_review(self.issue, id="r1")
+        # create a second issue
+        with api.env.adopt_user(SITE_OWNER_NAME):
+            issue2 = api.content.create(
+                type="Issue", id="issue2", title="Issue 2", container=self.vol
+            )
+        review2 = _make_review(issue2, id="r2")
+
+        exporter = ChroniconExporter()
+        xml1 = MagicMock(return_value="<review id='1'/>")
+        xml2 = MagicMock(return_value="<review id='2'/>")
+
+        # Patch finish_issue so we can record when it fires
+        finished = []
+
+        def capturing_finish():
+            finished.append(exporter.current_issue)
+            # minimal stub: just clear state without rendering template
+            exporter.issues_xml[exporter.get_issue_filename()] = "stub"
+            exporter.reviews_xml = []
+            exporter.current_issue = None
+
+        exporter.finish_issue = capturing_finish
+
+        with patch.object(review1, "restrictedTraverse", return_value=xml1):
+            exporter.add_review(review1)
+        with patch.object(review2, "restrictedTraverse", return_value=xml2):
+            exporter.add_review(review2)
+
+        self.assertEqual(len(finished), 1)
+        self.assertEqual(finished[0], self.issue)
+        self.assertEqual(exporter.current_issue, issue2)
+
+    def test_running_export_returns_none_when_no_cache(self):
+        exporter = ChroniconExporter()
+        with patch("recensio.plone.export.path.exists", return_value=False):
+            self.assertIsNone(exporter.running_export())
+
+    def test_export_produces_zip_with_xml_entries(self):
+        exporter = ChroniconExporter()
+        exporter.issues_xml = {"recensio_test-pub_test-vol_test-issue.xml": "<rms/>"}
+        zipdata = exporter.get_zipdata()
+        zf = ZipFile(BytesIO(zipdata))
+        self.assertIn("recensio_test-pub_test-vol_test-issue.xml", zf.namelist())
+
+    def test_export_returns_in_progress_when_cache_exists(self):
+        from datetime import datetime
+
+        exporter = ChroniconExporter()
+        exporter.issues_xml = {}
+        with patch.object(exporter, "running_export", return_value=datetime.now()):
+            result = exporter.export()
+        self.assertIsInstance(result, StatusFailureAlreadyInProgress)
+
+
+# ---------------------------------------------------------------------------
+# LZAExporter
+# ---------------------------------------------------------------------------
+
+
+class TestLZAExporter(unittest.TestCase):
+
+    layer = RECENSIO_PLONE_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        self.pub, self.vol, self.issue = _make_container(self.portal)
+
+    def tearDown(self):
+        with api.env.adopt_user(SITE_OWNER_NAME):
+            api.content.delete(self.portal["test-reviews"])
+
+    def test_export_filename(self):
+        self.assertEqual(LZAExporter.export_filename, "export_lza_xml.zip")
+
+    def test_xml_view_name(self):
+        self.assertEqual(LZAExporter.xml_view_name, "@@xml-lza")
+
+    def test_set_and_check_exported_flag(self):
+        review = _make_review(self.issue)
+        exporter = LZAExporter()
+        self.assertFalse(exporter._is_exported(review))
+        exporter._set_exported(review)
+        self.assertTrue(exporter._is_exported(review))
+
+    def test_set_exported_false_clears_flag(self):
+        review = _make_review(self.issue)
+        exporter = LZAExporter()
+        exporter._set_exported(review, True)
+        exporter._set_exported(review, False)
+        self.assertFalse(exporter._is_exported(review))
+
+    def test_already_exported_review_is_skipped(self):
+        review = _make_review(self.issue)
+        exporter = LZAExporter()
+        exporter._set_exported(review)
+        xml_view = MagicMock(return_value="<review/>")
+        with patch.object(review, "restrictedTraverse", return_value=xml_view):
+            exporter.add_review(review)
+        xml_view.assert_not_called()
+        self.assertEqual(exporter.reviews_xml, [])
+
+    def test_new_review_is_added_and_marked(self):
+        review = _make_review(self.issue)
+        exporter = LZAExporter()
+        xml_view = MagicMock(return_value="<review/>")
+        review_view = MagicMock()
+        review_view.get_review_pdf.return_value = None
+        with patch.object(review, "restrictedTraverse", return_value=xml_view):
+            with patch(
+                "recensio.plone.export.api.content.get_view", return_value=review_view
+            ):
+                exporter.add_review(review)
+        self.assertTrue(exporter._is_exported(review))
+        self.assertEqual(exporter.reviews_xml, ["<review/>"])
+
+    def test_pdf_included_in_zip_when_present(self):
+        review = _make_review(self.issue)
+        exporter = LZAExporter()
+        xml_view = MagicMock(return_value="<review/>")
+        fake_pdf = MagicMock()
+        fake_pdf.open.return_value.__enter__ = lambda s: s
+        fake_pdf.open.return_value.__exit__ = MagicMock(return_value=False)
+        fake_pdf_blob = MagicMock()
+        fake_pdf_blob.read.side_effect = [b"%PDF-fake", b""]
+        fake_pdf.open.return_value = fake_pdf_blob
+        review_view = MagicMock()
+        review_view.get_review_pdf.return_value = fake_pdf
+
+        with patch.object(review, "restrictedTraverse", return_value=xml_view):
+            with patch(
+                "recensio.plone.export.api.content.get_view", return_value=review_view
+            ):
+                exporter.add_review(review)
+
+        exporter.issues_xml["dummy.xml"] = "<rms/>"
+        buf = BytesIO()
+        zf = ZipFile(buf, "w")
+        exporter.write_zipfile(zf)
+        zf.close()
+        buf.seek(0)
+        names = ZipFile(buf).namelist()
+        pdf_entries = [n for n in names if n.endswith(".pdf")]
+        self.assertEqual(len(pdf_entries), 1)
+
+
+# ---------------------------------------------------------------------------
+# register_doi / register_doi_raw
+# ---------------------------------------------------------------------------
+
+
+class TestRegisterDoi(unittest.TestCase):
+
+    layer = RECENSIO_PLONE_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.portal = self.layer["portal"]
+        self.request = self.layer["request"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        pub, vol, self.issue = _make_container(self.portal)
+        self.review = _make_review(self.issue)
+
+    def tearDown(self):
+        with api.env.adopt_user(SITE_OWNER_NAME):
+            api.content.delete(self.portal["test-reviews"])
+
+    def _mock_settings(self):
+        settings = MagicMock()
+        settings.doi_registration_username = "user"
+        settings.doi_registration_password = "pass"
+        settings.doi_registration_url = "https://dara.example.org/api"
+        registry = MagicMock()
+        registry.forInterface.return_value = settings
+        return registry
+
+    def _mock_response(self, status_code):
+        response = MagicMock()
+        response.status_code = status_code
+        response.text = ""
+        response.raise_for_status.return_value = None
+        return response
+
+    def _mock_http_error(self, status_code, body=""):
+        response = MagicMock()
+        response.status_code = status_code
+        response.text = body
+        err = requests.exceptions.HTTPError(response=response)
+        return err
+
+    def test_register_doi_raw_posts_with_basic_auth(self):
+        registry = self._mock_settings()
+        xml_view = MagicMock(return_value="<dara_xml/>")
+        fake_response = self._mock_response(201)
+
+        with patch("recensio.plone.export.queryUtility", return_value=registry):
+            with patch.object(self.review, "restrictedTraverse", return_value=xml_view):
+                with patch(
+                    "recensio.plone.export.requests.post", return_value=fake_response
+                ) as mock_post:
+                    code = register_doi_raw(self.review)
+
+        self.assertEqual(code, 201)
+        _args, kwargs = mock_post.call_args
+        self.assertEqual(kwargs["auth"], ("user", "pass"))
+        self.assertIn("application/xml", kwargs["headers"]["Content-Type"])
+
+    def test_register_doi_returns_success_on_201(self):
+        registry = self._mock_settings()
+        xml_view = MagicMock(return_value="<dara_xml/>")
+        fake_response = self._mock_response(201)
+
+        with patch("recensio.plone.export.queryUtility", return_value=registry):
+            with patch.object(self.review, "restrictedTraverse", return_value=xml_view):
+                with patch(
+                    "recensio.plone.export.requests.post", return_value=fake_response
+                ):
+                    status, message = register_doi(self.review)
+
+        self.assertEqual(status, "success")
+        self.assertIn("registered", message)
+
+    def test_register_doi_returns_success_on_200(self):
+        registry = self._mock_settings()
+        xml_view = MagicMock(return_value="<dara_xml/>")
+        fake_response = self._mock_response(200)
+
+        with patch("recensio.plone.export.queryUtility", return_value=registry):
+            with patch.object(self.review, "restrictedTraverse", return_value=xml_view):
+                with patch(
+                    "recensio.plone.export.requests.post", return_value=fake_response
+                ):
+                    status, message = register_doi(self.review)
+
+        self.assertEqual(status, "success")
+        self.assertIn("updated", message.lower())
+
+    def test_register_doi_handles_401(self):
+        registry = self._mock_settings()
+        xml_view = MagicMock(return_value="<dara_xml/>")
+        err = self._mock_http_error(401)
+
+        with patch("recensio.plone.export.queryUtility", return_value=registry):
+            with patch.object(self.review, "restrictedTraverse", return_value=xml_view):
+                with patch("recensio.plone.export.requests.post", side_effect=err):
+                    status, message = register_doi(self.review)
+
+        self.assertEqual(status, "error")
+        self.assertIn("login", message.lower())
+
+    def test_register_doi_handles_400(self):
+        registry = self._mock_settings()
+        xml_view = MagicMock(return_value="<dara_xml/>")
+        err = self._mock_http_error(400)
+
+        with patch("recensio.plone.export.queryUtility", return_value=registry):
+            with patch.object(self.review, "restrictedTraverse", return_value=xml_view):
+                with patch("recensio.plone.export.requests.post", side_effect=err):
+                    status, message = register_doi(self.review)
+
+        self.assertEqual(status, "error")
+        self.assertIn("xml", message.lower())
+
+    def test_register_doi_handles_connection_error(self):
+        registry = self._mock_settings()
+        xml_view = MagicMock(return_value="<dara_xml/>")
+
+        with patch("recensio.plone.export.queryUtility", return_value=registry):
+            with patch.object(self.review, "restrictedTraverse", return_value=xml_view):
+                with patch(
+                    "recensio.plone.export.requests.post",
+                    side_effect=OSError("connection refused"),
+                ):
+                    status, message = register_doi(self.review)
+
+        self.assertEqual(status, "error")
+        self.assertIn("contacting", message.lower())
+
+    def test_register_doi_raw_rejects_non_http_scheme(self):
+        registry = self._mock_settings()
+        registry.forInterface.return_value.doi_registration_url = "file:///etc/passwd"
+        xml_view = MagicMock(return_value="<dara_xml/>")
+
+        with patch("recensio.plone.export.queryUtility", return_value=registry):
+            with patch.object(self.review, "restrictedTraverse", return_value=xml_view):
+                with self.assertRaises(ValueError):
+                    register_doi_raw(self.review)
+
+    def test_register_doi_handles_valueerror(self):
+        registry = self._mock_settings()
+        xml_view = MagicMock(return_value="<dara_xml/>")
+
+        with patch("recensio.plone.export.queryUtility", return_value=registry):
+            with patch.object(self.review, "restrictedTraverse", return_value=xml_view):
+                with patch(
+                    "recensio.plone.export.requests.post",
+                    side_effect=ValueError("bad url"),
+                ):
+                    status, message = register_doi(self.review)
+
+        self.assertEqual(status, "error")
+        self.assertIn("updating", message.lower())
diff --git a/src/recensio/plone/upgrades/v2/20251030142106_facets_demo/registry/solr.xml b/src/recensio/plone/upgrades/v2/20251030142106_facets_demo/registry/solr.xml
index f5684243..50681006 100644
--- a/src/recensio/plone/upgrades/v2/20251030142106_facets_demo/registry/solr.xml
+++ b/src/recensio/plone/upgrades/v2/20251030142106_facets_demo/registry/solr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
-    <records interface="collective.solr.interfaces.ISolrSchema"
+  <records interface="collective.solr.interfaces.ISolrSchema"
            prefix="collective.solr"
   >
     <value key="facets">

From 98600f728629cef6442f1c91546754e10ef2c830 Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Fri, 17 Apr 2026 10:39:17 +0200
Subject: [PATCH 3/5] Update docs/recensio-exports.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 docs/recensio-exports.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/recensio-exports.md b/docs/recensio-exports.md
index b68f71ee..c8c23554 100644
--- a/docs/recensio-exports.md
+++ b/docs/recensio-exports.md
@@ -253,7 +253,7 @@ Registration:
 
 - ZCML name: `metadata-export`
 - context: `Products.CMFPlone.interfaces.IPloneSiteRoot`
-- permission: `zope2.View`
+- permission: `cmf.ModifyPortalContent`
 
 Usage URL:
 

From 41aba44ba69f0d7c6062b3ab7aa9d69c7b780eab Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Fri, 17 Apr 2026 10:40:59 +0200
Subject: [PATCH 4/5] Update docs/recensio-exports.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 docs/recensio-exports.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/recensio-exports.md b/docs/recensio-exports.md
index c8c23554..e8520022 100644
--- a/docs/recensio-exports.md
+++ b/docs/recensio-exports.md
@@ -240,7 +240,7 @@ Purpose:
 What it does:
 
 - uses a portal annotation key
-  `recensio.policy.metadata_export_timestamp`
+  `recensio.plone.metadata_export_timestamp`
   as a coarse lock
 - refuses to start if an export has run within the last 2 hours
 - accepts a `force` request parameter to clear that lock first

From 5159365d317a7c0d3304fe0ffa17d5e8fe3050ef Mon Sep 17 00:00:00 2001
From: Alexander Pilz <pilz@syslab.com>
Date: Fri, 17 Apr 2026 10:41:24 +0200
Subject: [PATCH 5/5] Update
 src/recensio/plone/browser/templates/export_container_contextless.pt

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../plone/browser/templates/export_container_contextless.pt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/recensio/plone/browser/templates/export_container_contextless.pt b/src/recensio/plone/browser/templates/export_container_contextless.pt
index 8c991c2a..e03f9780 100644
--- a/src/recensio/plone/browser/templates/export_container_contextless.pt
+++ b/src/recensio/plone/browser/templates/export_container_contextless.pt
@@ -5,7 +5,7 @@
                   package_journal_name="Jahrbuch des Bundesinstituts für Kultur und Geschichte der Deutschen im östlichen Europa"
                   package_journal_pubyear="2012"
                   package_journal_volume="20"
-                  xsi:nonamespaceschemalocation="recensio_frompublisher_2015-09-02.xsd"
+                  xsi:noNamespaceSchemaLocation="recensio_frompublisher_2015-09-02.xsd"
                   tal:attributes="
                     package_journal_name options/package/publication_title;
                     package_journal_volume options/package/package_journal_volume_title;