Minor fix: normalize tags when renaming them

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@185 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/services/bookmark2tagservice.php b/services/bookmark2tagservice.php
index 7085d5f829f0222577d3eaef0f9c2805c6f9467c..851884fe69add354a1bd8bab0d39580c2cf5b31a 100644 (file)
--- a/services/bookmark2tagservice.php
+++ b/services/bookmark2tagservice.php
@@ -369,6 +369,7 @@ class Bookmark2TagService {
 
        function renameTag($userid, $old, $new, $fromApi = false) {
                $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+               $tagservice =& ServiceFactory::getServiceInstance('TagService');
 
                if (is_null($userid) || is_null($old) || is_null($new))
                return false;
@@ -381,6 +382,8 @@ class Bookmark2TagService {
                $this->deleteTag($userid, $old);
 
                // Attach new tags
+               $new = $tagservice->normalize($new);
+               
                foreach(array_keys($bookmarks) as $key) {
                        $row =& $bookmarks[$key];
                        $this->attachTags($row['bId'], $new, $fromApi, NULL, false);

diff --git a/services/tag2tagservice.php b/services/tag2tagservice.php
index 4cce66d94345b42312848ad1989a8fa6a0b511e1..a2d7ac318cd8095c23a5aaeb649b4943e02e8793 100644 (file)
--- a/services/tag2tagservice.php
+++ b/services/tag2tagservice.php
@@ -270,6 +270,9 @@ class Tag2TagService {
        }
 
        function renameTag($uId, $oldName, $newName) {
+               $tagservice =& ServiceFactory::getServiceInstance('TagService');
+               $newName = $tagservice->normalize($newName);
+               
                $query = 'UPDATE `'. $this->getTableName() .'`';
                $query.= ' SET tag1="'.$newName.'"';
                $query.= ' WHERE tag1="'.$oldName.'"';

diff --git a/services/tagservice.php b/services/tagservice.php
index ac30061e57d5025880596e6cd4272892d0855456..fba85fa0cb66cdc88ec938fcfd3e42d04a06f12d 100644 (file)
--- a/services/tagservice.php
+++ b/services/tagservice.php
@@ -68,6 +68,8 @@ class TagService {
        }
 
        function renameTag($uId, $oldName, $newName) {
+               $newname = $this->normalize($newname);
+               
                $query = 'UPDATE `'. $this->getTableName() .'`';
                $query.= ' SET tag="'.$newName.'"';
                $query.= ' WHERE tag="'.$oldName.'"';