Changeset 1094

Timestamp:

12/24/09 00:13:34 (2 years ago)

Author:

bogdan2412

Message:

Show author tags to user.

Removes author column from ia_task and shows cached tags insteads. Also adds a stub url_task_search function used for all tags.
Also fixes the bad user caching. :)

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

Location:

trunk

Files:

• common/db/round.php (modified) (1 diff)
• common/db/user.php (modified) (2 diffs)
• common/task.php (modified) (1 diff)
• scripts/benchmark (modified) (1 diff)
• scripts/migrate-authors-to-task-tags (modified) (1 diff)
• www/controllers/task.php (modified) (2 diffs)
• www/controllers/task_tags.php (modified) (2 diffs)
• www/macros/macro_taskparam.php (modified) (4 diffs)
• www/macros/macro_tasks.php (modified) (2 diffs)
• www/url.php (modified) (1 diff)
• www/views/task_tags.php (modified) (1 diff)

trunk/common/db/round.php

@@ -84 +84 @@
               "task.`order` AS `order`, ".
               "task.`title` AS `title`, ".
-              "task.`author` AS `author`, ".
               "task.`page_name` AS `page_name`, ".
               "task.`source` AS `source`, ".

trunk/common/db/user.php

@@ -16 +16 @@
         log_assert_valid(user_validate($user));
         mem_cache_set("user-by-name:{$user['username']}", $user);
-        mem_cache_set("user-by-id:{$user['username']}", $user);
+        mem_cache_set("user-by-id:{$user['id']}", $user);
     }
     return $user;
@@ -25 +25 @@
     log_assert_valid(user_validate($user));
     mem_cache_delete("user-by-name:{$user['username']}");
-    mem_cache_delete("user-by-id:{$user['username']}");
+    mem_cache_delete("user-by-id:{$user['id']}");
 }
 

trunk/common/task.php

@@ -54 +54 @@
     // User stuff. ugly
     if (is_null($user)) {
-        $task['author'] = 'Unknown';
         $task['user_id'] = 0;
     } else {
-        $task['author'] = $user['full_name'];
         $task['user_id'] = $user['id'];
     }

trunk/scripts/benchmark

@@ -8 +8 @@
 // URLs to benchmark
 $benchmark_urls = array(
+    IA_URL . "arhiva",
     IA_URL . "utilizator/domino?action=download&file=avatar&resize=L32x32",
     IA_URL . "template/preoni-2006?action=download&file=hlogo.gif",

trunk/scripts/migrate-authors-to-task-tags

@@ -109 +109 @@
 }
 
+db_query("ALTER TABLE ia_task DROP COLUMN author");
+
 ?>

trunk/www/controllers/task.php

@@ -145 +145 @@
         if (!$errors) {
             // FIXME: error handling? Is that even remotely possible in php?
+            task_update($new_task);
             task_update_parameters($task_id, $new_task_params);
 
@@ -159 +160 @@
                 }
             }
-            $new_task["author"] = tag_build_list("task", $new_task["id"], "author");
-            task_update($new_task);
+            mem_cache_delete("task-authors-by-id:".$new_task["id"]);
 
             flash("Task-ul a fost modificat cu succes.");

trunk/www/controllers/task_tags.php

@@ -114 +114 @@
 
     $tag["name"] = $new_name;
+    // Check that the new tag doesn't already exist.
     if (tag_get_id($tag)) {
         flash_error("Tagul deja exista.");
@@ -119 +120 @@
     }
     tag_update_by_id($tag_id, $tag);
+    // Clear author cache for all tasks tagged with the tag.
+    if ($tag["type"] == "author") {
+        $task_ids = tag_get_objects("task", array($tag_id), false);
+        foreach ($task_ids as $task_id) {
+            mem_cache_delete("task-authors-by-id:".$task_id["id"]);
+        }
+    }
+
     flash("Tag-ul a fost redenumit.");
     redirect(url_task_tags());

trunk/www/macros/macro_taskparam.php

@@ -3 +3 @@
 require_once(IA_ROOT_DIR . "common/db/task.php");
 require_once(IA_ROOT_DIR . "common/db/user.php");
-require_once(IA_ROOT_DIR."www/format/format.php");
+require_once(IA_ROOT_DIR . "common/db/tags.php");
+require_once(IA_ROOT_DIR . "common/cache.php");
+require_once(IA_ROOT_DIR . "www/format/format.php");
 
 // Displays a task field, be it a hard-coded field such as task author or a grader parameter such as `timelimit`.
@@ -35 +37 @@
 
     $task = task_get($task_id);
-    if ($task) {
-        $params = task_get_parameters($task_id);
-    }
 
     // validate task id
@@ -53 +52 @@
 
         case 'author':
-            return html_escape($task['author']);
+            $authors = mem_cache_get("task-authors-by-id:".$task["id"]);
+            if ($authors === false) {
+                $authors = tag_get("task", $task["id"], "author");
+                mem_cache_set("task-authors-by-id:".$task["id"], $authors);
+            }
+            function format_author($tag) {
+                return format_link(url_task_search(array($tag["id"])), $tag["name"]);
+            }
+            return implode(", ", array_map('format_author', $authors));
 
         case 'source':
+            // TODO: This should also be converted into tags.
             return html_escape($task['source']);
 
@@ -80 +88 @@
 
         default:
+            $params = task_get_parameters($task_id);
             if (!isset($params[$param])) {
                 if (isset($args['default_value'])) {

trunk/www/macros/macro_tasks.php

@@ -23 +23 @@
     }
     return $title;
+}
+
+function format_single_author($tag) {
+    return format_link(url_task_search(array($tag["id"])), $tag["name"]);
+}
+function format_author($row) {
+    $authors = mem_cache_get("task-authors-by-id:".$row["id"]);
+    if ($authors === false) {
+        $authors = tag_get("task", $row["id"], "author");
+        mem_cache_set("task-authors-by-id:".$row["id"], $authors);
+    }
+    return implode(", ", array_map('format_single_author', $authors));
 }
 
@@ -146 +158 @@
                 'title' => 'Autor',
                 'css_class' => 'author',
-                'key' => 'author',
+                'rowform' => 'format_author',
         );
     }

trunk/www/url.php

@@ -266 +266 @@
 }
 
+function url_task_search($tag_ids) {
+    // STUB
+    return "#" . implode("#", array_map('html_escape', $tag_ids));
+}
+
 function url_task_list($page_name, $filter = null) {
     $args = $filter ? array('filtru' => $filter) : array();

trunk/www/views/task_tags.php

@@ -14 +14 @@
         ),
         $row["name"], "Redenumește");
-    $tag .= ' <a class="algorithm_tag" href="#">' . html_escape($row["name"]) . '</a>';
+    $tag .= ' '.format_link(
+        url_task_search(array($row["id"])), $row["name"], true,
+        array("class" => "algorithm_tag")
+    );
     return $tag;
 }