Fix incorrect 4chan thread data insertion in import scripts

digitalmethodsinitiative · Nov 24, 2023 · e118814 · e118814
1 parent 137c18a
commit e118814
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/helper-scripts/import_4chan_csv.py b/helper-scripts/import_4chan_csv.py
@@ -263,11 +263,11 @@ def commit(posts, post_fields, db, datasource, fast=False):
 
 print("Updating thread statistics.")
 db.execute(
-	"UPDATE threads_" + args.datasource + " AS t SET num_replies = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id) WHERE t.id IN %s AND board = %s",
-	(tuple(thread_ids), args.board,))
+	"UPDATE threads_" + args.datasource + " AS t SET num_replies = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id AND board = %s) WHERE t.id IN %s AND board = %s",
+	(args.board, tuple(thread_ids), args.board,))
 db.execute(
-	"UPDATE threads_" + args.datasource + " AS t SET num_images = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id AND image_file != '') WHERE t.id IN %s AND board = %s",
-	(tuple(thread_ids), args.board,))
+	"UPDATE threads_" + args.datasource + " AS t SET num_images = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id AND board = %s AND image_file != '') WHERE t.id IN %s AND board = %s",
+	(args.board, tuple(thread_ids), args.board,))
 
 db.commit()
 print("Done!")
diff --git a/helper-scripts/import_4plebs.py b/helper-scripts/import_4plebs.py
@@ -339,11 +339,11 @@ def commit(posts, post_fields, db, datasource, fast=False):
 
 print("Updating thread statistics.")
 db.execute(
-	"UPDATE threads_" + args.datasource + " AS t SET num_replies = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id) WHERE t.id IN %s AND board = %s",
-	(tuple(thread_ids), args.board,))
+	"UPDATE threads_" + args.datasource + " AS t SET num_replies = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id AND board = %s) WHERE t.id IN %s AND board = %s",
+	(args.board, tuple(thread_ids), args.board,))
 db.execute(
-	"UPDATE threads_" + args.datasource + " AS t SET num_images = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id AND image_file != '') WHERE t.id IN %s AND board = %s",
-	(tuple(thread_ids), args.board,))
+	"UPDATE threads_" + args.datasource + " AS t SET num_images = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id AND image_file != '' AND board = %s) WHERE t.id IN %s AND board = %s",
+	(args.board, tuple(thread_ids), args.board,))
 
 db.commit()
 print("Done!")
diff --git a/helper-scripts/import_archivedmoe.py b/helper-scripts/import_archivedmoe.py
@@ -314,11 +314,11 @@ def commit(posts, post_fields, db, datasource, fast=False):
 
 print("Updating thread statistics.")
 db.execute(
-	"UPDATE threads_" + args.datasource + " AS t SET num_replies = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id) WHERE t.id IN %s AND board = %s",
-	(tuple(thread_ids), args.board,))
+	"UPDATE threads_" + args.datasource + " AS t SET num_replies = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id AND board = %s) WHERE t.id IN %s AND board = %s",
+	(args.boards, tuple(thread_ids), args.board,))
 db.execute(
-	"UPDATE threads_" + args.datasource + " AS t SET num_images = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id AND image_file != '') WHERE t.id IN %s AND board = %s",
-	(tuple(thread_ids), args.board,))
+	"UPDATE threads_" + args.datasource + " AS t SET num_images = ( SELECT COUNT(*) FROM posts_" + args.datasource + " AS p WHERE p.thread_id = t.id AND image_file != '' AND board = %s) WHERE t.id IN %s AND board = %s",
+	(args.boards, tuple(thread_ids), args.board,))
 
 db.commit()
 print("Done!")