Changeset 1120 for trunk/common

Timestamp:

03/26/10 00:37:03 (2 years ago)

Author:

wefgef

Message:

Replaced ia_score, it can now be removed

• Task search shows difficulty for the tasks
• Task search uses ia_score_user_round_task instead of ia_score
• Task delete deletes entries from the rigth db tables

REVIEW URL: ​http://reviewboard.infoarena.ro/r/145/

Location:

trunk/common/db

Files:

• round.php (modified) (1 diff)
• task.php (modified) (3 diffs)

trunk/common/db/round.php

@@ -535 +535 @@
     db_query($query);
 
-    // Delete entries from ia_score
-    $query = sprintf("DELETE FROM `ia_score`
+    // Delete entries from ia_score_user_round
+    $query = sprintf("DELETE FROM `ia_score_user_round`
+                      WHERE `round_id` = %s",
+                      db_quote($round_id));
+    db_query($query);
+
+    // Delete entries from ia_score_user_round_task
+    $query = sprintf("DELETE FROM `ia_score_user_round_task`
+                      WHERE `round_id` = %s",
+                      db_quote($round_id));
+    db_query($query);
+
+    // Delete entries from ia_rating
+    $query = sprintf("DELETE FROM `ia_rating`
                       WHERE `round_id` = %s",
                       db_quote($round_id));

trunk/common/db/task.php

@@ -218 +218 @@
         $score_fields = "";
     } else {
-        $join_score = "LEFT JOIN ia_score ON ia_score.user_id = ".db_quote($user_id)." AND
-                            ia_score.round_id = round.id AND
-                            ia_score.task_id = ia_task.id AND
-                            ia_score.name = 'score'";
-        $score_fields = "ia_score.score,";
+        $join_score = "LEFT JOIN ia_score_user_round_task AS score ON
+                            score.`user_id` = ".db_quote($user_id)." AND
+                            score.`round_id` = round_task.`round_id` AND
+                            score.`task_id` = round_task.`task_id`";
+        $score_fields = "score.`score` AS `score`,";
     }
 
@@ -231 +231 @@
                 ia_task.open_source AS open_source,
                 ia_task.open_tests AS open_tests,
+                ia_task.rating AS rating,
                 round.id AS round_id,
                 $score_fields
@@ -241 +242 @@
         AND ia_task.hidden = '0' $tag_filter
     ORDER BY round.id DESC, ia_task.order";
+
     $tasks = db_fetch_all($query);