the mark_favorite view should accept not only Questions but any Nodes (required for...

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

diff --git a/forum_modules/sximporter/importer.py b/forum_modules/sximporter/importer.py
index 58280905c2870b3fd01d155929839921bec4fbb6..6669b8c0fe7dc8bf44efd9b951b8ba8fe3758c22 100644 (file)
--- a/forum_modules/sximporter/importer.py
+++ b/forum_modules/sximporter/importer.py
@@ -393,7 +393,7 @@ def remove_post_state(name, post):
     post.state_string = "".join("(%s)" % s for s in re.findall('\w+', post.state_string) if s != name)
 
 def postimport(dump, uidmap, tagmap):
     post.state_string = "".join("(%s)" % s for s in re.findall('\w+', post.state_string) if s != name)
 
 def postimport(dump, uidmap, tagmap):

-    all = []
+    all = {}

 
     def callback(sxpost):
         nodetype = (sxpost.get('posttypeid') == '1') and "nodetype" or "answer"
 
     def callback(sxpost):
         nodetype = (sxpost.get('posttypeid') == '1') and "nodetype" or "answer"


@@ -454,13 +454,15 @@ def postimport(dump, uidmap, tagmap):
             post.extra_count = sxpost.get('viewcount', 0)
 
             add_tags_to_post(post, tagmap)
             post.extra_count = sxpost.get('viewcount', 0)
 
             add_tags_to_post(post, tagmap)

+            all[int(post.id)] = int(post.id)

 
         else:
             post.parent_id = sxpost['parentid']
 
         else:
             post.parent_id = sxpost['parentid']

+            post.abs_parent_id = sxpost['parentid']
+            all[int(post.id)] = int(sxpost['parentid'])

 
         post.save()
 
 
         post.save()
 

-        all.append(int(post.id))

         create_and_activate_revision(post)
 
         del post
         create_and_activate_revision(post)
 
         del post


@@ -469,7 +471,9 @@ def postimport(dump, uidmap, tagmap):
 
     return all
 
 
     return all
 

-def comment_import(dump, uidmap, posts):
+def comment_import(dump, uidmap, absparent_map):
+    posts = absparent_map.keys()
+

     currid = IdIncrementer(max(posts))
     mapping = {}
 
     currid = IdIncrementer(max(posts))
     mapping = {}
 


@@ -482,6 +486,7 @@ def comment_import(dump, uidmap, posts):
                 author_id = uidmap[sxc.get('userid', 1)],
                 body = sxc['text'],
                 parent_id = sxc.get('postid'),
                 author_id = uidmap[sxc.get('userid', 1)],
                 body = sxc['text'],
                 parent_id = sxc.get('postid'),

+                abs_parent_id = absparent_map.get(int(sxc.get('postid')), sxc.get('postid'))

                 )
 
         if sxc.get('deletiondate', None):
                 )
 
         if sxc.get('deletiondate', None):


@@ -768,6 +773,7 @@ def badges_import(dump, uidmap, post_list):
 
         osqaa.save()
         badge.awarded_count += 1
 
         osqaa.save()
         badge.awarded_count += 1

+

         user_badge_count[user_id] += 1
 
     readTable(dump, "Users2Badges", callback)
         user_badge_count[user_id] += 1
 
     readTable(dump, "Users2Badges", callback)


@@ -785,7 +791,7 @@ def save_setting(k, v):
     kv.save()
 
 
     kv.save()
 
 

-def pages_import(dump, currid):
+def pages_import(dump, currid, owner):

     currid = IdIncrementer(currid)
     registry = {}
 
     currid = IdIncrementer(currid)
     registry = {}
 


@@ -806,7 +812,7 @@ def pages_import(dump, currid):
                 'sidebar_render': "html",
                 'comments': False
                 }),
                 'sidebar_render': "html",
                 'comments': False
                 }),

-                author_id = 1
+                author_id = owner

                 )
 
         create_and_activate_revision(page)
                 )
 
         create_and_activate_revision(page)


@@ -931,7 +937,7 @@ def sximport(dump, options):
 
     badges_import(dump, uidmap, posts)
 
 
     badges_import(dump, uidmap, posts)
 

-    pages_import(dump, max(posts))
+    pages_import(dump, max(posts), uidmap.default)

     static_import(dump)
     gc.collect()
 
     static_import(dump)
     gc.collect()