Changeset 3

Timestamp:

08/02/06 05:12:04

Author:

svn

Message:

fix tag editing, add more error handling

Files:

• trunk/phptagengine.class.inc.php (modified) (4 diffs)

trunk/phptagengine.class.inc.php

@@ -333 +333 @@
-         */
-        function save_tags($item, $tags, $type = null, $user = null) {
+                $type = $this->default_value('type', $type);
+                $user = $this->default_value('user', $user);
-                $old_tags = $this->get_tags($item, $type, $user);
-                $new_tags = array();
@@ -345 +347 @@
-                                        if ($tag != '') {
-                                                if ($this->add_tag($user, $item, $tag, $type)) {
-ag
+his->normalize($tag)
-                                                }
-                                                else {
@@ -474 +476 @@
-                }
-                $tag_id = $this->get_tag_id($tag);
+                if ($tag_id == false) {
+                        return false;
+                }
-                $result = $this->db->Execute("
-                        DELETE
@@ -518 +523 @@
-                        if (!$result) {
-                                return false;
+                        }
+// check for dupes
+                        $result = $this->db->Execute("
+                                SELECT *
+                                FROM $this->table_tags
+                                WHERE tag = '$new_tag_id'
+                        ") or die($this->db->ErrorMsg().' in '.__FILE__);
+                        if (!$result) {
+                                return false;
+                        }
+                        else if ($result->RowCount() > 0) {
+                                $tags = array();
+                                $ids_to_delete = array();
+                                while ($data = $result->FetchNextObject()) {
+                                        $key = $data->TAG.$data->ITEM.$data->TYPE.$data->USER;
+                                        if (!in_array($key, $tags)) {
+                                                $tags[] = $key;
+                                        }
+                                        else {
+                                                $ids_to_delete[] = $data->ID;
+                                        }
+                                }
+// remove dupes
+                                if (count($ids_to_delete) > 0) {
+                                        $result = $this->db->Execute("
+                                                DELETE
+                                                FROM $this->table_tags
+                                                WHERE id IN (".implode(',', $ids_to_delete).")
+                                        ") or die($this->db->ErrorMsg().' in '.__FILE__);
+                                        if (!$result) {
+                                                return false;
+                                        }
+                                }
-                        }
-                }