MCL/sf/mw/web: comparison browserutilities/recenturlstore/RecentUrlSrc/RecentUrlStore.cpp

equal deleted inserted replaced

-:10e98eab6f85
+:a359256acfc6
 // Returns matching urls.
 //-----------------------------------------------------------------------------
 void CRecentUrlStore::GetDataL (RDbNamedDatabase& aDataBase,
 			CDesCArray& aUrls, CDesCArray& aTitles, const TDesC& aUrl)
 {
+// shouldn't happen but if it's too long just skip it!
-TInt rowCount(0);
+if ( aUrl.Length() <= KUrlSize)
+		{
-	// select values from the database filtered by url
+		TInt rowCount(0);
-	if (aUrl.Length())
-		{
+		// select values from the database filtered by url
-		HBufC* domain = aUrl.AllocLC();
+		if (aUrl.Length())
-		domain->Des().LowerCase();
+			{
-		iSQLStatement.Format(KSQLSelect, domain, domain);
+			HBufC* domain = aUrl.AllocLC();
-		CleanupStack::PopAndDestroy();
+			domain->Des().LowerCase();
-		}
+			iSQLStatement.Format(KSQLSelect, domain, domain);
-	else
+			CleanupStack::PopAndDestroy();
-		{
+			}
-		iSQLStatement.Format(KSQLSelectAll);
+		else
-		}
+			{
+			iSQLStatement.Format(KSQLSelectAll);
+			}
-RDbView view;
+		RDbView view;
-TInt err = view.Prepare(aDataBase, TDbQuery(iSQLStatement));
+		CleanupClosePushL( view );
-if (err == KErrNone)
+		User::LeaveIfError( view.Prepare(aDataBase, TDbQuery(iSQLStatement)) );
-	{
+		User::LeaveIfError( view.EvaluateAll() );
-	err = view.EvaluateAll();
+		view.FirstL();
-	if (err == KErrNone)
+			// loop through rows and build the list
-		{
+		while (view.AtRow() && rowCount++ < KMaxRows)
-		view.FirstL();
+			{
-		// loop through rows and build the list
+			view.GetL();
-		while (view.AtRow() && rowCount++ < KMaxRows)
+			aUrls.AppendL(view.ColDes(KUrlCol));
-			{
+			aTitles.AppendL(view.ColDes(KTitleCol));
-			view.GetL();
+			view.NextL();
-				aUrls.AppendL(view.ColDes(KUrlCol));
+			}
-				aTitles.AppendL(view.ColDes(KTitleCol));
+		/*
-			view.NextL();
+		* This loop will keep the number of rows in the database at a reasonable size by
-			}
+		* deleting old rows (deletes rows beyond KMaxRows).  Should be at most 1 row deleted.
-		/*
+		* Its more efficiant to delete it here than in the SaveData because in this function
-		* This loop will keep the number of rows in the database at a reasonable size by
+		* we already have the list and know its size
-		* deleting old rows (deletes rows beyond KMaxRows).  Should be at most 1 row deleted.
+		*/
-		* Its more efficiant to delete it here than in the SaveData because in this function
+		while (view.AtRow())
-		* we already have the list and know its size
+			{
-		*/
+			view.GetL();
-		while (view.AtRow())
+			iSQLStatement.Format(KSQLDelete, &aUrl);
-			{
+			aDataBase.Execute(iSQLStatement);
-			view.GetL();
+			view.NextL();
-			iSQLStatement.Format(KSQLDelete, &aUrl);
+			}
-				aDataBase.Execute(iSQLStatement);
+		CleanupStack::PopAndDestroy( &view );
-			view.NextL();
+		}
-			}
-		}
-	}
-view.Close();
 }
 //-----------------------------------------------------------------------------
 // CRecentUrlStore::DeleteData
 // Deletes a single row from the database.
 //-----------------------------------------------------------------------------
 EXPORT_C void CRecentUrlStore::DeleteData (const TDesC& aUrl)
 {
-RDbNamedDatabase dataBase;
+// shouldn't happen but if it's too long just skip it!
-if (OpenDatabase(dataBase) == KErrNone)
+if ( aUrl.Length() <= KUrlSize)
-	{
+		{
-		iSQLStatement.Format(KSQLDelete, &aUrl);
+		RDbNamedDatabase dataBase;
-		dataBase.Execute(iSQLStatement);
+		if (OpenDatabase(dataBase) == KErrNone)
-	dataBase.Close();
+			{
-	}
+			iSQLStatement.Format(KSQLDelete, &aUrl);
-}
+			dataBase.Execute(iSQLStatement);
+			dataBase.Close();
+			}
+		}
+	}
 //-----------------------------------------------------------------------------
 // CRecentUrlStore::SaveDataL
 // Save the url in store.
 //-----------------------------------------------------------------------------
-EXPORT_C void CRecentUrlStore::SaveData (const TDesC& aUrl, const TDesC& aTitle)
+EXPORT_C void CRecentUrlStore::SaveDataL (const TDesC& aUrl, const TDesC& aTitle)
 	{
-	RDbNamedDatabase dataBase;
+	TInt urlLength (aUrl.Length());
-	TInt urlLength (aUrl.Length());
 	// shouldn't happen but if it's too long for the data store just skip it!
-	if (urlLength > KUrlSize)
+	if (urlLength <= KUrlSize)
 		{
-		return;
+		RDbNamedDatabase dataBase;
-		}
+		CleanupClosePushL( dataBase );
+		if (OpenDatabase(dataBase) == KErrNone)
-	if (OpenDatabase(dataBase) == KErrNone)
+			{
-		{
+			// find the point where the domain starts and ends
-		// find the point where the domain starts and ends
+			TInt domainLength(urlLength);
-		TInt domainLength(urlLength);
+			TInt domainStart(0);
-		TInt domainStart(0);
+			TInt startPos = aUrl.Find(KDomainDelim);
-		TInt startPos = aUrl.Find(KDomainDelim);
+			if (startPos != KErrNotFound)
-		if (startPos != KErrNotFound)
-			{
-			domainStart = startPos + (KDomainDelim().Length()); // first char after delim
-			TInt len = aUrl.Right(urlLength - domainStart).Find(KDomainDelim);
-			if (len > 0) // ignore delim following delim.  we don't want an empty string
 				{
-				domainLength = len;
+				domainStart = startPos + (KDomainDelim().Length()); // first char after delim
+				TInt len = aUrl.Right(urlLength - domainStart).Find(KDomainDelim);
+				if (len > 0) // ignore delim following delim.  we don't want an empty string
+					{
+					domainLength = len;
+					}
+				else
+					{
+					domainLength -= domainStart;
+					}
 				}
-			else
-				{
+			// make sure it's not too big for the data store
-				domainLength -= domainStart;
+			domainLength = (domainLength > KDomainSize) ? KDomainSize : domainLength;
-				}
+			TInt titleLength = (aTitle.Length() > KTitleSize) ? KTitleSize : aTitle.Length();
-			}
+			HBufC* domain = aUrl.Mid(domainStart,domainLength).AllocLC();
+			domain->Des().LowerCase();
+			HBufC* title = aTitle.Left(titleLength).AllocLC();
+			// delete and re-insert
+			iSQLStatement.Format(KSQLDelete, &aUrl);
+			dataBase.Execute(iSQLStatement);
+			iSQLStatement.Format(KSQLInsert, domain, &aUrl, title);
+			dataBase.Execute(iSQLStatement);
-		// make sure it's not too big for the data store
+			CleanupStack::PopAndDestroy(3, &dataBase );
-		domainLength = (domainLength > KDomainSize) ? KDomainSize : domainLength;
+			}
-		TInt titleLength = (aTitle.Length() > KTitleSize) ? KTitleSize : aTitle.Length();
-		HBufC* domain = aUrl.Mid(domainStart,domainLength).AllocLC();
-		domain->Des().LowerCase();
-		HBufC* title = aTitle.Left(titleLength).AllocLC();
-		// delete and re-insert
-		iSQLStatement.Format(KSQLDelete, &aUrl);
-		dataBase.Execute(iSQLStatement);
-		iSQLStatement.Format(KSQLInsert, domain, &aUrl, title);
-		CleanupStack::PopAndDestroy(2); // domain, title
-		dataBase.Execute(iSQLStatement);
-		dataBase.Close();
 		}
 	}
 //-----------------------------------------------------------------------------
 // CRecentUrlStore::ClearData
 //-----------------------------------------------------------------------------
 // CRecentUrlStore::DeleteOldRowsL
 //-----------------------------------------------------------------------------
 void CRecentUrlStore::DeleteOldRowsL (RDbNamedDatabase& aDataBase)
 {
 TInt rowCount(0);
 	iSQLStatement.Format(KSQLSelectAll);
 RDbView view;
+CleanupClosePushL( view );
-TInt err = view.Prepare(aDataBase, TDbQuery(iSQLStatement));
-if (err == KErrNone)
+User::LeaveIfError( view.Prepare(aDataBase, TDbQuery(iSQLStatement)));
-	{
+User::LeaveIfError(  view.EvaluateAll() );
-	err = view.EvaluateAll();
+	view.FirstL();
-	if (err == KErrNone)
+	// loop through rows we want to keep
-		{
+	while (view.AtRow() && rowCount++ < KMaxRows)
-		view.FirstL();
+		{
-		// loop through rows we want to keep
+		view.NextL();
-		while (view.AtRow() && rowCount++ < KMaxRows)
+		}
-			{
+	// delete the rows that are old
-			view.NextL();
+	while (view.AtRow())
-			}
+		{
-		// delete the rows that are old
+		view.DeleteL();
-		while (view.AtRow())
+		view.NextL();
-			{
+		}
-			view.DeleteL();
+CleanupStack::PopAndDestroy( &view );
-			view.NextL();
-			}
-		}
-	}
-view.Close();
 }
 //-----------------------------------------------------------------------------
 // CRecentUrlStore::OpenDatabase
 // Open the data store.

changeset 10	a359256acfc6
parent 0	dd21522fd290
child 25	0ed94ceaa377