Fixes the new line problems in the OSQA exporter.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@739 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum_modules/exporter/exporter.py b/forum_modules/exporter/exporter.py
index df1237f004f72b55201352b7292f3b6bd5fdbbf1..c54e758ce99fd746d6645e29080249917ac131c1 100644 (file)
--- a/forum_modules/exporter/exporter.py
+++ b/forum_modules/exporter/exporter.py
@@ -65,7 +65,7 @@ def Etree_pretty__write(self, file, node, encoding, namespaces,
         if node.text or len(node):
             file.write(">")
             if node.text:
-                file.write(_escape_cdata(node.text.replace("\n", (level + 1) * identator + "\n"), encoding))
+                file.write(_escape_cdata(node.text, encoding))
             for n in node:
                 self._write(file, n, encoding, namespaces, level + 1, identator)
             if node.text and len(node.text) < 125:
@@ -77,7 +77,7 @@ def Etree_pretty__write(self, file, node, encoding, namespaces,
         for k, v in xmlns_items:
             del namespaces[v]
     if node.tail:
-        file.write(_escape_cdata(node.tail.replace("\n", level * identator + "\n"), encoding))
+        file.write(_escape_cdata(node.tail.replace("\n", (level * identator )+ "\n"), encoding))
 
 def make_date(date, with_time=True):
     try:
@@ -187,7 +187,7 @@ def create_targz(tmp, files, start_time, options, user, state, set_state):
     with open(os.path.join(tmp, 'backup.inf'), 'wb') as inffile:
         inf.write(inffile)
 
-    t.add(os.path.join(tmp, '/backup.inf'), arcname='backup.inf')
+    t.add(os.path.join(tmp, 'backup.inf'), arcname='backup.inf')
     state['overall']['status'] = _('Saving backup file')
     set_state()
     t.close()

diff --git a/forum_modules/exporter/urls.py b/forum_modules/exporter/urls.py
index 6c92c6c90f41094315962ce8bb118823133cc64b..e9b35aae691b5776f451a7082e73f327ad903410 100644 (file)
--- a/forum_modules/exporter/urls.py
+++ b/forum_modules/exporter/urls.py
@@ -2,10 +2,10 @@ from django.conf.urls.defaults import *
 from django.views.generic.simple import direct_to_template
 from django.utils.translation import ugettext as _
 
-from views import state, running, download, importer
+from views import state, running, download
 
 urlpatterns = patterns('',
     url(r'^%s%s%s$' % (_('admin/'), _('exporter/'), _('state/')),  state, name='exporter_state'),
     url(r'^%s(?P<mode>\w+)/%s$' % (_('admin/'), _('running/')),  running, name='exporter_running'),
     url(r'^%s%s%s$' % (_('admin/'), _('exporter/'), _('download/')),  download, name='exporter_download'),
-)
\ No newline at end of file
+)