summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorericdane <ericdane@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-02-08 09:21:26 +0000
committerericdane <ericdane@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-02-08 09:21:26 +0000
commite8e5209d51b999f0672e53b368da9046b0a219b9 (patch)
treed85c7d1a0d5b66c27b9f3a9377015d9cf0ad631d
parent76ba36093ff8260986a459ae449b0ac7a75fed37 (diff)
downloadsemanticscuttle-e8e5209d51b999f0672e53b368da9046b0a219b9.tar.gz
semanticscuttle-e8e5209d51b999f0672e53b368da9046b0a219b9.tar.bz2
bug fix: bug when inserting a relation already into the base
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@35 b3834d28-1941-0410-a4f8-b48e95affb8f
-rw-r--r--services/tag2tagservice.php3
-rw-r--r--tests/tag2TagTest.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/services/tag2tagservice.php b/services/tag2tagservice.php
index 1c6392e..d3a4a77 100644
--- a/services/tag2tagservice.php
+++ b/services/tag2tagservice.php
@@ -17,7 +17,8 @@ class Tag2TagService {
function addLinkedTags($tag1, $tag2, $relationType, $uId) {
if($tag1 == $tag2 || strlen($tag1) == 0 || strlen($tag2) == 0
- || ($relationType != ">" && $relationType != "=")) {
+ || ($relationType != ">" && $relationType != "=")
+ || ($this->existsLinkedTags($tag1, $tag2, $relationType, $uId))) {
return false;
}
$values = array('tag1' => $tag1, 'tag2' => $tag2, 'relationType'=> $relationType, 'uId'=> $uId);
diff --git a/tests/tag2TagTest.php b/tests/tag2TagTest.php
index f54537c..87dde52 100644
--- a/tests/tag2TagTest.php
+++ b/tests/tag2TagTest.php
@@ -264,6 +264,8 @@ class Tag2TagTest extends PHPUnit_Framework_TestCase
$tts = $this->tts;
$bs = $this->bs;
+ $tts->addLinkedTags('aa', 'bb', '>', 1);
+
$tags = array('aa>bb>cc', 'dd');
$bs->addBookmark("web1.com", "B1", "description", "status", $tags, null, false, false, 1);
$tags = array('bb>gg', 'ee>ff');