TESTING A on bm-xserve11 - Bug 407018 expiration not using browser.history_expire_days_min (r=sspitzer)

git-svn-id: svn://10.0.0.236/trunk@240643 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dietrich%mozilla.com 2007-12-07 23:13:52 +00:00
parent 668b21dca2
commit 6a37344c37

View File

@ -478,16 +478,18 @@ nsNavHistoryExpire::FindVisits(PRTime aExpireThreshold, PRUint32 aNumToExpire,
nsresult rv = aConnection->CreateStatement(sqlMinAge, getter_AddRefs(selectMinStatement));
NS_ENSURE_SUCCESS(rv, rv);
rv = selectStatement->BindInt64Parameter(0, aExpireThreshold);
PRInt64 minDaysAgo = mHistory->mExpireDaysMin * 86400 * PR_USEC_PER_SEC;
PRTime minThreshold = PR_Now() - minDaysAgo;
rv = selectMinStatement->BindInt64Parameter(0, minThreshold);
NS_ENSURE_SUCCESS(rv, rv);
rv = selectStatement->BindInt64Parameter(1, aNumToExpire);
rv = selectMinStatement->BindInt64Parameter(1, aNumToExpire);
NS_ENSURE_SUCCESS(rv, rv);
rv = selectStatement->BindInt32Parameter(2, mHistory->mExpireSites);
rv = selectMinStatement->BindInt32Parameter(2, mHistory->mExpireSites);
NS_ENSURE_SUCCESS(rv, rv);
hasMore = PR_FALSE;
while (NS_SUCCEEDED(selectStatement->ExecuteStep(&hasMore)) && hasMore) {
nsNavHistoryExpireRecord record(selectStatement);
while (NS_SUCCEEDED(selectMinStatement->ExecuteStep(&hasMore)) && hasMore) {
nsNavHistoryExpireRecord record(selectMinStatement);
aRecords.AppendElement(record);
}
}