summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2009-10-28 22:33:36 +0000
committercweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2009-10-28 22:33:36 +0000
commit39db48150629d92de6a61bb601357389f225b3b2 (patch)
tree6d652e12f5cf8e8d11dd9a7a84b0e483d07e3212
parent63f82a410158e2ace4584acdbc2f8896daa444b2 (diff)
downloadsemanticscuttle-39db48150629d92de6a61bb601357389f225b3b2.tar.gz
semanticscuttle-39db48150629d92de6a61bb601357389f225b3b2.tar.bz2
unification test was unstable, too
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@464 b3834d28-1941-0410-a4f8-b48e95affb8f
-rw-r--r--src/SemanticScuttle/Service/Bookmark.php43
-rw-r--r--tests/BookmarkTest.php7
2 files changed, 30 insertions, 20 deletions
diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php
index e569ade..287994d 100644
--- a/src/SemanticScuttle/Service/Bookmark.php
+++ b/src/SemanticScuttle/Service/Bookmark.php
@@ -479,7 +479,8 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
* @param string $sortOrder One of the following values:
* "date_asc", "date_desc",
* "title_desc", "title_asc",
- * "url_desc", "url_asc"
+ * "url_desc", "url_asc",
+ * "voting_asc", "voting_desc"
* @param boolean $watched True if only watched bookmarks
* shall be returned (FIXME)
* @param integer $startdate Filter for creation date.
@@ -574,23 +575,29 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
}
switch($sortOrder) {
- case 'date_asc':
- $query_5.= ' ORDER BY B.bModified ASC ';
- break;
- case 'title_desc':
- $query_5.= ' ORDER BY B.bTitle DESC ';
- break;
- case 'title_asc':
- $query_5.= ' ORDER BY B.bTitle ASC ';
- break;
- case 'url_desc':
- $query_5.= ' ORDER BY B.bAddress DESC ';
- break;
- case 'url_asc':
- $query_5.= ' ORDER BY B.bAddress ASC ';
- break;
- default:
- $query_5.= ' ORDER BY B.bModified DESC ';
+ case 'date_asc':
+ $query_5 .= ' ORDER BY B.bModified ASC ';
+ break;
+ case 'title_desc':
+ $query_5 .= ' ORDER BY B.bTitle DESC ';
+ break;
+ case 'title_asc':
+ $query_5 .= ' ORDER BY B.bTitle ASC ';
+ break;
+ case 'voting_desc':
+ $query_5 .= ' ORDER BY B.bVoting DESC ';
+ break;
+ case 'voting_asc':
+ $query_5 .= ' ORDER BY B.bVoting ASC ';
+ break;
+ case 'url_desc':
+ $query_5 .= ' ORDER BY B.bAddress DESC ';
+ break;
+ case 'url_asc':
+ $query_5 .= ' ORDER BY B.bAddress ASC ';
+ break;
+ default:
+ $query_5 .= ' ORDER BY B.bModified DESC ';
}
// Handle the parts of the query that depend on any tags that are present.
diff --git a/tests/BookmarkTest.php b/tests/BookmarkTest.php
index 82c5fa6..01e6b38 100644
--- a/tests/BookmarkTest.php
+++ b/tests/BookmarkTest.php
@@ -103,15 +103,18 @@ class BookmarkTest extends TestBase
{
$bs = $this->bs;
+ $uid = $this->addUser();
+ $uid2 = $this->addUser();
+
$bs->addBookmark(
'http://site1.com', "title", "description", 'note',
0, array('tag1'), null, false, false,
- 1
+ $uid
);
$bs->addBookmark(
"http://site1.com", "title2", "description2", 'note',
0, array('tag2'), null, false, false,
- 2
+ $uid2
);
$bookmarks = $bs->getBookmarks();