Changeset 1132 for trunk/common

Timestamp:

04/24/10 14:13:20 (2 years ago)

Author:

bogdan2412

Message:

Merge branch taskreordering into trunk.

Location:

trunk/common/db

Files:

• round.php (modified) (7 diffs)
• round_task.php (copied) (copied from branches/taskreordering/common/db/round_task.php)
• task.php (modified) (4 diffs)

trunk/common/db/round.php

@@ -3 +3 @@
 require_once(IA_ROOT_DIR."common/db/db.php");
 require_once(IA_ROOT_DIR."common/db/parameter.php");
+require_once(IA_ROOT_DIR."common/db/round_task.php");
 
 function _round_cache_add($round) {
@@ -111 +112 @@
     }
     $fields = "round_task.task_id AS id, ".
-              "task.`order` AS `order`, ".
+              "round_task.`order_id` AS `order`, ".
               "task.`title` AS `title`, ".
               "task.`page_name` AS `page_name`, ".
@@ -125 +126 @@
                           LEFT JOIN ia_task as task ON task.id = round_task.task_id
                           WHERE `round_task`.`round_id` = '%s'
-                          ORDER BY task.`order` LIMIT %d, %d",
+                          ORDER BY round_task.`order_id` LIMIT %d, %d",
                           db_escape($round_id), db_escape($first), db_escape($count));
     } else {
@@ -139 +140 @@
                           WHERE `round_task`.`round_id` = '%s'
                             AND %s
-                          ORDER BY task.`order` LIMIT %d, %d",
+                          ORDER BY round_task.`order_id` LIMIT %d, %d",
                          db_escape($user_id),
                          db_escape($round_id), db_escape($filter_clause),
@@ -218 +219 @@
     log_assert(is_round_id($round_id));
 
-    // delete all round-task relations
-    $query = sprintf("DELETE FROM ia_round_task
-                      WHERE round_id = '%s'",
-                     db_escape($round_id));
-    db_query($query);
+    $old_tasks_count = count($old_tasks);
+
+    // Do nothing with common tasks, be smart.
+    $common_tasks = array_intersect($old_tasks, $tasks);
+    $old_tasks = array_diff($old_tasks, $common_tasks);
+    $tasks = array_diff($tasks, $common_tasks);
+
+    // delete round-task relations
+    if (count($old_tasks) > 0) {
+        $query = sprintf("DELETE FROM ia_round_task
+                          WHERE round_id = %s AND task_id IN (%s)",
+                         db_quote($round_id),
+                         implode(',', array_map("db_quote", $old_tasks)));
+        db_query($query);
+    }
+
     foreach($old_tasks as $task) {
         // Update parent round cache for old tasks
@@ -231 +243 @@
         // insert new relations
         $values = array();
+        $order_id = $old_tasks_count;
         foreach ($tasks as $task_id) {
-            $values[] = "('".db_escape($round_id)."', '".db_escape($task_id)."')";
+            $order_id += 1;
+            $values[] = "('".db_escape($round_id)."', '".
+                        db_escape($task_id)."', '".db_escape($order_id)."')";
         }
-        $query = "INSERT INTO ia_round_task (round_id, task_id)
+        $query = "INSERT INTO ia_round_task (round_id, task_id, order_id)
                   VALUES ". implode(', ', $values);
         db_query($query);
@@ -242 +257 @@
         }
     }
+
+    round_task_recompute_order($round_id);
 }
 

trunk/common/db/task.php

@@ -4 +4 @@
 require_once(IA_ROOT_DIR . "common/task.php");
 require_once(IA_ROOT_DIR . "common/db/parameter.php");
+require_once(IA_ROOT_DIR . "common/db/round_task.php");
 
 // Add $task to cache if not null, return $task.
@@ -55 +56 @@
 }
 
+// Deletes a task from ia_round_task
+function task_delete_from_rounds($task_id) {
+    // Get all rounds for the task
+    $query = "SELECT DISTINCT round_id FROM ia_round_task
+              WHERE task_id = " . db_quote($task_id);
+    $res = db_fetch_all($query);
+
+    // Delete task
+    db_query("DELETE FROM ia_round_task WHERE task_id = ".db_quote($task_id));
+
+    // Repair rounds order
+    foreach ($res as $row) {
+        round_task_recompute_order($row['round_id']);
+    }
+}
+
 // Delete a task, including scores, jobs and page
 // WARNING: This is irreversible.
@@ -80 +97 @@
 
     // Remove task from all rounds
-    db_query("DELETE FROM `ia_round_task`
-              WHERE `task_id` = " . db_quote($task["id"]));
+    task_delete_from_rounds($task['id']);
 
     // Delete task jobs
@@ -247 +263 @@
     return $tasks;
 }
+
+// Updates the forum topic associated with a task.
+function task_update_forum_topic($task_id, $round_id = "arhiva") {
+    if (!is_task_id($task_id)) {
+        log_error("Invalid task id");
+    }
+
+    // Get task info
+    $query = "SELECT title, page_name FROM ia_task
+              WHERE id = " . db_quote($task_id);
+    $task = db_fetch($query);
+
+    // Get the forum topic
+    $query = "SELECT forum_topic
+              FROM ia_textblock
+              WHERE name = " . db_quote($task['page_name']);
+    $res = db_fetch($query);
+    $topic_id = $res['forum_topic'];
+
+    // Check the textblock has an associated forum topic.
+    if (is_null($topic_id)) {
+        return;
+    }
+
+    // Get the first message from the topic
+    $query = "SELECT ID_FIRST_MSG AS `msg_id`
+              FROM ia_smf_topics
+              WHERE ID_TOPIC = " . db_quote($topic_id);
+    $res = db_fetch($query);
+    // Topic id doesn't exist
+    if (is_null($res)) {
+        return;
+    }
+    $message_id = $res['msg_id'];
+
+    // Get the subject and the body of the message
+    $query = "SELECT subject, body FROM ia_smf_messages
+              WHERE ID_MSG = " . db_quote($message_id);
+    $message = db_fetch($query);
+
+    // Find the number associated with the (task, round) pair.
+    $query = sprintf(
+        "SELECT order_id FROM ia_round_task
+         WHERE round_id = %s AND task_id = %s",
+         db_quote($round_id), db_quote($task_id));
+    $res = db_fetch($query);
+    $task_number = sprintf("%03d", $res['order_id'] - 1);
+
+    // New info
+    $new_subject = $task_number . " " . $task['title'];
+    $body_start = mb_substr($message['body'], 0, 35);
+    if ($body_start != "Aici puteti discuta despre problema" &&
+        $body_start != "Aici puteți discuta despre prob" &&
+        $body_start != "Aici puteţi discuta despre probl") {
+        $new_body = 'Aici puteţi discuta despre problema ' .
+                    '[url=http://infoarena.ro/problema/' . $task_id . ']' .
+                    $task['title'] . '[/url].';
+    } else {
+        $new_body = $message['body'];
+    }
+
+    // Finally, update the message
+    $query = sprintf(
+        "UPDATE ia_smf_messages
+         SET subject = %s, body = %s
+         WHERE ID_MSG = %s",
+         db_quote($new_subject), db_quote($new_body), db_quote($message_id));
+    db_query($query);
+
+    // Not finished yet, must change replies too.
+    // This is extremely time consuming.
+    if ($new_subject != $message['subject']) {
+        $query = sprintf(
+            "UPDATE ia_smf_messages
+             SET subject = %s
+             WHERE subject LIKE %s",
+             db_quote("Răspuns: " . $new_subject),
+             db_quote("%" . $message['subject']));
+        db_query($query);
+    }
+}
+
 ?>