Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

165955 - landing more satchel stuff

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@130646 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hewitt%netscape.com 2002-09-28 06:13:38 +00:00
parent ebcbd5f608
commit 49ae496b0e
2 changed files with 66 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
mozilla/browser/components/history/src/nsGlobalHistory.cpp
View File

@ -3856,61 +3856,6 @@ nsGlobalHistory::SearchEnumerator::ConvertToISupports(nsIMdbRow* aRow,
return NS_OK;
}
/*
//----------------------------------------------------------------------
//
// nsGlobalHistory::AutoCompleteEnumerator
//
// Implementation
nsGlobalHistory::AutoCompleteEnumerator::~AutoCompleteEnumerator()
{
}
PRBool
nsGlobalHistory::AutoCompleteEnumerator::IsResult(nsIMdbRow* aRow)
{
if (!HasCell(mEnv, aRow, mTypedColumn)) {
if (mMatchOnlyTyped || HasCell(mEnv, aRow, mHiddenColumn))
return PR_FALSE;
}
nsCAutoString url;
mHistory->GetRowValue(aRow, mURLColumn, url);
NS_ConvertUTF8toUCS2 utf8Url(url);
PRBool result = mHistory->AutoCompleteCompare(utf8Url, mSelectValue, mExclude);
return result;
}
nsresult
nsGlobalHistory::AutoCompleteEnumerator::ConvertToISupports(nsIMdbRow* aRow, nsISupports** aResult)
{
nsCAutoString url;
mHistory->GetRowValue(aRow, mURLColumn, url);
nsAutoString comments;
mHistory->GetRowValue(aRow, mCommentColumn, comments);
nsCOMPtr<nsIAutoCompleteItem> newItem(do_CreateInstance(NS_AUTOCOMPLETEITEM_CONTRACTID));
NS_ENSURE_TRUE(newItem, NS_ERROR_FAILURE);
newItem->SetValue(NS_ConvertUTF8toUCS2(url.get()));
newItem->SetParam(aRow);
newItem->SetComment(comments.get());
*aResult = newItem;
NS_ADDREF(*aResult);
return NS_OK;
}*/
//----------------------------------------------------------------------
//
// nsIAutoCompleteSession implementation
//
//----------------------------------------------------------------------
//
// nsIAutoCompleteSession implementation
@ -3927,24 +3872,28 @@ nsGlobalHistory::StartSearch(const nsAString &aSearchString,
NS_ENSURE_SUCCESS(OpenDB(), NS_ERROR_FAILURE);
// if the search string is empty after it has had prefixes removed, then
// there is no need to proceed with the search
nsAutoString cut(aSearchString);
AutoCompleteCutPrefix(cut, nsnull);
if (cut.Length() == 0)
return NS_ERROR_ILLEGAL_VALUE;
// pass string through filter and then determine which prefixes to exclude
// when chopping prefixes off of history urls during comparison
nsSharableString filtered = AutoCompletePrefilter(aSearchString);
AutocompleteExclude exclude;
AutoCompleteGetExcludeInfo(filtered, &exclude);
// perform the actual search here
nsIAutoCompleteMdbResult *result = nsnull;
nsresult rv = AutoCompleteSearch(filtered, &exclude, NS_STATIC_CAST(nsIAutoCompleteMdbResult *, aPreviousResult), &result);
NS_ENSURE_SUCCESS(rv, rv);
if (aSearchString.IsEmpty()) {
AutoCompleteTypedSearch(&result);
} else {
// if the search string is empty after it has had prefixes removed, then
// there is no need to proceed with the search
nsAutoString cut(aSearchString);
AutoCompleteCutPrefix(cut, nsnull);
if (cut.Length() == 0)
return NS_ERROR_ILLEGAL_VALUE;
// pass string through filter and then determine which prefixes to exclude
// when chopping prefixes off of history urls during comparison
nsSharableString filtered = AutoCompletePrefilter(aSearchString);
AutocompleteExclude exclude;
AutoCompleteGetExcludeInfo(filtered, &exclude);
// perform the actual search here
nsresult rv = AutoCompleteSearch(filtered, &exclude, NS_STATIC_CAST(nsIAutoCompleteMdbResult *, aPreviousResult), &result);
NS_ENSURE_SUCCESS(rv, rv);
}
aListener->OnSearchResult(this, result);
return NS_OK;
@ -3962,6 +3911,50 @@ nsGlobalHistory::StopSearch()
// AutoComplete stuff
//
nsresult
nsGlobalHistory::AutoCompleteTypedSearch(nsIAutoCompleteMdbResult **aResult)
{
printf("typed search\n");
// Get a cursor to iterate through all rows in the database
nsCOMPtr<nsIMdbTableRowCursor> rowCursor;
mdb_err err = mTable->GetTableRowCursor(mEnv, -1, getter_AddRefs(rowCursor));
NS_ENSURE_TRUE(!err, NS_ERROR_FAILURE);
nsresult rv;
nsCOMPtr<nsIAutoCompleteMdbResult> result = do_CreateInstance("@mozilla.org/autocomplete/mdb-result;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
result->Init(mEnv, mTable);
result->SetTokens(kToken_URLColumn, nsIAutoCompleteMdbResult::kCharType, kToken_NameColumn, nsIAutoCompleteMdbResult::kUnicharType);
nsIMdbRow *row = nsnull;
mdb_pos pos;
do {
rowCursor->NextRow(mEnv, &row, &pos);
if (!row) break;
if (HasCell(mEnv, row, kToken_TypedColumn)) {
printf("row\n");
result->AddRow(row);
}
} while (row);
// Determine the result of the search
PRUint32 matchCount;
rv = result->GetMatchCount(&matchCount);
if (matchCount > 0) {
result->SetSearchResult(nsIAutoCompleteResult::RESULT_SUCCESS);
result->SetDefaultIndex(0);
} else {
result->SetSearchResult(nsIAutoCompleteResult::RESULT_NOMATCH);
result->SetDefaultIndex(-1);
}
*aResult = result;
NS_ADDREF(*aResult);
return NS_OK;
}
nsresult
nsGlobalHistory::AutoCompleteSearch(const nsAString &aSearchString,
AutocompleteExclude *aExclude,

40
mozilla/browser/components/history/src/nsGlobalHistory.h
View File

@ -215,6 +215,7 @@ protected:
nsStringArray mIgnoreSchemes;
nsStringArray mIgnoreHostnames;
nsresult AutoCompleteTypedSearch(nsIAutoCompleteMdbResult **aResult);
nsresult AutoCompleteSearch(const nsAString& aSearchString,
AutocompleteExclude* aExclude,
nsIAutoCompleteMdbResult* aPrevResult,
@ -417,48 +418,9 @@ protected:
PRBool RowMatches(nsIMdbRow* aRow, searchQuery *aQuery);
};
/*// AutoCompleteEnumerator - for searching for a partial url match
class AutoCompleteEnumerator : public nsMdbTableEnumerator
{
protected:
nsGlobalHistory* mHistory;
mdb_column mURLColumn;
mdb_column mHiddenColumn;
mdb_column mTypedColumn;
mdb_column mCommentColumn;
AutocompleteExclude* mExclude;
const nsAString& mSelectValue;
PRBool mMatchOnlyTyped;
virtual ~AutoCompleteEnumerator();
public:
AutoCompleteEnumerator(nsGlobalHistory* aHistory,
mdb_column aURLColumn,
mdb_column aCommentColumn,
mdb_column aHiddenColumn,
mdb_column aTypedColumn,
PRBool aMatchOnlyTyped,
const nsAString& aSelectValue,
AutocompleteExclude* aExclude) :
mHistory(aHistory),
mURLColumn(aURLColumn),
mHiddenColumn(aHiddenColumn),
mTypedColumn(aTypedColumn),
mCommentColumn(aCommentColumn),
mExclude(aExclude),
mSelectValue(aSelectValue),
mMatchOnlyTyped(aMatchOnlyTyped) {}
protected:
virtual PRBool IsResult(nsIMdbRow* aRow);
virtual nsresult ConvertToISupports(nsIMdbRow* aRow, nsISupports** aResult);
};*/
friend class URLEnumerator;
friend class SearchEnumerator;
// friend class AutoCompleteEnumerator;
};