From 01c792a78969dcfa3e9dd99a4491ccb6836ca8c1 Mon Sep 17 00:00:00 2001 From: cweiske Date: Sat, 20 Feb 2010 11:23:07 +0000 Subject: new config option to disable "SET NAMES UTF8" sql call git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@671 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index c797f56..05757ac 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,10 +1,17 @@ ChangeLog for SemantiScuttle ============================ +0.97.0 - 2010-????? +------------------- +- Many SQL optimizations +- New config option to skip "SET NAMES UTF8" call: $dbneedssetnames + + 0.96.1 - 2010-02-09 ------------------- - Fix bug #2948410: API is broken in 0.96.0 + 0.96.0 - 2010-02-08 ------------------- - Fix bug #2843523: ArtViper thumbnail license change -- cgit v1.2.3 From d665bb742e0d4013c5f2c1ab7f5bf843505aa54a Mon Sep 17 00:00:00 2001 From: cweiske Date: Mon, 22 Feb 2010 19:41:21 +0000 Subject: Do not highlight admin bookmarks when $enableAdminColors is disabled git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@684 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/templates/bookmarks.tpl.php | 2 +- doc/ChangeLog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php index ad2ecd3..1caf0e7 100644 --- a/data/templates/bookmarks.tpl.php +++ b/data/templates/bookmarks.tpl.php @@ -312,7 +312,7 @@ if($currenttag!= '') { } // Admin specific design - if ($userservice->isAdmin($row['username'])) { + if ($userservice->isAdmin($row['username']) && $GLOBALS['enableAdminColors']) { $adminBgClass = 'class="adminBackground"'; $adminStar = ' '; } else { diff --git a/doc/ChangeLog b/doc/ChangeLog index 05757ac..65ed2e2 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -5,6 +5,7 @@ ChangeLog for SemantiScuttle ------------------- - Many SQL optimizations - New config option to skip "SET NAMES UTF8" call: $dbneedssetnames +- Do not highlight admin bookmarks when $enableAdminColors is disabled 0.96.1 - 2010-02-09 -- cgit v1.2.3 From db7a46b23530724cf1a8d356de3ac4f1fe0d5ac7 Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 17 Mar 2010 20:08:20 +0000 Subject: note fixing of bug #2953732 in the changelog git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@689 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 65ed2e2..d9cdb6e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle - Many SQL optimizations - New config option to skip "SET NAMES UTF8" call: $dbneedssetnames - Do not highlight admin bookmarks when $enableAdminColors is disabled +- Fix bug #2953732: faulty error message for duplicate bookmarks 0.96.1 - 2010-02-09 -- cgit v1.2.3 From 39812084054ec9d4119e53f188406bb5d2c3705e Mon Sep 17 00:00:00 2001 From: cweiske Date: Fri, 19 Mar 2010 07:44:21 +0000 Subject: note fixation of bug #2960663 in changelog git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@697 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index d9cdb6e..9af38d5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -7,6 +7,7 @@ ChangeLog for SemantiScuttle - New config option to skip "SET NAMES UTF8" call: $dbneedssetnames - Do not highlight admin bookmarks when $enableAdminColors is disabled - Fix bug #2953732: faulty error message for duplicate bookmarks +- Fix bug #2960663: do not send content-type headers twice for ajax/api scripts 0.96.1 - 2010-02-09 -- cgit v1.2.3 From 54d3ac4a7978bb373f925cd988126190fb94d726 Mon Sep 17 00:00:00 2001 From: cweiske Date: Mon, 3 May 2010 06:26:19 +0000 Subject: update changelog git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@710 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 9af38d5..42d96cd 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -6,8 +6,11 @@ ChangeLog for SemantiScuttle - Many SQL optimizations - New config option to skip "SET NAMES UTF8" call: $dbneedssetnames - Do not highlight admin bookmarks when $enableAdminColors is disabled +- Add russian translation +- Make HTML export follow the specifications a bit better - Fix bug #2953732: faulty error message for duplicate bookmarks - Fix bug #2960663: do not send content-type headers twice for ajax/api scripts +- Fix bug #2976593: fr_FR locale is vietnamese 0.96.1 - 2010-02-09 -- cgit v1.2.3 From 733304908251397114d8895df2603242a2b7043c Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 9 Jun 2010 05:59:51 +0000 Subject: prepare release of 0.97.0 git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@712 b3834d28-1941-0410-a4f8-b48e95affb8f --- build.xml | 4 ++-- data/templates/about.tpl.php | 2 +- doc/ChangeLog | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/build.xml b/build.xml index 9cf4de9..c1db166 100644 --- a/build.xml +++ b/build.xml @@ -8,8 +8,8 @@ --> - - + + diff --git a/data/templates/about.tpl.php b/data/templates/about.tpl.php index af5c6e7..7bff98d 100644 --- a/data/templates/about.tpl.php +++ b/data/templates/about.tpl.php @@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']); isAdmin()): ?> -
  • SemanticScuttle v0.96.1
    • +
  • SemanticScuttle v0.97.0
    • diff --git a/doc/ChangeLog b/doc/ChangeLog index 42d96cd..5b4e4d3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,9 +1,9 @@ ChangeLog for SemantiScuttle ============================ -0.97.0 - 2010-????? +0.97.0 - 2010-06-09 ------------------- -- Many SQL optimizations +- Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now - New config option to skip "SET NAMES UTF8" call: $dbneedssetnames - Do not highlight admin bookmarks when $enableAdminColors is disabled - Add russian translation -- cgit v1.2.3 From 1962e3d2bc30333d3dbe133c759fc650d6e8a5c7 Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 9 Jun 2010 06:05:48 +0000 Subject: update upgrade.txt file and ajust changelog git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@713 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/UPGRADE.txt | 6 ++++++ doc/developers/release-new-version | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt index 371c302..c4470f9 100644 --- a/doc/UPGRADE.txt +++ b/doc/UPGRADE.txt @@ -1,6 +1,12 @@ Upgrading SemanticScuttle from a previous version ================================================= + +From version 0.96 to 0.97 +------------------------- +No database changes necessary. + + From version 0.95 to 0.96 ------------------------- Update your database: diff --git a/doc/developers/release-new-version b/doc/developers/release-new-version index 33a3ef6..69530df 100644 --- a/doc/developers/release-new-version +++ b/doc/developers/release-new-version @@ -3,19 +3,20 @@ How to release a new version of SemanticScuttle 0. Run unit tests and verify that all of them pass 1. Update doc/ChangeLog -2. Update version in data/templates/about.tpl.php +2. Update doc/UPGRADE.txt +3. Update version in data/templates/about.tpl.php and build.xml -3. Create a release zip file via the build script: +4. Create a release zip file via the build script: Just type "phing". -4. Make a test installation from your zip file with a fresh +5. Make a test installation from your zip file with a fresh database. Register a user, add bookmarks etc. -5. When all is fine, it's time to release. +6. When all is fine, it's time to release. The build script takes care for most of the tasks. Run "phing release", and it will upload the release to sourceforge and create a svn tag. -6. Write announcement mail to the SemanticScuttle mailing list +7. Write announcement mail to the SemanticScuttle mailing list semanticscuttle-devel@lists.sourceforge.net -7. Announce the new release in the sourceforge project news +8. Announce the new release in the sourceforge project news https://sourceforge.net/apps/trac/sourceforge/wiki/News -- cgit v1.2.3 From 31570df64ce6543de407e7b9d751ba9033d930de Mon Sep 17 00:00:00 2001 From: cweiske Date: Fri, 9 Jul 2010 10:04:35 +0000 Subject: Fix bug getTagsForBookmarks() that fetched all tags, see http://sourceforge.net/projects/semanticscuttle/forums/forum/759510/topic/3752670 for details git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@715 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 5 +++++ src/SemanticScuttle/Service/Bookmark2Tag.php | 7 +------ tests/Bookmark2TagTest.php | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 5b4e4d3..5e24f07 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,11 @@ ChangeLog for SemantiScuttle ============================ +0.9X.X - 2010-XX-XX +------------------- +- Fix bug getTagsForBookmarks() that fetched all tags + + 0.97.0 - 2010-06-09 ------------------- - Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index d6c0e58..4d2c969 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -325,13 +325,8 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService return array(); } - $sql = ''; - foreach ($bookmarkids as $bookmarkid) { - $sql .= ' OR bId = ' . intval($bookmarkid); - } - $query = 'SELECT tag, bId FROM ' . $this->getTableName() - . ' WHERE (1' . $sql . ')' + . ' WHERE bId IN (' . implode(',', $bookmarkids) . ')' . ' AND LEFT(tag, 7) <> "system:"' . ' ORDER BY id, bId ASC'; diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index 0afaaf8..14b71cc 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -171,6 +171,12 @@ class Bookmark2TagTest extends TestBase $bid4 = $this->addBookmark(null, null, 0, array()); //no tags + //bookmark that does not get queried + //http://sourceforge.net/projects/semanticscuttle/forums/forum/759510/topic/3752670 + $bid5 = $this->addBookmark(null, null, 0, array()); + $this->b2ts->attachTags($bid5, array('foo', 'bar2', 'fuu5')); + + $alltags = $this->b2ts->getTagsForBookmarks( array($bid1, $bid2, $bid3, $bid4) ); -- cgit v1.2.3