summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authormensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-01-23 16:58:00 +0000
committermensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-01-23 16:58:00 +0000
commitc385dc63425ade7a15ac9abc8f2d931e8141e412 (patch)
treee003a2462533e7c9e4c70156dd494ca3ccc66d9a /services
parent47f8a6dd9ebb1d7e7595215186db18522f4ea0de (diff)
downloadsemanticscuttle-c385dc63425ade7a15ac9abc8f2d931e8141e412.tar.gz
semanticscuttle-c385dc63425ade7a15ac9abc8f2d931e8141e412.tar.bz2
Interface design: merging of bookmarks with same URLs
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@24 b3834d28-1941-0410-a4f8-b48e95affb8f
Diffstat (limited to 'services')
-rw-r--r--services/bookmarkservice.php16
1 files changed, 10 insertions, 6 deletions
diff --git a/services/bookmarkservice.php b/services/bookmarkservice.php
index fdb49a0..3181123 100644
--- a/services/bookmarkservice.php
+++ b/services/bookmarkservice.php
@@ -277,24 +277,28 @@ class BookmarkService {
$query_3 .= ' AND ('. $query_3_1 .') AND B.bStatus IN (0, 1)';
}
+ if($hash == null) {
+ $query_5.= ' GROUP BY B.bHash';
+ }
+
switch($sortOrder) {
case 'date_asc':
- $query_5 = ' ORDER BY B.bDatetime ASC ';
+ $query_5.= ' ORDER BY B.bDatetime ASC ';
break;
case 'title_desc':
- $query_5 = ' ORDER BY B.bTitle DESC ';
+ $query_5.= ' ORDER BY B.bTitle DESC ';
break;
case 'title_asc':
- $query_5 = ' ORDER BY B.bTitle ASC ';
+ $query_5.= ' ORDER BY B.bTitle ASC ';
break;
case 'url_desc':
- $query_5 = ' ORDER BY B.bAddress DESC ';
+ $query_5.= ' ORDER BY B.bAddress DESC ';
break;
case 'url_asc':
- $query_5 = ' ORDER BY B.bAddress ASC ';
+ $query_5.= ' ORDER BY B.bAddress ASC ';
break;
default:
- $query_5 = ' ORDER BY B.bDatetime DESC ';
+ $query_5.= ' ORDER BY B.bDatetime DESC ';
}
// Handle the parts of the query that depend on any tags that are present.