Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ignore deleted ... too much trouble

This commit is contained in:
Sam 2015-07-16 14:58:01 +10:00
parent 16e69d16b8
commit bfd28ca9a9
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/import_scripts/base.rb
View File

@ -32,7 +32,7 @@ class ImportScripts::Base
@categories_lookup = {} @categories_lookup = {}
@existing_posts = {} @existing_posts = {}
@topic_lookup = {} @topic_lookup = {}
@site_settings_during_import @site_settings_during_import = nil
@old_site_settings = {} @old_site_settings = {}
@start_time = Time.now @start_time = Time.now

8
script/import_scripts/lithium.rb
View File

@ -229,7 +229,7 @@ class ImportScripts::Lithium < ImportScripts::Base
SELECT id, subject, body, deleted, user_id, SELECT id, subject, body, deleted, user_id,
post_date, views, node_id, unique_id post_date, views, node_id, unique_id
FROM message2 FROM message2
WHERE id = root_id #{TEMP} WHERE id = root_id #{TEMP} AND deleted = 0
ORDER BY node_id, id ORDER BY node_id, id
LIMIT #{BATCH_SIZE} LIMIT #{BATCH_SIZE}
OFFSET #{offset} OFFSET #{offset}
@ -255,10 +255,6 @@ class ImportScripts::Lithium < ImportScripts::Base
custom_fields: {import_unique_id: topic["unique_id"]} custom_fields: {import_unique_id: topic["unique_id"]}
} }
if topic["deleted"] > 0
t["deleted_at"] = Time.now
end
t t
end end
end end
@ -275,7 +271,7 @@ class ImportScripts::Lithium < ImportScripts::Base
SELECT id, body, deleted, user_id, SELECT id, body, deleted, user_id,
post_date, parent_id, root_id, node_id, unique_id post_date, parent_id, root_id, node_id, unique_id
FROM message2 FROM message2
WHERE id <> root_id #{TEMP} WHERE id <> root_id #{TEMP} AND deleted = 0
ORDER BY node_id, root_id, id ORDER BY node_id, root_id, id
LIMIT #{BATCH_SIZE} LIMIT #{BATCH_SIZE}
OFFSET #{offset} OFFSET #{offset}