wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 376650 - Sort by keyword support. r=sspitzer.

Browse Source
This commit is contained in:
mozilla.mano@sent.com 2007-05-14 14:47:59 -07:00
parent 301af5c506
commit 4c735f8832
5 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/components/places/public/nsINavHistoryService.idl
View File

@ -1010,8 +1010,10 @@ interface nsINavHistoryQueryOptions : nsISupports
const unsigned short SORT_BY_URI_DESCENDING = 6;
const unsigned short SORT_BY_VISITCOUNT_ASCENDING = 7;
const unsigned short SORT_BY_VISITCOUNT_DESCENDING = 8;
const unsigned short SORT_BY_ANNOTATION_ASCENDING = 9;
const unsigned short SORT_BY_ANNOTATION_DESCENDING = 10;
const unsigned short SORT_BY_KEYWORD_ASCENDING = 9;
const unsigned short SORT_BY_KEYWORD_DESCENDING = 10;
const unsigned short SORT_BY_ANNOTATION_ASCENDING = 11;
const unsigned short SORT_BY_ANNOTATION_DESCENDING = 12;
/**
* "URI" results, one for each URI visited in the range. Individual result

5
toolkit/components/places/src/nsNavBookmarks.cpp
View File

@ -2096,6 +2096,11 @@ nsNavBookmarks::SetKeywordForBookmark(PRInt64 aBookmarkId, const nsAString& aKey
rv = updateKeywordStmnt->Execute();
NS_ENSURE_SUCCESS(rv, rv);
transaction.Commit();
// Pass the new keyword to OnItemChanged.
ENUMERATE_WEAKARRAY(mObservers, nsINavBookmarkObserver,
OnItemChanged(aBookmarkId, NS_LITERAL_CSTRING("keyword"),
PR_FALSE, NS_ConvertUTF16toUTF8(aKeyword)))
return NS_OK;
}

53
toolkit/components/places/src/nsNavHistoryResult.cpp
View File

@ -587,6 +587,10 @@ nsNavHistoryContainerResultNode::GetSortingComparator(PRUint16 aSortType)
return &SortComparison_VisitCountLess;
case nsINavHistoryQueryOptions::SORT_BY_VISITCOUNT_DESCENDING:
return &SortComparison_VisitCountGreater;
case nsINavHistoryQueryOptions::SORT_BY_KEYWORD_ASCENDING:
return &SortComparison_KeywordLess;
case nsINavHistoryQueryOptions::SORT_BY_KEYWORD_DESCENDING:
return &SortComparison_KeywordGreater;
case nsINavHistoryQueryOptions::SORT_BY_ANNOTATION_ASCENDING:
return &SortComparison_AnnotationLess;
case nsINavHistoryQueryOptions::SORT_BY_ANNOTATION_DESCENDING:
@ -817,6 +821,42 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_URIGreater(
return -SortComparison_URILess(a, b, closure);
}
// nsNavHistoryContainerResultNode::SortComparison_Keyword*
PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_KeywordLess(
nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure)
{
PRInt32 value = 0;
if (a->mItemId != -1 || b->mItemId != -1) {
// compare the keywords
nsAutoString aKeyword, bKeyword;
nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
NS_ENSURE_TRUE(bookmarks, 0);
nsresult rv;
if (a->mItemId != -1) {
rv = bookmarks->GetKeywordForBookmark(a->mItemId, aKeyword);
NS_ENSURE_SUCCESS(rv, 0);
}
if (b->mItemId != -1) {
rv = bookmarks->GetKeywordForBookmark(b->mItemId, aKeyword);
NS_ENSURE_SUCCESS(rv, 0);
}
value = SortComparison_StringLess(aKeyword, bKeyword);
}
// fall back to title sorting
if (value == 0)
value = SortComparison_TitleLess(a, b, closure);
return value;
}
PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_KeywordGreater(
nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure)
{
return -SortComparison_KeywordLess(a, b, closure);
}
PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_AnnotationLess(
nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure)
@ -859,7 +899,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_AnnotationLe
&a_hasAnno), 0);
} else {
NS_ENSURE_SUCCESS(annosvc->PageHasAnnotation(a_uri, annoName,
&a_hasAnno), 0);
&a_hasAnno), 0);
}
if (b_itemAnno) {
NS_ENSURE_SUCCESS(annosvc->ItemHasAnnotation(b->mItemId, annoName,
@ -893,14 +933,15 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_AnnotationLe
&b_type), 0);
}
// We better make the API not support this state, really
if (b_type != annoType)
if (a_hasAnno && b_type != annoType)
return 0;
annoType = b_type;
}
#define GET_ANNOTATIONS_VALUES(METHOD_ITEM, METHOD_PAGE, A_VAL, B_VAL) \
if (a_hasAnno) { \
if (a_itemAnno) { \
NS_ENSURE_SUCCESS(annosvc->METHOD_ITEM(a->mItemId, annoName, \
NS_ENSURE_SUCCESS(annosvc->METHOD_ITEM(a->mItemId, annoName, \
A_VAL), 0); \
} else { \
NS_ENSURE_SUCCESS(annosvc->METHOD_PAGE(a_uri, annoName, \
@ -909,7 +950,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_AnnotationLe
} \
if (b_hasAnno) { \
if (b_itemAnno) { \
NS_ENSURE_SUCCESS(annosvc->METHOD_ITEM(b->mItemId, annoName, \
NS_ENSURE_SUCCESS(annosvc->METHOD_ITEM(b->mItemId, annoName, \
B_VAL), 0); \
} else { \
NS_ENSURE_SUCCESS(annosvc->METHOD_PAGE(b_uri, annoName, \
@ -3075,7 +3116,9 @@ nsNavHistoryFolderResultNode::OnItemChanged(PRInt64 aItemId,
else if (aProperty.EqualsLiteral("cleartime")) {
node->mTime = 0;
}
else if (!aIsAnnotationProperty){
else if (!aProperty.EqualsLiteral("keyword") && !aIsAnnotationProperty) {
// XXX: expose a keyword getter on bookmarks nodes?
NS_NOTREACHED("Unknown bookmark property changing.");
}

4
toolkit/components/places/src/nsNavHistoryResult.h
View File

@ -570,6 +570,10 @@ public:
nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
PR_STATIC_CALLBACK(int) SortComparison_VisitCountGreater(
nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
PR_STATIC_CALLBACK(int) SortComparison_KeywordLess(
nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
PR_STATIC_CALLBACK(int) SortComparison_KeywordGreater(
nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
PR_STATIC_CALLBACK(int) SortComparison_AnnotationLess(
nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure);
PR_STATIC_CALLBACK(int) SortComparison_AnnotationGreater(

7
toolkit/components/places/tests/unit/test_result_sort.js
View File

@ -126,6 +126,13 @@ function run_test() {
bmsvc.changeBookmarkURI(id1, uri1);
checkOrder(id1, id3, id2);
// keyword sort
result.sortingMode = NHQO.SORT_BY_KEYWORD_ASCENDING;
checkOrder(id3, id2, id1); // no keywords set - falling back to title sort
bmsvc.setKeywordForBookmark(id1, "a");
bmsvc.setKeywordForBookmark(id2, "z");
checkOrder(id3, id1, id2);
// XXXtodo: test history sortings (visit count, visit date)
// XXXtodo: test different item types once folderId and bookmarkId are merged.
// XXXtodo: test sortingAnnotation functionality with non-bookmark nodes