Changeset 1099 for trunk/common

Timestamp:

12/28/09 14:24:37 (2 years ago)

Author:

bogdan2412

Message:

Show tags on filter results page.

Reimplemented tag_build_tree so that it works with more than one level of depth. It now receives all the tags in a single array and returns the tag tree.

Also added some diacritics to some pages.

Location:

trunk/common

Files:

• db/tags.php (modified) (1 diff)
• tags.php (modified) (1 diff)

trunk/common/db/tags.php

@@ -60 +60 @@
 // Return an array with id's of their parents
 // Each parent id appears only once
-function tag_get_parents($tags) {
+function tag_get_parents($tag_ids) {
     $query = sprintf("SELECT DISTINCT(`parent`)
             FROM ia_tags
-            WHERE `id` IN (%s)",
-            implode(",", array_map('db_quote', $tags))
+            WHERE `id` IN (%s) AND `parent` != 0",
+            implode(",", array_map('db_quote', $tag_ids))
         );
     $result = db_fetch_all($query);
-    $ret = Array();
+    $ret = array();
     foreach ($result as $row) {
         $ret[] = $row['parent'];

trunk/common/tags.php

@@ -52 +52 @@
 }
 
-// Receives a list of parent tags and children tags
-// For each parent_tag adds an array 'sub_tags' containing
-// an array with all his children tags
-function build_tags_tree($parent_tags, $sub_tags) {
-    log_assert(is_array($parent_tags), "Parent tags is not an array");
-    log_assert(is_array($sub_tags), "Children tags is not an array");
+// Receives a list of tags which will be arranged in a tree-like structure
+// according to their respective parents.
+function tag_build_tree($tags) {
+    log_assert(is_array($tags), "tag_build_tree expects an array of tags");
+    $tags_by_id = array();
+    // Group tags by id
+    foreach ($tags as &$tag) {
+        log_assert(is_tag($tag), "tag_build_tree expects an array of tags");
+        log_assert(isset($tag["id"]),
+            "tag_build_tree expects an array of tags with id");
 
-    $parent_tags_key = Array();
-    foreach ($parent_tags as $key => $tag) {
-        $parent_tags[$key]['sub_tags'] = Array();
-        $parent_tags_key[$tag['id']] = $key;
+        $tags_by_id[$tag["id"]] =& $tag;
     }
 
-    foreach ($sub_tags as $tag) {
-        log_assert(isset($parent_tags_key[$tag['parent']]), "Child tag doesn't have a parent");
-        $parent_tag_key = $parent_tags_key[$tag['parent']];
-        $parent_tags[$parent_tag_key]['sub_tags'][] = $tag;
+    // Add 'sub_tags' attribute to all tags which have children.
+    $has_parent = array();
+    foreach ($tags as &$tag) {
+        if (array_key_exists($tag["parent"], $tags_by_id)) {
+            $has_parent[$tag["id"]] = true;
+
+            if (!isset($tags_by_id[$tag["parent"]]["sub_tags"])) {
+                $tags_by_id[$tag["parent"]]["sub_tags"] = array();
+            }
+            $tags_by_id[$tag["parent"]]["sub_tags"][] =& $tag;
+        }
     }
 
-    return $parent_tags;
+    // Return only tree roots (tags which have no parents).
+    $roots = array();
+    foreach ($tags_by_id as &$tag) {
+        if (!isset($has_parent[$tag["id"]])) {
+            $roots[] = $tag;
+        }
+    }
+    return $roots;
 }