From c385dc63425ade7a15ac9abc8f2d931e8141e412 Mon Sep 17 00:00:00 2001
From: mensonge
Date: Wed, 23 Jan 2008 16:58:00 +0000
Subject: 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
---
 services/bookmarkservice.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'services')

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.
-- 
cgit v1.2.3-54-g00ecf