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

This commit is contained in:
dietrich@mozilla.com 2007-12-07 15:13:52 -08:00
Родитель 0b1b955b10
Коммит 95d3f5f43f
1 изменённых файлов: 7 добавлений и 5 удалений

Просмотреть файл

@ -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);
}
}