mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 402799: Saved searches that match on tags show duplicates, patch by Marco Bonardo <mak77@supereva.it>, r=dietrich, a=beltzner

This commit is contained in:
gavin%gavinsharp.com 2008-04-29 19:16:42 +00:00
Родитель 77454bd7e4
Коммит 285b1e6940
5 изменённых файлов: 147 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
toolkit/components/places/src/nsNavHistory.cpp
Просмотреть файл

@ -2947,10 +2947,14 @@ PlacesSQLQueryBuilder::SelectAsURI()
break;
case nsINavHistoryQueryOptions::QUERY_TYPE_BOOKMARKS:
if (mResultType == nsINavHistoryQueryOptions::RESULTS_AS_TAG_CONTENTS) {
nsNavHistory* history = nsNavHistory::GetHistoryService();
NS_ENSURE_STATE(history);
// Don't initialize on var creation, that would give an error on compile
// because we are in the same scope of the switch clause and the var could
// not be initialized. Do an assignment rather than an initialization.
nsNavHistory* history;
history = nsNavHistory::GetHistoryService();
NS_ENSURE_STATE(history);
if (mResultType == nsINavHistoryQueryOptions::RESULTS_AS_TAG_CONTENTS) {
// Order-by clause is hardcoded because we need to discard duplicates
// in FilterResultSet. We will retain only the last modified item,
// so we are ordering by place id and last modified to do a faster
@ -2971,7 +2975,7 @@ PlacesSQLQueryBuilder::SelectAsURI()
"(SELECT b.fk FROM moz_bookmarks b WHERE b.type = 1 {ADDITIONAL_CONDITIONS}) "
"AND NOT EXISTS "
"(SELECT id FROM moz_bookmarks WHERE id = b1.parent AND parent = ") +
nsPrintfCString("%d", history->GetTagsFolder()) +
nsPrintfCString("%lld", history->GetTagsFolder()) +
NS_LITERAL_CSTRING(")) ORDER BY b2.fk DESC, b2.lastModified DESC");
}
else {
@ -2981,8 +2985,12 @@ PlacesSQLQueryBuilder::SelectAsURI()
SQL_STR_FRAGMENT_MAX_VISIT_DATE( "b.fk" )
", f.url, null, b.id, b.dateAdded, b.lastModified "
"FROM moz_bookmarks b "
"JOIN moz_places h ON b.fk = h.id AND b.type = 1 "
"LEFT OUTER JOIN moz_favicons f ON h.favicon_id = f.id ");
"JOIN moz_places h ON b.fk = h.id AND b.type = 1 "
"LEFT OUTER JOIN moz_favicons f ON h.favicon_id = f.id "
"WHERE NOT EXISTS "
"(SELECT id FROM moz_bookmarks WHERE id = b.parent AND parent = ") +
nsPrintfCString("%lld", history->GetTagsFolder()) +
NS_LITERAL_CSTRING(") {ADDITIONAL_CONDITIONS}");
}
break;

95
toolkit/components/places/tests/unit/test_402799.js Normal file
Просмотреть файл

@ -0,0 +1,95 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et: */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Places unit test code.
*
* The Initial Developer of the Original Code is
* Mozilla Corporation.
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Marco Bonardo <mak77@supereva.it> (Original Author)
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
// Get history services
try {
var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
getService(Ci.nsINavHistoryService);
var bhist = histsvc.QueryInterface(Ci.nsIBrowserHistory);
} catch(ex) {
do_throw("Could not get history services\n");
}
// Get bookmark service
try {
var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
getService(Ci.nsINavBookmarksService);
}
catch(ex) {
do_throw("Could not get the nav-bookmarks-service\n");
}
// Get tagging service
try {
var tagssvc = Cc["@mozilla.org/browser/tagging-service;1"].
getService(Ci.nsITaggingService);
} catch(ex) {
do_throw("Could not get tagging service\n");
}
// main
function run_test() {
var uri1 = uri("http://foo.bar/");
// create 2 bookmarks on the same uri
var bookmark1id = bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri1,
bmsvc.DEFAULT_INDEX, "title 1");
var bookmark2id = bmsvc.insertBookmark(bmsvc.toolbarFolder, uri1,
bmsvc.DEFAULT_INDEX, "title 2");
// add some tags
tagssvc.tagURI(uri1, ["foo", "bar", "foobar", "foo bar"]);
// check that a generic bookmark query returns only real bookmarks
var options = histsvc.getNewQueryOptions();
options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
var query = histsvc.getNewQuery();
var result = histsvc.executeQuery(query, options);
var root = result.root;
root.containerOpen = true;
var cc = root.childCount;
do_check_eq(cc, 2);
var node1 = root.getChild(0);
do_check_eq(bmsvc.getFolderIdForItem(node1.itemId), bmsvc.bookmarksMenuFolder);
var node2 = root.getChild(1);
do_check_eq(bmsvc.getFolderIdForItem(node2.itemId), bmsvc.toolbarFolder);
root.containerOpen = false;
}

14
toolkit/components/places/tests/unit/test_419731.js
Просмотреть файл

@ -83,9 +83,9 @@ function run_test() {
var result = histsvc.executeQuery(query, options);
var tagRoot = result.root;
tagRoot.containerOpen = true;
var tag1node = tagRoot.getChild(0)
.QueryInterface(Ci.nsINavHistoryContainerResultNode);
var tag1itemId = tag1node.itemId;
var tagNode = tagRoot.getChild(0)
.QueryInterface(Ci.nsINavHistoryContainerResultNode);
var tagItemId = tagNode.itemId;
tagRoot.containerOpen = false;
// change bookmark 1 title
@ -95,8 +95,9 @@ function run_test() {
options = histsvc.getNewQueryOptions();
options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
options.resultType = options.RESULTS_AS_TAG_CONTENTS;
options.includeHidden = true;
query = histsvc.getNewQuery();
query.setFolders([tagItemId], 1);
result = histsvc.executeQuery(query, options);
var root = result.root;
@ -114,15 +115,16 @@ function run_test() {
options = histsvc.getNewQueryOptions();
options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
options.resultType = options.RESULTS_AS_TAG_CONTENTS;
options.includeHidden = true;
query = histsvc.getNewQuery();
query.setFolders([tagItemId], 1);
result = histsvc.executeQuery(query, options);
root = result.root;
root.containerOpen = true;
cc = root.childCount;
do_check_eq(cc, 1);
var node = root.getChild(0);
node = root.getChild(0);
do_check_eq(node.title, "new title 2");
root.containerOpen = false;
}

17
toolkit/components/places/tests/unit/test_multi_word_tags.js
Просмотреть файл

@ -46,6 +46,15 @@ try {
do_throw("Could not get history service\n");
}
// Get bookmark service
try {
var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
getService(Ci.nsINavBookmarksService);
}
catch(ex) {
do_throw("Could not get the nav-bookmarks-service\n");
}
// Get tagging service
try {
var tagssvc = Cc["@mozilla.org/browser/tagging-service;1"].
@ -63,6 +72,13 @@ function run_test() {
var uri5 = uri("http://site.tld/5");
var uri6 = uri("http://site.tld/6");
bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri1, bmsvc.DEFAULT_INDEX, null);
bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri2, bmsvc.DEFAULT_INDEX, null);
bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri3, bmsvc.DEFAULT_INDEX, null);
bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri4, bmsvc.DEFAULT_INDEX, null);
bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri5, bmsvc.DEFAULT_INDEX, null);
bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri6, bmsvc.DEFAULT_INDEX, null);
tagssvc.tagURI(uri1, ["foo"]);
tagssvc.tagURI(uri2, ["bar"]);
tagssvc.tagURI(uri3, ["cheese"]);
@ -73,6 +89,7 @@ function run_test() {
// exclude livemark items, search for "item", should get one result
var options = histsvc.getNewQueryOptions();
options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
var query = histsvc.getNewQuery();
query.searchTerms = "foo";
var result = histsvc.executeQuery(query, options);

25
toolkit/components/places/tests/unit/test_resolveNullBookmarkTitles.js
Просмотреть файл

@ -69,27 +69,28 @@ function run_test() {
var uri1 = uri("http://foo.tld/");
var uri2 = uri("https://bar.tld/");
bhist.addPageWithDetails(uri1, "foo title", Date.now() * 1000);
bhist.addPageWithDetails(uri2, "bar title", Date.now() * 1000);
bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri1, bmsvc.DEFAULT_INDEX, null);
bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri2, bmsvc.DEFAULT_INDEX, null);
tagssvc.tagURI(uri1, ["tag 1"]);
tagssvc.tagURI(uri2, ["tag 2"]);
bhist.addPageWithDetails(uri1, "foo title", Date.now() * 1000);
bhist.addPageWithDetails(uri2, "bar title", Date.now() * 1000);
var options = histsvc.getNewQueryOptions();
options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
options.maxResults = 2;
options = histsvc.getNewQueryOptions();
options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
options.maxResults = 2;
options.resultType = options.RESULTS_AS_TAG_CONTENTS;
var query = histsvc.getNewQuery();
query.setFolders([bmsvc.tagsFolder], 1);
// if we don't set a tag folder, RESULTS_AS_TAG_CONTENTS will return all
// tagged URIs
var result = histsvc.executeQuery(query, options);
var root = result.root;
root.containerOpen = true;
do_check_eq(root.childCount, 2);
do_check_eq(root.getChild(0).title, "foo title");
do_check_eq(root.getChild(1).title, "bar title");
// actually RESULTS_AS_TAG_CONTENTS return results ordered by place_id DESC
// so they are reversed
do_check_eq(root.getChild(0).title, "bar title");
do_check_eq(root.getChild(1).title, "foo title");
}