From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 30 Nov 2010 15:12:40 +0000 (+0000)
Subject: A couple more fixes.
X-Git-Tag: live~514
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/1ce80ee5cc6fc5d11708cbff3d835bdaf2d14f9d?ds=sidebyside

A couple more fixes.

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

diff --git a/forum_modules/exporter/exporter.py b/forum_modules/exporter/exporter.py
index 725a310..df1237f 100644
--- a/forum_modules/exporter/exporter.py
+++ b/forum_modules/exporter/exporter.py
@@ -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/views.py b/forum_modules/exporter/views.py
index e6b2e8b..3709037 100644
--- a/forum_modules/exporter/views.py
+++ b/forum_modules/exporter/views.py
@@ -88,65 +88,4 @@ def download(request):
     return response
 
 
-@admin_tools_page(_('importer'), _('XML data restore'))
-def importer(request):
-    thread = Thread(target=start_import, args=[
-            '/Users/admin/dev/pyenv/osqa/maintain/forum_modules/exporter/backups/localhost-201010121118.tar.gz',
-            {
-                'sql2008': 'sql-server-2008',
-                'sql2005': 'sql-server-2005',
-                'sql2000': 'sql-server-2000',
-                'design' : 'database-design',
-                'fulltextsearch' : 'full-text',
-                'access': 'microsoft-access',
-                'subquery': 'sub-query',
-                'count': 'aggregates',
-                'join': 'joins',
-                'metadata': 'meta-data',
-                'stored-procedure': 'stored-procedures',
-                'temp-tables': 'temporary-tables',
-                'sqlce': 'sql-server-ce',
-                'maintenance-plan': 'maintenance-plans',
-                'meta': 'meta-askssc',
-                'msaccess2000': 'microsoft-access',
-                'agent': 'sql-agent',
-                'udf': 'user-defined-function',
-                'report': 'reporting',
-                'ssas2005': 'ssas',
-                'case': 'case-statement',
-                'export': 'export-data',
-                'recursive': 'recursion',
-                'table-variables': 'table-variable',
-                'sqldmo': 'dmo',
-                'install': 'installation',
-                'function': 'user-defined-function',
-                'average': 'aggregates',
-                'aggregate-function': 'aggregates',
-                'email': 'database-email',
-                'distinct': 'aggregates',
-                'dynamic-query': 'dynamic',
-                'learn': 'learning',
-                'permission': 'permissions',
-                'shrink': 'shrink-database',
-                'normalise': 'normalization',
-                'datatype-text': 'datatypes',
-                'reporting-services': 'ssrs',
-                'aggregate-sum': 'aggregates',
-                'aggregate-max': 'aggregates',
-                'bulk-import': 'bulk-insert',
-                'attach-database': 'attach',
-                'scripting': 'script',
-                'analysis-services': 'ssas',
-                'create-table': 'create',
-                '2005': 'sql-server-2005'
-            },
-            request.user])
-    thread.setDaemon(True)
-    thread.start()
-
-    return HttpResponseRedirect(reverse('exporter_running', kwargs=dict(mode='importer')))
-
-    #return ('modules/exporter/importer.html', {
-
-    #})