Merge of jambazov branch to trunk. Adds CC license and failed sign-in referrer bug...

[osqa.git] / forum_modules / sximporter / views.py

diff --git a/forum_modules/sximporter/views.py b/forum_modules/sximporter/views.py
index 76bc8e4be99087b82c1f1f035e7ced07f6a06f83..dcca241c3a49b081172a4a07904f1fc1326a2c81 100644 (file)
--- a/forum_modules/sximporter/views.py
+++ b/forum_modules/sximporter/views.py
@@ -12,10 +12,19 @@ def sximporter(request):
         dump = ZipFile(request.FILES['dump'])\r
         members = [f for f in dump.namelist() if f.endswith('.xml')]\r
         extract_to = os.path.join(os.path.dirname(__file__), 'tmp')\r
         dump = ZipFile(request.FILES['dump'])\r
         members = [f for f in dump.namelist() if f.endswith('.xml')]\r
         extract_to = os.path.join(os.path.dirname(__file__), 'tmp')\r

-        dump.extractall(extract_to, members)\r
-        importer.sximport(extract_to, request.POST)\r
+\r
+        if not os.path.exists(extract_to):\r
+            os.makedirs(extract_to)\r
+\r
+        for m in members:\r
+            f = open(os.path.join(extract_to, m), 'w')\r
+            f.write(dump.read(m))\r
+            f.close()\r
+\r
+        #dump.extractall(extract_to, members)\r

         dump.close()\r
         dump.close()\r

+        importer.sximport(extract_to, request.POST)\r

 \r
     return render_to_response('modules/sximporter/page.html', {\r
     'names': list\r
 \r
     return render_to_response('modules/sximporter/page.html', {\r
     'names': list\r

-    }, context_instance=RequestContext(request))
\ No newline at end of file
+    }, context_instance=RequestContext(request))\r