Skip to content

Commit

Permalink
WIP #31 Counters are wrong
Browse files Browse the repository at this point in the history 
General cleanup
  • Loading branch information
@JN-Jones
JN-Jones committed Jun 16, 2015
1 parent cfcd39a commit 1366818
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 49 deletions.
2 changes: 1 addition & 1 deletion index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@

$output->update_progress_bar(200);

echo "done.<br />\n";
echo $lang->done."<br />\n";
flush();

// We cannot do a header() redirect here because on some servers with gzip or zlib auto compressing content, it creates an Internal Server Error.
Expand Down
66 changes: 21 additions & 45 deletions resources/modules/posts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private function rebuild_thread_counters()
{
global $db, $output, $import_session, $lang;

$query = $db->simple_select("threads", "COUNT(*) as count", "import_tid != 0");
$query = $db->simple_select("threads", "COUNT(*) as count", "import_tid > 0");
$num_imported_threads = $db->fetch_field($query, "count");
$last_percent = 0;

Expand All @@ -134,7 +134,7 @@ private function rebuild_thread_counters()
$this->debug->log->trace1("Rebuilding thread counters");

$progress = $import_session['counters_threads_start'];
$query = $db->simple_select("threads", "tid", "import_tid != 0", array('order_by' => 'tid', 'order_dir' => 'asc', 'limit_start' => intval($import_session['counters_threads_start']), 'limit' => 1000));
$query = $db->simple_select("threads", "tid", "import_tid > 0", array('order_by' => 'tid', 'order_dir' => 'asc', 'limit_start' => intval($import_session['counters_threads_start']), 'limit' => 1000));
while($thread = $db->fetch_array($query))
{
// Updates "replies", "unapprovedposts", "deletedposts" and firstpost/lastpost data
Expand Down Expand Up @@ -166,15 +166,7 @@ private function rebuild_thread_counters()
flush();
}

// Now that all of that is taken care of, refresh the page to continue on to whatever needs to be done next.
if(!headers_sent())
{
header("Location: index.php");
}
else
{
echo "<meta http-equiv=\"refresh\" content=\"0; url=index.php\">";;
}
$this->redirect();
}

private function rebuild_forum_counters()
Expand All @@ -189,29 +181,18 @@ private function rebuild_forum_counters()
echo "{$lang->done}. <br />{$lang->module_post_rebuilding_forum} ";
flush();

$query = $db->simple_select("forums", "COUNT(*) as count", "import_fid != 0");
$num_imported_forums = $db->fetch_field($query, "count");
$query = $db->simple_select("forums", "fid", "import_fid > 0");
$num_imported_forums = $db->num_rows($query);
$progress = 0;

$query = $db->simple_select("forums", "fid", "import_fid != 0", array('order_by' => 'fid', 'order_dir' => 'asc'));
while ($forum = $db->fetch_array($query)) {
// TODO: From the code this should also update the lastpost data - which isn't done
rebuild_forum_counters($forum['fid']);
++$progress;
$output->update_progress_bar(round((($progress / $num_imported_forums) * 50), 1) + 100, $lang->sprintf($lang->module_post_forum_counter, $forum['fid']));
}

$import_session['counters_forum'] = 1;

// Now that all of that is taken care of, refresh the page to continue on to whatever needs to be done next.
if(!headers_sent())
{
header("Location: index.php");
}
else
{
echo "<meta http-equiv=\"refresh\" content=\"0; url=index.php\">";;
}
$this->redirect('counters_forum');
}

private function rebuild_user_post_counters()
Expand Down Expand Up @@ -246,11 +227,10 @@ private function rebuild_user_post_counters()
echo "{$lang->done}. <br />{$lang->module_post_rebuilding_user} ";
flush();

$query = $db->simple_select("users", "COUNT(*) as count", "import_uid != 0");
$num_imported_users = $db->fetch_field($query, "count");
$query = $db->simple_select("users", "uid", "import_uid > 0");
$num_imported_users = $db->num_rows($query);
$progress = $last_percent = 0;

$query = $db->simple_select("users", "uid", "import_uid != 0");
while($user = $db->fetch_array($query))
{
$query2 = $db->query("
Expand All @@ -262,7 +242,7 @@ private function rebuild_user_post_counters()

$num_posts = $db->fetch_field($query2, "post_count");
$db->free_result($query2);
$db->update_query("users", array("postnum" => intval($num_posts)), "uid='{$user['uid']}'");
$db->update_query("users", array("postnum" => (int)$num_posts), "uid='{$user['uid']}'");

++$progress;
$percent = round((($progress/$num_imported_users)*50)+150, 1);
Expand All @@ -279,17 +259,7 @@ private function rebuild_user_post_counters()
echo "{$lang->done}.<br />";
flush();

$import_session['counters_user_posts'] = 1;

// Now that all of that is taken care of, refresh the page to continue on to whatever needs to be done next.
if(!headers_sent())
{
header("Location: index.php");
}
else
{
echo "<meta http-equiv=\"refresh\" content=\"0; url=index.php\">";;
}
$this->redirect('counters_user_posts');
}

// TODO: langstrings
Expand Down Expand Up @@ -325,11 +295,10 @@ private function rebuild_user_thread_counters()
echo "{$lang->done}. <br />{$lang->module_post_rebuilding_user} ";
flush();

$query = $db->simple_select("users", "COUNT(*) as count", "import_uid != 0");
$num_imported_users = $db->fetch_field($query, "count");
$query = $db->simple_select("users", "uid", "import_uid > 0");
$num_imported_users = $db->num_rows($query);
$progress = $last_percent = 0;

$query = $db->simple_select("users", "uid", "import_uid != 0");
while($user = $db->fetch_array($query))
{
$query2 = $db->query("
Expand Down Expand Up @@ -357,9 +326,16 @@ private function rebuild_user_thread_counters()
echo "{$lang->done}.<br />";
flush();

$import_session['counters_user_threads'] = 1;
$this->redirect('counters_users_threads');
}

private function redirect($finished = "")
{
if(!empty($finished)) {
global $import_session;
$import_session[$finished] = 1;
}

// Now that all of that is taken care of, refresh the page to continue on to whatever needs to be done next.
if(!headers_sent())
{
header("Location: index.php");
Expand Down
5 changes: 2 additions & 3 deletions resources/modules/privatemessages.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,10 @@ public function cleanup()

flush();

$query = $db->simple_select("users", "COUNT(*) as count", "import_uid != 0");
$num_imported_users = $db->fetch_field($query, "count");
$query = $db->simple_select("users", "uid", 'import_uid > 0');
$num_imported_users = $db->num_rows($query);
$progress = $last_percent = 0;

$query = $db->simple_select("users", "uid", 'import_uid > 0', array('order_by' => 'uid', 'order_dir' => 'asc'));
while($user = $db->fetch_array($query))
{
update_pm_count($user['uid']);
Expand Down

0 comments on commit 1366818

Please sign in to comment.