Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#206775

Browse Source 
r=pedemonte, sr=alecf
Allow history search to work with NLS chars and special chars
This commit is contained in:
mkaply%us.ibm.com 2003-06-10 18:29:23 +00:00
parent 5d2d6f2f77
commit 6c434e3246
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xpfe/components/history/src/Makefile.in
View File

@ -36,6 +36,7 @@ REQUIRES = xpcom \
necko \
intl \
unicharutil \
uconv \
$(NULL)
CPPSRCS = nsGlobalHistory.cpp \

18
xpfe/components/history/src/nsGlobalHistory.cpp
View File

@ -84,6 +84,7 @@
#include "nsIPrefBranchInternal.h"
#include "nsIObserverService.h"
#include "nsITextToSubURI.h"
PRInt32 nsGlobalHistory::gRefCnt;
nsIRDFService* nsGlobalHistory::gRDFService;
@ -182,9 +183,13 @@ public:
method(aMethod, aMethod+aMethodLen)
{
MOZ_COUNT_CTOR(searchTerm);
// need to do UTF8-conversion/unescaping here, using
// nsITextToSubURI
text.AssignWithConversion(aText, aTextLen);
nsresult rv;
nsCOMPtr<nsITextToSubURI> textToSubURI = do_GetService(NS_ITEXTTOSUBURI_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv))
{
nsCAutoString temp(aText, aTextLen);
textToSubURI->UnEscapeAndConvert("UTF-8", temp.get(), getter_Copies(text));
}
}
~searchTerm() {
MOZ_COUNT_DTOR(searchTerm);
@ -193,7 +198,7 @@ public:
nsDependentSingleFragmentCSubstring datasource; // should always be "history" ?
nsDependentSingleFragmentCSubstring property; // AgeInDays, Hostname, etc
nsDependentSingleFragmentCSubstring method; // is, isgreater, isless
nsAutoString text; // text to match
nsXPIDLString text; // text to match
rowMatchCallback match; // matching callback if needed
};
@ -339,7 +344,10 @@ matchAgeInDaysCallback(nsIMdbRow *row, void *aClosure)
// this saves us from recalculating this stuff on every row
if (!matchSearchTerm->haveClosure) {
PRInt32 err;
matchSearchTerm->intValue = term->text.ToInteger(&err);
// nsXPIDLString doesn't have a ToInteger
// so convert it to an nsAutoString
nsAutoString temp(term->text);
matchSearchTerm->intValue = temp.ToInteger(&err);
matchSearchTerm->now = NormalizeTime(PR_Now());
if (err != 0) return PR_FALSE;
matchSearchTerm->haveClosure = PR_TRUE;