--- a/src/cm/views/texts.py Mon Jun 25 21:15:03 2012 +0200
+++ b/src/cm/views/texts.py Tue Jul 31 16:37:23 2012 +0200
@@ -16,7 +16,7 @@
insert_comment_markers
from cm.utils.spannifier import spannify
from cm.views import get_keys_from_dict, get_textversion_by_keys_or_404, get_text_by_keys_or_404, redirect
-from cm.views.export import content_export2, content_export
+from cm.views.export import content_export2, content_export, xml_export
from cm.views.user import AnonUserRoleForm, cm_login
from difflib import unified_diff
from django import forms
@@ -311,12 +311,16 @@
def text_export(request, key, format, download, whichcomments, withcolor, adminkey=None):
text, admin = get_text_and_admin(key, adminkey)
text_version = text.get_latest_version()
+
+ if format == 'xml':
+ return xml_export(request, text_version, whichcomments)
+
original_content = text_version.content
original_format = text_version.format # BD : html or markdown for now ...
download_response = download == "1"
with_color = withcolor == "1"
-
+
comments = [] # whichcomments=="none"
if whichcomments == "filtered" or whichcomments == "all":
@@ -341,7 +345,7 @@
use_pandoc = True
elif format in ('pdf', 'odt') :
use_pandoc = (original_format == "markdown")
- elif format in ('docx', 'doc', 'html') :
+ elif format in ('docx', 'doc', 'html', 'xml') :
use_pandoc = False
# correct attach path => real path